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 629aa5f9..c4e37044 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 June 30, 2024 to September 2, 2024.
+Schedule from July 7, 2024 to September 2, 2024.
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 b25159fd..c05b3405 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,65 +1,58 @@
-'2919',20240630,1
-'2919',20240701,1
-'1798',20240702,1
-'1798',20240703,1
-'1798',20240704,1
-'1798',20240705,1
-'2964',20240706,1
 '2919',20240707,1
 '1798',20240708,1
 '1798',20240709,1
 '1798',20240710,1
 '1798',20240711,1
 '1798',20240712,1
-'2964',20240713,1
+'1803',20240713,1
 '2919',20240714,1
 '1798',20240715,1
 '1798',20240716,1
 '1798',20240717,1
 '1798',20240718,1
 '1798',20240719,1
-'2964',20240720,1
+'1803',20240720,1
 '2919',20240721,1
 '1798',20240722,1
 '1798',20240723,1
 '1798',20240724,1
 '1798',20240725,1
 '1798',20240726,1
-'2964',20240727,1
+'1803',20240727,1
 '2919',20240728,1
 '1798',20240729,1
 '1798',20240730,1
 '1798',20240731,1
 '1798',20240801,1
 '1798',20240802,1
-'2964',20240803,1
+'1803',20240803,1
 '2919',20240804,1
 '2919',20240805,1
 '1798',20240806,1
 '1798',20240807,1
 '1798',20240808,1
 '1798',20240809,1
-'2964',20240810,1
+'1803',20240810,1
 '2919',20240811,1
 '1798',20240812,1
 '1798',20240813,1
 '1798',20240814,1
 '1798',20240815,1
 '1798',20240816,1
-'2964',20240817,1
+'1803',20240817,1
 '2919',20240818,1
 '1798',20240819,1
 '1798',20240820,1
 '1798',20240821,1
 '1798',20240822,1
 '1798',20240823,1
-'2964',20240824,1
+'1803',20240824,1
 '2919',20240825,1
 '1798',20240826,1
 '1798',20240827,1
 '1798',20240828,1
 '1798',20240829,1
 '1798',20240830,1
-'2964',20240831,1
+'1803',20240831,1
 '2919',20240901,1
 '2919',20240902,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 9b8abef3..2115ba6d 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 @@
 '1798',200,53900,,'',0,6200,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3100,,'',0,6600,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
+'1803',200,60400,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0
 '2919',200,62100,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4200,,'',0
-'2964',200,60400,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',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 149ad118..e7359b84 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 @@
 '1798',201,54600,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5500,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
+'1803',201,63700,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,3300,,'',0,8800,,'',0
 '2919',201,65100,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
-'2964',201,63700,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,3300,,'',0,8800,,'',0
diff --git a/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 607c7a91..9d73f6a7 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,2 +1,2 @@
 '1798',1501,62200,,'',0,8300,,'',0,11900,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
-'2964',1501,90600,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'1803',1501,90600,,'',0,14500,,'',0,47000,,'',0,18500,,'',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 9b8abef3..2115ba6d 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,3 +1,3 @@
 '1798',200,53900,,'',0,6200,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3100,,'',0,6600,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
+'1803',200,60400,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0
 '2919',200,62100,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4200,,'',0
-'2964',200,60400,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',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 41ee861f..af65270a 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 @@
 '1798',201,54400,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5500,,'',0,2000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
+'1803',201,63500,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2919',201,64900,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
-'2964',201,63500,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
diff --git a/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 bee5aeb5..6f50a314 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 @@
 '1798',200,54300,,'',0,6300,,'',0,3000,,'',0,7100,,'',0,2800,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6500,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2900,,'',0,7000,,'',0
+'1803',200,60900,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
 '2919',200,62600,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4200,,'',0
-'2964',200,60900,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',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 07fb96c3..1ad098db 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 @@
 '1798',200,54500,,'',0,6300,,'',0,3000,,'',0,7100,,'',0,2800,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6500,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2900,,'',0,7000,,'',0
+'1803',200,61100,,'',0,4500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
 '2919',200,62800,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4200,,'',0
-'2964',200,61100,,'',0,4500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',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 8776d785..fc88c2d9 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 @@
 '1798',200,54600,,'',0,6300,,'',0,3000,,'',0,7100,,'',0,2800,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2900,,'',0,7000,,'',0
+'1803',200,61200,,'',0,4500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
 '2919',200,62900,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,8200,,'',0
-'2964',200,61200,,'',0,4500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',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 1bfcb9eb..26b84d4f 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 @@
 '1798',200,54600,,'',0,6300,,'',0,3100,,'',0,7100,,'',0,2800,,'',0,6100,,'',0,2100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7000,,'',0
+'1803',200,61200,,'',0,4500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
 '2919',200,62900,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,8200,,'',0
-'2964',200,61200,,'',0,4500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',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 7a6cc2e0..770a0c14 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 @@
 '1798',200,54700,,'',0,6300,,'',0,3000,,'',0,7100,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2900,,'',0,7000,,'',0
+'1803',200,61300,,'',0,4500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
 '2919',200,63000,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9300,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4800,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,8200,,'',0
-'2964',200,61300,,'',0,4500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',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 5849ea90..df2f45e9 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 @@
 '1798',200,54700,,'',0,6300,,'',0,3100,,'',0,7100,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7000,,'',0
+'1803',200,61300,,'',0,4500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
 '2919',200,63000,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,4500,,'',0,9300,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4800,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,8200,,'',0
-'2964',200,61300,,'',0,4500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',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 81aadb31..ac19ea2c 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,9 +1,9 @@
 '1798',200,54800,,'',0,6300,,'',0,3100,,'',0,7100,,'',0,2800,,'',0,6100,,'',0,2100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7000,,'',0
+'1803',200,61400,,'',0,4500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
 '2919',200,63100,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,8200,,'',0
-'2964',200,61400,,'',0,4500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
 '1798',301,60500,,'',0,5300,,'',0,7200,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,9900,,'',0
+'1803',301,65900,,'',0,14100,,'',0,10100,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
 '2919',301,63500,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2964',301,65900,,'',0,14100,,'',0,10100,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
 '1798',601,61300,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,4000,,'',0,16000,,'',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
+'1803',601,62100,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10100,,'',0,11000,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2919',601,61700,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11800,,'',0
-'2964',601,62100,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10100,,'',0,11000,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
diff --git a/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 6535ded5..a45d9b94 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,11 +1,11 @@
 '1798',100,53500,,'',0,8100,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,6100,,'',0,800,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6200,,'',0,2000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6200,,'',0,2000,,'',0,2100,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6600,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,2700,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
+'1803',100,61800,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,2700,,'',0,6600,,'',0
 '2919',100,61500,,'',0,3800,,'',0,8100,,'',0,8100,,'',0,8600,,'',0,4600,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
-'2964',100,61800,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,2700,,'',0,6600,,'',0
 '1798',200,54900,,'',0,6300,,'',0,3100,,'',0,7100,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7000,,'',0
+'1803',200,61500,,'',0,8500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
 '2919',200,63200,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,8500,,'',0,5300,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4800,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,8200,,'',0
-'2964',200,61500,,'',0,8500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
 '1798',1700,65000,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,4400,,'',0,7600,,'',0,7600,,'',0
 '1798',2100,65500,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,16100,,'',0,13600,,'',0,20500,,'',0,9200,,'',0,15600,,'',0,11100,,'',0
+'1803',2100,82900,,'',0,20200,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9800,,'',0,9400,,'',0,13100,,'',0
 '2919',2100,95200,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
-'2964',2100,82900,,'',0,20200,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9800,,'',0,9400,,'',0,13100,,'',0
 '1798',1002100,152800,,'',0,9100,,'',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 ae6678f6..ce795cdc 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,11 +1,11 @@
 '1798',100,53600,,'',0,8100,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,6100,,'',0,800,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6200,,'',0,2000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6200,,'',0,2000,,'',0,2100,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6600,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6700,,'',0,2800,,'',0,3000,,'',0,7000,,'',0
+'1803',100,61900,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,2700,,'',0,6600,,'',0
 '2919',100,61600,,'',0,3800,,'',0,8100,,'',0,8100,,'',0,8600,,'',0,4600,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
-'2964',100,61900,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,2700,,'',0,6600,,'',0
 '1798',200,55000,,'',0,6300,,'',0,3100,,'',0,7100,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7000,,'',0
+'1803',200,61600,,'',0,8500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
 '2919',200,63300,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,8500,,'',0,5300,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4800,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,8200,,'',0
-'2964',200,61600,,'',0,8500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
 '1798',1700,65100,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,4400,,'',0,7600,,'',0,7600,,'',0
 '1798',2100,65600,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,16100,,'',0,13600,,'',0,20500,,'',0,9200,,'',0,15600,,'',0,11100,,'',0
+'1803',2100,83000,,'',0,20200,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9800,,'',0,9400,,'',0,13100,,'',0
 '2919',2100,95300,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
-'2964',2100,83000,,'',0,20200,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9800,,'',0,9400,,'',0,13100,,'',0
 '1798',1002100,152900,,'',0,9100,,'',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 780fe925..3f414f6a 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,11 +1,11 @@
 '1798',100,53600,,'',0,8100,,'',0,3000,,'',0,7200,,'',0,2200,,'',0,6100,,'',0,800,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6200,,'',0,2000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6200,,'',0,2000,,'',0,2100,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6600,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,3000,,'',0,7000,,'',0
+'1803',100,61900,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,2700,,'',0,6600,,'',0
 '2919',100,61600,,'',0,3800,,'',0,8100,,'',0,8100,,'',0,8600,,'',0,4700,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
-'2964',100,61900,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,2700,,'',0,6600,,'',0
 '1798',200,55000,,'',0,6300,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,6900,,'',0
+'1803',200,61600,,'',0,8500,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
 '2919',200,63300,,'',0,8300,,'',0,4200,,'',0,8700,,'',0,8600,,'',0,8600,,'',0,8500,,'',0,5300,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4800,,'',0,9000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
-'2964',200,61600,,'',0,8500,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
 '1798',1700,65100,,'',0,7300,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,4400,,'',0,7600,,'',0,7600,,'',0
 '1798',2100,65600,,'',0,7700,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,16100,,'',0,13600,,'',0,20500,,'',0,9200,,'',0,15600,,'',0,11100,,'',0
+'1803',2100,83100,,'',0,20200,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9800,,'',0,9400,,'',0,13100,,'',0
 '2919',2100,95400,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
-'2964',2100,83100,,'',0,20200,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9800,,'',0,9400,,'',0,13100,,'',0
 '1798',1002100,153000,,'',0,9100,,'',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 95973e12..e6391c4c 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,11 +1,11 @@
 '1798',100,53700,,'',0,8100,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,6100,,'',0,800,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6300,,'',0,2000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6200,,'',0,2000,,'',0,2100,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6600,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6700,,'',0,2800,,'',0,3000,,'',0,7000,,'',0
+'1803',100,62000,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,2600,,'',0
 '2919',100,61700,,'',0,3800,,'',0,8100,,'',0,8100,,'',0,8600,,'',0,4600,,'',0,8600,,'',0,8900,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
-'2964',100,62000,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,2600,,'',0
 '1798',200,55100,,'',0,6300,,'',0,3100,,'',0,7100,,'',0,2800,,'',0,6200,,'',0,2200,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7000,,'',0
+'1803',200,61700,,'',0,8500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
 '2919',200,63400,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,5300,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,8200,,'',0
-'2964',200,61700,,'',0,8500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
 '1798',1700,65200,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,8400,,'',0,3600,,'',0,7500,,'',0
 '1798',2100,65700,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12200,,'',0,11200,,'',0,16100,,'',0,13600,,'',0,20500,,'',0,9200,,'',0,15600,,'',0,11000,,'',0
+'1803',2100,83100,,'',0,20300,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9800,,'',0,9400,,'',0,13000,,'',0
 '2919',2100,95400,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,16700,,'',0,13100,,'',0
-'2964',2100,83100,,'',0,20300,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9800,,'',0,9400,,'',0,13000,,'',0
 '1798',1002100,153100,,'',0,9100,,'',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 69178f4d..58b10410 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,11 +1,11 @@
 '1798',100,53700,,'',0,8200,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,6100,,'',0,800,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6300,,'',0,2000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6200,,'',0,2000,,'',0,2100,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6600,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6700,,'',0,2800,,'',0,7000,,'',0,2900,,'',0
+'1803',100,62000,,'',0,3100,,'',0,7900,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3100,,'',0,7300,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,2600,,'',0
 '2919',100,61700,,'',0,3900,,'',0,8100,,'',0,8100,,'',0,8600,,'',0,4600,,'',0,8600,,'',0,8900,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
-'2964',100,62000,,'',0,3100,,'',0,7900,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3100,,'',0,7300,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,2600,,'',0
 '1798',200,55200,,'',0,6300,,'',0,3100,,'',0,7100,,'',0,2800,,'',0,6200,,'',0,2200,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7000,,'',0
+'1803',200,61700,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
 '2919',200,63500,,'',0,8300,,'',0,8200,,'',0,4600,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,5300,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,8200,,'',0
-'2964',200,61700,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
 '1798',1700,65300,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,8400,,'',0,3600,,'',0,7500,,'',0
 '1798',2100,65800,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12200,,'',0,11200,,'',0,16100,,'',0,13600,,'',0,20500,,'',0,9200,,'',0,15600,,'',0,11000,,'',0
+'1803',2100,83200,,'',0,20300,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9800,,'',0,9400,,'',0,13000,,'',0
 '2919',2100,95500,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,16700,,'',0,13100,,'',0
-'2964',2100,83200,,'',0,20300,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9800,,'',0,9400,,'',0,13000,,'',0
 '1798',1002100,153200,,'',0,9100,,'',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 c4da156e..02c04eb3 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,11 +1,11 @@
 '1798',100,53800,,'',0,8100,,'',0,3000,,'',0,7200,,'',0,2200,,'',0,6100,,'',0,800,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6200,,'',0,2000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6500,,'',0,2600,,'',0,6200,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6600,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,7000,,'',0,3000,,'',0
+'1803',100,62100,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7400,,'',0,3200,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,2600,,'',0
 '2919',100,61800,,'',0,3800,,'',0,8100,,'',0,8100,,'',0,8600,,'',0,4700,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
-'2964',100,62100,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7400,,'',0,3200,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,2600,,'',0
 '1798',200,55200,,'',0,6300,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,6900,,'',0
+'1803',200,61800,,'',0,8500,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
 '2919',200,63500,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8500,,'',0,5300,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
-'2964',200,61800,,'',0,8500,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
 '1798',1700,65300,,'',0,7300,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,8500,,'',0,3500,,'',0,7600,,'',0
 '1798',2100,65800,,'',0,7700,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,16200,,'',0,13600,,'',0,24500,,'',0,5200,,'',0,15500,,'',0,11100,,'',0
+'1803',2100,83300,,'',0,20200,,'',0,11900,,'',0,19700,,'',0,15800,,'',0,11400,,'',0,9700,,'',0,9400,,'',0,13100,,'',0
 '2919',2100,95600,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
-'2964',2100,83300,,'',0,20200,,'',0,11900,,'',0,19700,,'',0,15800,,'',0,11400,,'',0,9700,,'',0,9400,,'',0,13100,,'',0
 '1798',1002100,153300,,'',0,9100,,'',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 edc9b9b2..ad72f67a 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,14 +1,14 @@
 '1798',100,53800,,'',0,8200,,'',0,3000,,'',0,7200,,'',0,2200,,'',0,6100,,'',0,800,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6200,,'',0,2000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6500,,'',0,2600,,'',0,6200,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6600,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,7000,,'',0,2900,,'',0
+'1803',100,62100,,'',0,3100,,'',0,7900,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7400,,'',0,3200,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,2600,,'',0
 '2919',100,61800,,'',0,3900,,'',0,8100,,'',0,8100,,'',0,8600,,'',0,4700,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
-'2964',100,62100,,'',0,3100,,'',0,7900,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7400,,'',0,3200,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,2600,,'',0
 '1798',200,55300,,'',0,6300,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,6900,,'',0
+'1803',200,61800,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,7000,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
 '2919',200,63600,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8500,,'',0,5300,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
-'2964',200,61800,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,7000,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
 '1798',601,62100,,'',0,8900,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,8000,,'',0,12200,,'',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
+'1803',601,62900,,'',0,12100,,'',0,10200,,'',0,10000,,'',0,10500,,'',0,14300,,'',0,10700,,'',0,10500,,'',0,10100,,'',0,10800,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,8900,,'',0
 '2919',601,62500,,'',0,13100,,'',0,9700,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
-'2964',601,62900,,'',0,12100,,'',0,10200,,'',0,10000,,'',0,10500,,'',0,14300,,'',0,10700,,'',0,10500,,'',0,10100,,'',0,10800,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,8900,,'',0
 '1798',1700,65400,,'',0,7300,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,8500,,'',0,3500,,'',0,7600,,'',0
 '1798',2100,65900,,'',0,7700,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,16200,,'',0,13600,,'',0,24500,,'',0,5200,,'',0,15500,,'',0,11100,,'',0
+'1803',2100,83400,,'',0,20200,,'',0,11900,,'',0,19700,,'',0,15800,,'',0,11400,,'',0,9700,,'',0,9400,,'',0,13100,,'',0
 '2919',2100,95700,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
-'2964',2100,83400,,'',0,20200,,'',0,11900,,'',0,19700,,'',0,15800,,'',0,11400,,'',0,9700,,'',0,9400,,'',0,13100,,'',0
 '1798',1002100,153400,,'',0,9100,,'',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 2b69600c..9bbc858e 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,14 +1,14 @@
 '1798',100,53800,,'',0,8200,,'',0,3000,,'',0,7200,,'',0,2200,,'',0,6100,,'',0,800,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6300,,'',0,2000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6500,,'',0,2600,,'',0,6200,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6600,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,7000,,'',0,2900,,'',0
+'1803',100,62100,,'',0,3100,,'',0,7900,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3100,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,2600,,'',0
 '2919',100,61800,,'',0,3900,,'',0,8100,,'',0,8100,,'',0,8600,,'',0,4700,,'',0,8600,,'',0,8900,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
-'2964',100,62100,,'',0,3100,,'',0,7900,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3100,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,2600,,'',0
 '1798',200,55300,,'',0,6300,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2200,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,6900,,'',0
+'1803',200,61800,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,7000,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
 '2919',200,63600,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,5300,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
-'2964',200,61800,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,7000,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
 '1798',601,62100,,'',0,8900,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,8000,,'',0,12200,,'',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
+'1803',601,62900,,'',0,12100,,'',0,10200,,'',0,10000,,'',0,10500,,'',0,14300,,'',0,10700,,'',0,10500,,'',0,10100,,'',0,10800,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,8900,,'',0
 '2919',601,62500,,'',0,13100,,'',0,9700,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
-'2964',601,62900,,'',0,12100,,'',0,10200,,'',0,10000,,'',0,10500,,'',0,14300,,'',0,10700,,'',0,10500,,'',0,10100,,'',0,10800,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,8900,,'',0
 '1798',1700,65400,,'',0,7300,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,8500,,'',0,3500,,'',0,7500,,'',0
 '1798',2100,65900,,'',0,7700,,'',0,9200,,'',0,9700,,'',0,12200,,'',0,11200,,'',0,16200,,'',0,13600,,'',0,24500,,'',0,5200,,'',0,15500,,'',0,11000,,'',0
+'1803',2100,83400,,'',0,20300,,'',0,11900,,'',0,19700,,'',0,15800,,'',0,11400,,'',0,9700,,'',0,9400,,'',0,13000,,'',0
 '2919',2100,95700,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,16700,,'',0,13100,,'',0
-'2964',2100,83400,,'',0,20300,,'',0,11900,,'',0,19700,,'',0,15800,,'',0,11400,,'',0,9700,,'',0,9400,,'',0,13000,,'',0
 '1798',1002100,153500,,'',0,9100,,'',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 6548c8be..adf6c11d 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,13 +1,13 @@
 '1798',601,62200,4,'',0,8900,4,'',0,3100,4,'',0,7700,4,'',0,3500,4,'',0,7300,4,'',0,8000,4,'',0,12200,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
+'1803',601,63000,4,'',0,12100,4,'',0,10200,4,'',0,10000,4,'',0,10500,4,'',0,14300,4,'',0,10700,4,'',0,10500,4,'',0,10100,4,'',0,10800,4,'',0,9700,4,'',0,10500,4,'',0,10400,4,'',0,10000,4,'',0,8900,4,'',0
 '2919',601,62600,4,'',0,13100,4,'',0,9700,4,'',0,15100,4,'',0,4600,4,'',0,9000,4,'',0,10100,4,'',0,9000,4,'',0,9100,4,'',0,9400,4,'',0,9300,4,'',0,9000,4,'',0,5000,4,'',0,16000,4,'',0,11700,4,'',0
-'2964',601,63000,4,'',0,12100,4,'',0,10200,4,'',0,10000,4,'',0,10500,4,'',0,14300,4,'',0,10700,4,'',0,10500,4,'',0,10100,4,'',0,10800,4,'',0,9700,4,'',0,10500,4,'',0,10400,4,'',0,10000,4,'',0,8900,4,'',0
 '1798',1700,65500,4,'',0,7300,4,'',0,8900,4,'',0,72500,4,'',0,7800,4,'',0,8500,4,'',0,3500,4,'',0,7500,4,'',0
 '1798',2100,70000,4,'',0,3700,4,'',0,9200,4,'',0,9700,4,'',0,12200,4,'',0,15200,4,'',0,12200,4,'',0,13600,4,'',0,24500,4,'',0,5200,4,'',0,15500,4,'',0,11000,4,'',0
+'1803',2100,83500,4,'',0,20300,4,'',0,11900,4,'',0,19700,4,'',0,15800,4,'',0,11400,4,'',0,9700,4,'',0,9400,4,'',0,13000,4,'',0
 '2919',2100,95800,4,'',0,17100,4,'',0,12900,4,'',0,17000,4,'',0,12900,4,'',0,16700,4,'',0,13100,4,'',0
-'2964',2100,83500,4,'',0,20300,4,'',0,11900,4,'',0,19700,4,'',0,15800,4,'',0,11400,4,'',0,9700,4,'',0,9400,4,'',0,13000,4,'',0
 '1798',3101,65000,4,'',0,8500,4,'',0,7000,4,'',0,3300,4,'',0,7300,4,'',0,4600,4,'',0,14500,4,'',0,11100,4,'',0,11000,4,'',0,11000,4,'',0,11600,4,'',0,7400,4,'',0,1200,4,'',0,7000,4,'',0,3500,4,'',0,6800,4,'',0,2900,4,'',0,1800,4,'',0,38400,4,'',0
-'2964',3101,83900,4,'',0,10000,4,'',0,10500,4,'',0,10800,4,'',0,15100,4,'',0,11000,4,'',0,11000,4,'',0,10900,4,'',0,10900,4,'',0,10900,4,'',0
+'1803',3101,83900,4,'',0,10000,4,'',0,10500,4,'',0,10800,4,'',0,15100,4,'',0,11000,4,'',0,11000,4,'',0,10900,4,'',0,10900,4,'',0,10900,4,'',0
 '1798',1002100,153600,4,'',0,9100,4,'',0
 '1798',1003101,72100,4,'',0,3000,4,'',0,7200,4,'',0,3100,4,'',0,7400,4,'',0,10100,4,'',0,11000,4,'',0,11100,4,'',0,15000,4,'',0,11200,4,'',0,9300,4,'',0,4700,4,'',0,7100,4,'',0,3100,4,'',0,6800,4,'',0,10200,4,'',0,8500,4,'',0,12300,4,'',0
+'1803',1003101,91100,4,'',0,10100,4,'',0,10700,4,'',0,11100,4,'',0,11000,4,'',0,11000,4,'',0,10900,4,'',0,14900,4,'',0,11000,4,'',0,10800,4,'',0,10500,4,'',0,10500,4,'',0
 '2919',1003101,110900,4,'',0,10600,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10400,4,'',0,10000,4,'',0
-'2964',1003101,91100,4,'',0,10100,4,'',0,10700,4,'',0,11100,4,'',0,11000,4,'',0,11000,4,'',0,10900,4,'',0,14900,4,'',0,11000,4,'',0,10800,4,'',0,10500,4,'',0,10500,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 86fe5e8f..f777bd8e 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,18 +1,18 @@
 '1798',100,54100,,'',0,8200,,'',0,3000,,'',0,7200,,'',0,2200,,'',0,6100,,'',0,800,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6300,,'',0,2000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2500,,'',0,2600,,'',0,6200,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6600,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,7000,,'',0,2900,,'',0
+'1803',100,62400,,'',0,3100,,'',0,7900,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3100,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,2600,,'',0
 '2919',100,62100,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,4700,,'',0,8600,,'',0,8900,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
-'2964',100,62400,,'',0,3100,,'',0,7900,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3100,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,2600,,'',0
 '1798',200,55600,,'',0,6300,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2200,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,6900,,'',0
+'1803',200,62100,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,2600,,'',0,7200,,'',0
 '2919',200,63900,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
-'2964',200,62100,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,2600,,'',0,7200,,'',0
+'1803',401,60000,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',401,64200,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2964',401,60000,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '1798',501,60200,,'',0,2800,,'',0,2800,,'',0,6600,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,3400,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'1803',501,63600,,'',0,9600,,'',0,7000,,'',0,2700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9500,,'',0
 '2919',501,61900,,'',0,9600,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,4900,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2964',501,63600,,'',0,9600,,'',0,7000,,'',0,2700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9500,,'',0
+'1803',700,70000,,'',0,14500,,'',0,25500,,'',0,21000,,'',0,21000,,'',0,21000,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
 '2919',700,60000,,'',0,20000,,'',0,15000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,16500,,'',0
-'2964',700,70000,,'',0,14500,,'',0,25500,,'',0,21000,,'',0,21000,,'',0,21000,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
+'1803',900,64000,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,14500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '2919',900,63000,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2964',900,64000,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,14500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '1798',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
+'1803',1000700,60000,,'',0,15500,,'',0,20000,,'',0,24800,,'',0,21200,,'',0,21000,,'',0,20500,,'',0
 '2919',1000700,70000,,'',0,15500,,'',0,19500,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
-'2964',1000700,60000,,'',0,15500,,'',0,20000,,'',0,24800,,'',0,21200,,'',0,21000,,'',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 80068099..0ce4f0ae 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,18 +1,18 @@
 '1798',100,54200,,'',0,8200,,'',0,3000,,'',0,7200,,'',0,2200,,'',0,6100,,'',0,800,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6300,,'',0,2000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2500,,'',0,2600,,'',0,6200,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6600,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,7000,,'',0,2900,,'',0
+'1803',100,62500,,'',0,3100,,'',0,7900,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,2600,,'',0
 '2919',100,62200,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,4700,,'',0,8600,,'',0,8900,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
-'2964',100,62500,,'',0,3100,,'',0,7900,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,2600,,'',0
 '1798',200,55700,,'',0,6300,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2200,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,6900,,'',0
+'1803',200,62200,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,2600,,'',0,7200,,'',0
 '2919',200,64000,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
-'2964',200,62200,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,2600,,'',0,7200,,'',0
+'1803',401,60100,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',401,64300,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2964',401,60100,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '1798',501,60300,,'',0,2800,,'',0,2700,,'',0,6700,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7400,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'1803',501,63600,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
 '2919',501,61900,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,4900,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2964',501,63600,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
+'1803',700,70100,,'',0,14500,,'',0,25500,,'',0,21000,,'',0,21000,,'',0,21000,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
 '2919',700,60100,,'',0,20000,,'',0,15000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,16500,,'',0
-'2964',700,70100,,'',0,14500,,'',0,25500,,'',0,21000,,'',0,21000,,'',0,21000,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
+'1803',900,64100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,14500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '2919',900,63100,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2964',900,64100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,14500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '1798',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
+'1803',1000700,60100,,'',0,15500,,'',0,20000,,'',0,24800,,'',0,21200,,'',0,21000,,'',0,20500,,'',0
 '2919',1000700,70100,,'',0,15500,,'',0,19500,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
-'2964',1000700,60100,,'',0,15500,,'',0,20000,,'',0,24800,,'',0,21200,,'',0,21000,,'',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 234e7646..c8da7ae0 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,11 +1,11 @@
 '1798',200,55700,,'',0,6300,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2200,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7200,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,6900,,'',0
+'1803',200,62200,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,2600,,'',0,7200,,'',0
 '2919',200,64000,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
-'2964',200,62200,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,2600,,'',0,7200,,'',0
+'1803',401,60100,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',401,64300,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2964',401,60100,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '1798',501,60300,,'',0,2800,,'',0,2800,,'',0,6600,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7400,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'1803',501,63700,,'',0,9600,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9500,,'',0
 '2919',501,62000,,'',0,9600,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,4900,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2964',501,63700,,'',0,9600,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9500,,'',0
+'1803',900,64100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,14500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '2919',900,63100,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2964',900,64100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,14500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '1798',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
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 17387cd9..1250bf84 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,11 +1,11 @@
 '1798',200,55800,,'',0,6300,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2200,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,2800,,'',0,6900,,'',0
+'1803',200,62300,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,2600,,'',0,7200,,'',0
 '2919',200,64100,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
-'2964',200,62300,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,2600,,'',0,7200,,'',0
+'1803',401,60200,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',401,64400,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2964',401,60200,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '1798',501,60300,,'',0,2800,,'',0,2800,,'',0,6600,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'1803',501,63700,,'',0,9600,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9500,,'',0
 '2919',501,62000,,'',0,9600,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,4900,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2964',501,63700,,'',0,9600,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9500,,'',0
+'1803',900,64200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,14300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '2919',900,63200,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2964',900,64200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,14300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '1798',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
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 040f027d..75d05e6c 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,7 +1,7 @@
 '1798',200,55800,,'',0,6300,,'',0,3100,,'',0,7300,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2600,,'',0,7300,,'',0,2300,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,2800,,'',0,6900,,'',0
+'1803',200,62300,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,2600,,'',0,7200,,'',0
 '2919',200,64100,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
-'2964',200,62300,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,2600,,'',0,7200,,'',0
+'1803',401,60200,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',401,64400,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2964',401,60200,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'1803',900,64200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,14300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '2919',900,63200,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2964',900,64200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,14300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
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 0cb570a5..76277106 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,7 +1,7 @@
 '1798',200,55900,,'',0,6300,,'',0,3100,,'',0,7300,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2700,,'',0,7200,,'',0,2300,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,2800,,'',0,6900,,'',0
+'1803',200,62400,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3200,,'',0
 '2919',200,64200,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
-'2964',200,62400,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3200,,'',0
+'1803',401,60300,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',401,64500,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2964',401,60300,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'1803',900,64300,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,14300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '2919',900,63300,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2964',900,64300,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,14300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
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 ed8fc711..a24fcec0 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,7 +1,7 @@
 '1798',200,60000,,'',0,2300,,'',0,3100,,'',0,7300,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2700,,'',0,7200,,'',0,2300,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,2800,,'',0,6900,,'',0
+'1803',200,62500,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3200,,'',0
 '2919',200,64300,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
-'2964',200,62500,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3200,,'',0
+'1803',401,60400,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',401,64600,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2964',401,60400,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'1803',900,64400,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,14300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '2919',900,63400,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2964',900,64400,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,14300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
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 5e4567a1..3c5f93e3 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,6 +1,6 @@
 '1798',200,60300,,'',0,2300,,'',0,3100,,'',0,7300,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,2700,,'',0,7200,,'',0,2300,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,1500,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,6800,,'',0,2900,,'',0
+'1803',200,62800,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3200,,'',0
 '2919',200,64600,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,4600,,'',0,8900,,'',0,8200,,'',0
-'2964',200,62800,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3200,,'',0
 '1798',900,54600,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1803',900,64600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
 '2919',900,63600,,'',0,17000,,'',0,13000,,'',0,12300,,'',0,17100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
-'2964',900,64600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
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 01485a70..63ca779d 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,6 +1,6 @@
 '1798',200,60300,,'',0,2300,,'',0,3100,,'',0,7300,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2200,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,2700,,'',0,7200,,'',0,2300,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,6800,,'',0,2900,,'',0
+'1803',200,62800,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,7400,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3200,,'',0
 '2919',200,64600,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,9100,,'',0,5200,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8700,,'',0,9000,,'',0,4600,,'',0,8900,,'',0,8200,,'',0
-'2964',200,62800,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,7400,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3200,,'',0
 '1798',900,54700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1803',900,64700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '2919',900,63700,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
-'2964',900,64700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
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 95c1ecdc..2d9274a4 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,6 +1,6 @@
 '1798',200,60400,,'',0,2300,,'',0,3100,,'',0,7300,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2700,,'',0,7200,,'',0,2300,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,6800,,'',0,2900,,'',0
+'1803',200,62900,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3200,,'',0
 '2919',200,64700,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,4600,,'',0,8900,,'',0,8200,,'',0
-'2964',200,62900,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3200,,'',0
 '1798',900,54700,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1803',900,64700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
 '2919',900,63700,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
-'2964',900,64700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
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 aed98f3f..2b7ebbc9 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,6 +1,6 @@
 '1798',200,60400,,'',0,2300,,'',0,3100,,'',0,7400,,'',0,6800,,'',0,2200,,'',0,2100,,'',0,5700,,'',0,1800,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2700,,'',0,7200,,'',0,2300,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,6800,,'',0,2900,,'',0
+'1803',200,62900,,'',0,8500,,'',0,3600,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3200,,'',0
 '2919',200,64700,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8700,,'',0,8600,,'',0,9300,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,4600,,'',0,8900,,'',0,8100,,'',0
-'2964',200,62900,,'',0,8500,,'',0,3600,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3200,,'',0
 '1798',900,54800,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1803',900,64800,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
 '2919',900,63800,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
-'2964',900,64800,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
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 63a09b2e..bb6d2126 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,6 +1,6 @@
 '1798',200,60500,,'',0,2300,,'',0,3100,,'',0,7400,,'',0,6800,,'',0,2200,,'',0,2100,,'',0,5700,,'',0,1800,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2700,,'',0,7200,,'',0,2300,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,1500,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,6800,,'',0,2900,,'',0
+'1803',200,63000,,'',0,8500,,'',0,3600,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3200,,'',0
 '2919',200,64800,,'',0,8300,,'',0,8200,,'',0,8700,,'',0,4600,,'',0,8700,,'',0,8600,,'',0,9300,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,4600,,'',0,8900,,'',0,8100,,'',0
-'2964',200,63000,,'',0,8500,,'',0,3600,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3200,,'',0
 '1798',900,54900,,'',0,10000,,'',0,10100,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1803',900,64900,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '2919',900,63900,,'',0,17000,,'',0,13000,,'',0,16200,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
-'2964',900,64900,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
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 1668c7b5..9f059045 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,6 +1,6 @@
 '1798',200,60700,,'',0,2300,,'',0,7100,,'',0,3300,,'',0,6800,,'',0,2200,,'',0,2100,,'',0,5700,,'',0,1800,,'',0,2100,,'',0,5900,,'',0,2000,,'',0,2200,,'',0,5800,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2700,,'',0,7200,,'',0,2300,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,1500,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,6800,,'',0,2900,,'',0
+'1803',200,63200,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3200,,'',0
 '2919',200,65000,,'',0,8300,,'',0,8200,,'',0,8700,,'',0,4600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,9100,,'',0,5200,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8700,,'',0,9000,,'',0,4600,,'',0,8900,,'',0,8200,,'',0
-'2964',200,63200,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3200,,'',0
 '1798',900,55000,,'',0,10100,,'',0,10100,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1803',900,65000,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
 '2919',900,64000,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
-'2964',900,65000,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
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 2e5e5d2b..df6f0b43 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,3 +1,3 @@
 '1798',900,55100,,'',0,10100,,'',0,10100,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1803',900,65100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
 '2919',900,64100,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
-'2964',900,65100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
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 2e5e5d2b..df6f0b43 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,3 +1,3 @@
 '1798',900,55100,,'',0,10100,,'',0,10100,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1803',900,65100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
 '2919',900,64100,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
-'2964',900,65100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
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 905edd3a..129256f7 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,3 +1,3 @@
 '1798',900,55100,,'',0,10100,,'',0,10200,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1803',900,65100,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2919',900,64100,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2964',900,65100,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
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 3f02694b..336ae5fb 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,3 +1,3 @@
 '1798',900,55200,,'',0,10100,,'',0,10100,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1803',900,65200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
 '2919',900,64200,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2964',900,65200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
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 690d368c..f3fe93ed 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,3 +1,3 @@
 '1798',900,55200,,'',0,10100,,'',0,10200,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1803',900,65200,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2919',900,64200,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2964',900,65200,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
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 e57b16fd..ce5aeb8e 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,3 +1,3 @@
 '1798',900,55300,,'',0,10100,,'',0,10100,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1803',900,65300,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
 '2919',900,64300,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2964',900,65300,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
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 b1c7acc9..6ec3889f 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,3 +1,3 @@
 '1798',900,55300,,'',0,10100,,'',0,10200,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1803',900,65300,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2919',900,64300,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2964',900,65300,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
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 b1c7acc9..6ec3889f 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,3 +1,3 @@
 '1798',900,55300,,'',0,10100,,'',0,10200,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1803',900,65300,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2919',900,64300,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2964',900,65300,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
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 0de4ac8d..6ae1a8c6 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,3 +1,3 @@
 '1798',900,55400,,'',0,10100,,'',0,10100,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1803',900,65400,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
 '2919',900,64400,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2964',900,65400,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
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 b21ea8e3..7c855ef6 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,5 +1,5 @@
 '1798',900,55400,,'',0,10100,,'',0,10200,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1803',900,65400,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2919',900,64400,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2964',900,65400,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '1798',1501,62300,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2964',1501,90800,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'1803',1501,90800,,'',0,14500,,'',0,47000,,'',0,18500,,'',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 af468702..152856d5 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,5 +1,5 @@
 '1798',900,55500,,'',0,10100,,'',0,10200,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1803',900,65500,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2919',900,64500,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2964',900,65500,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '1798',1501,62300,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2964',1501,90800,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'1803',1501,90800,,'',0,14500,,'',0,47000,,'',0,18500,,'',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 af468702..152856d5 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,5 +1,5 @@
 '1798',900,55500,,'',0,10100,,'',0,10200,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1803',900,65500,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2919',900,64500,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2964',900,65500,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '1798',1501,62300,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2964',1501,90800,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'1803',1501,90800,,'',0,14500,,'',0,47000,,'',0,18500,,'',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 06e50d61..7e515ba6 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,3 +1,3 @@
 '1798',900,55600,,'',0,10100,,'',0,10200,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1803',900,65600,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2919',900,64600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2964',900,65600,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
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 157eabd3..d7d6fac4 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,3 +1,3 @@
 '1798',900,55600,,'',0,10100,,'',0,14300,,'',0,5800,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1803',900,65600,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2919',900,64600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2964',900,65600,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
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 60d5687d..85fcf5a3 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,3 +1,3 @@
 '1798',900,55700,,'',0,10100,,'',0,14300,,'',0,5800,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1803',900,65700,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2919',900,64700,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2964',900,65700,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
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 395a7222..fcf66354 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,3 +1,3 @@
 '1798',900,55800,,'',0,10100,,'',0,14300,,'',0,9800,,'',0,5600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,14100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1803',900,65800,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2919',900,64800,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2964',900,65800,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
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 f3c6381b..7bcc9ac2 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,3 +1,3 @@
 '1798',900,55900,,'',0,14100,,'',0,10200,,'',0,9900,,'',0,5600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,14100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1803',900,65900,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2919',900,64900,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2964',900,65900,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
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 9c923fd5..e738e12f 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,6 +1,6 @@
 '1798',900,55900,4,'',0,14100,4,'',0,10300,4,'',0,9800,4,'',0,5600,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10200,4,'',0,14100,4,'',0,10100,4,'',0,10500,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
 '1798',901,55900,0,'Montrose Exch',0,14100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,5600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,14100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
+'1803',900,65900,4,'',0,9300,4,'',0,9800,4,'',0,10100,4,'',0,10500,4,'',0,10300,4,'',0,14500,4,'',0,10000,4,'',0,10500,4,'',0,10700,4,'',0,10300,4,'',0,10500,4,'',0,10400,4,'',0,10000,4,'',0,10200,4,'',0,9900,4,'',0
+'1803',901,65900,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2919',900,64900,4,'',0,17100,4,'',0,13000,4,'',0,16300,4,'',0,13100,4,'',0,17000,4,'',0,13000,4,'',0,17000,4,'',0,11900,4,'',0,17500,4,'',0
 '2919',901,64900,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2964',900,65900,4,'',0,9300,4,'',0,9800,4,'',0,10100,4,'',0,10500,4,'',0,10300,4,'',0,14500,4,'',0,10000,4,'',0,10500,4,'',0,10700,4,'',0,10300,4,'',0,10500,4,'',0,10400,4,'',0,10000,4,'',0,10200,4,'',0,9900,4,'',0
-'2964',901,65900,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
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 8907f259..d3d698c4 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,3 +1,3 @@
 '1798',901,60000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,5600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
+'1803',901,70000,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,14300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2919',901,65000,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2964',901,70000,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,14300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
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 757227be..f1cc20cc 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,3 +1,3 @@
 '1798',901,60100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,5600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
+'1803',901,70100,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,14300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2919',901,65100,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2964',901,70100,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,14300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
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 58919718..7f3b4e74 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,5 +1,5 @@
 '1798',901,60100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,5600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
+'1803',901,70100,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,14300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2919',901,65100,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2964',901,70100,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,14300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '1798',1500,64100,,'',0,8300,,'',0,12000,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
-'2964',1500,92500,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'1803',1500,92500,,'',0,18500,,'',0,43000,,'',0,18500,,'',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 3dbfa430..dd7a6a26 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,5 +1,5 @@
 '1798',901,60200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
+'1803',901,70200,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,14300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2919',901,65200,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2964',901,70200,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,14300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '1798',1500,64200,,'',0,8300,,'',0,12000,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
-'2964',1500,92600,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'1803',1500,92600,,'',0,18500,,'',0,43000,,'',0,18500,,'',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 2d5d6b99..5876310e 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 @@
 '1798',901,60200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
+'1803',901,70200,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,14300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2919',901,65200,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2964',901,70200,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,14300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
diff --git a/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 40dd8639..d0c3568f 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 @@
 '1798',901,60300,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
+'1803',901,70300,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2919',901,65300,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2964',901,70300,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
diff --git a/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 40dd8639..d0c3568f 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 @@
 '1798',901,60300,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
+'1803',901,70300,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2919',901,65300,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2964',901,70300,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
diff --git a/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 0b1d4acb..ece64844 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 @@
 '1798',901,60400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
+'1803',901,70400,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2919',901,65400,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2964',901,70400,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '1798',1501,62300,,'',0,8300,,'',0,11900,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
-'2964',1501,90700,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'1803',1501,90700,,'',0,14500,,'',0,47000,,'',0,18500,,'',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 79023ec9..f9d509f6 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 @@
 '1798',1500,64100,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2964',1500,92500,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'1803',1500,92500,,'',0,18500,,'',0,43000,,'',0,18500,,'',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 2c33a902..834f3f79 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,3 +1,3 @@
 '1798',901,60500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
+'1803',901,70500,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2919',901,65500,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2964',901,70500,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
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 2c33a902..834f3f79 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,3 +1,3 @@
 '1798',901,60500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
+'1803',901,70500,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2919',901,65500,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2964',901,70500,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
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 bca86280..8447a71e 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,3 +1,3 @@
 '1798',901,60600,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
+'1803',901,70600,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2919',901,65600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2964',901,70600,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
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 bca86280..8447a71e 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,3 +1,3 @@
 '1798',901,60600,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
+'1803',901,70600,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2919',901,65600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2964',901,70600,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
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 bca86280..8447a71e 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,3 +1,3 @@
 '1798',901,60600,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
+'1803',901,70600,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2919',901,65600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2964',901,70600,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
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 ceb33908..1b4fb02d 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,3 +1,3 @@
 '1798',901,60800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
+'1803',901,70800,,'',0,9300,,'',0,5800,,'',0,14100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2919',901,65800,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2964',901,70800,,'',0,9300,,'',0,5800,,'',0,14100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
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 ceb33908..1b4fb02d 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,3 +1,3 @@
 '1798',901,60800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
+'1803',901,70800,,'',0,9300,,'',0,5800,,'',0,14100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2919',901,65800,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2964',901,70800,,'',0,9300,,'',0,5800,,'',0,14100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
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 c4cc635b..c2202dc0 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,6 +1,6 @@
 '1798',201,51500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1600,,'',0,1500,,'',0,2000,,'',0,6600,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,2400,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,1600,,'',0,2300,,'',0,5800,,'',0,1600,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'1803',201,60700,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
 '2919',201,62100,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'2964',201,60700,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
 '1798',901,60900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
+'1803',901,70900,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2919',901,65900,,'',0,17100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2964',901,70900,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
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 5314db5a..e2e53191 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,6 +1,6 @@
 '1798',201,51600,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,2000,,'',0,6500,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,1600,,'',0,2300,,'',0,5800,,'',0,1600,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'1803',201,60800,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
 '2919',201,62200,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'2964',201,60800,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
 '1798',901,61000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'1803',901,70900,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2919',901,65900,,'',0,17100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0
-'2964',901,70900,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
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 d1f19c81..c066ca95 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,6 +1,6 @@
 '1798',201,51700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1600,,'',0,1600,,'',0,2000,,'',0,6500,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,2400,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,1600,,'',0,2300,,'',0,5700,,'',0,1700,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'1803',201,60900,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
 '2919',201,62300,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'2964',201,60900,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
 '1798',901,61100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
+'1803',901,71100,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2919',901,70100,,'',0,13100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2964',901,71100,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
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 44b6c315..2a509c43 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,6 +1,6 @@
 '1798',201,51800,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,2000,,'',0,6500,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,1600,,'',0,2300,,'',0,5800,,'',0,1600,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'1803',201,61000,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
 '2919',201,62400,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'2964',201,61000,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
 '1798',901,61100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
+'1803',901,71100,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2919',901,70100,,'',0,13100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2964',901,71100,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
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 6bb7d1f8..03e19ede 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,6 +1,6 @@
 '1798',201,51800,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1700,,'',0,1500,,'',0,2000,,'',0,6500,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,1600,,'',0,2300,,'',0,5800,,'',0,1600,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'1803',201,61000,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
 '2919',201,62400,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'2964',201,61000,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
 '1798',901,61200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
+'1803',901,71200,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2919',901,70200,,'',0,13100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2964',901,71200,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
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 ddfcaa8e..c2d4d0c3 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,6 +1,6 @@
 '1798',201,51900,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5800,,'',0,1700,,'',0,1600,,'',0,2000,,'',0,6400,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,1600,,'',0,2300,,'',0,5800,,'',0,1600,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'1803',201,61100,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
 '2919',201,62500,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'2964',201,61100,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
 '1798',901,61300,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'1803',901,71200,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2919',901,70200,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0
-'2964',901,71200,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
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 dbe78c2c..7ffc048c 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,6 +1,6 @@
 '1798',201,51900,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1700,,'',0,1500,,'',0,2000,,'',0,6500,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'1803',201,61100,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
 '2919',201,62500,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'2964',201,61100,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
 '1798',901,61300,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'1803',901,71200,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2919',901,70200,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0
-'2964',901,71200,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
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 92a1af55..fb3e9112 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,6 +1,6 @@
 '1798',201,52000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1600,,'',0,1600,,'',0,6000,,'',0,2500,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,2400,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'1803',201,61200,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
 '2919',201,62600,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'2964',201,61200,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
 '1798',901,61400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'1803',901,71300,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2919',901,70300,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0
-'2964',901,71300,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
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 6bfae682..fe9ff860 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,7 +1,7 @@
 '1798',201,52000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1700,,'',0,1600,,'',0,6000,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,1600,,'',0,2300,,'',0,5800,,'',0,1600,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'1803',201,61200,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
 '2919',201,62600,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'2964',201,61200,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
 '1798',901,61400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'1803',901,71300,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2919',901,70300,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0
-'2964',901,71300,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '1798',1601,80600,,'',0,11900,,'',0,68500,,'',0,4600,,'',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 0e889972..fedecc7f 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,18 +1,18 @@
 '1798',100,54600,,'',0,8200,,'',0,3000,,'',0,7200,,'',0,2200,,'',0,6100,,'',0,800,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6300,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2500,,'',0,2700,,'',0,6200,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,7000,,'',0,2900,,'',0
+'1803',100,62900,,'',0,7100,,'',0,3900,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,7100,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2600,,'',0
 '2919',100,62600,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,8700,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,9900,,'',0
-'2964',100,62900,,'',0,7100,,'',0,3900,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,7100,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2600,,'',0
 '1798',201,52100,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5800,,'',0,1700,,'',0,1600,,'',0,6000,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'1803',201,61300,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
 '2919',201,62700,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'2964',201,61300,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
 '1798',300,60100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,2700,,'',0,7600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3800,,'',0,6900,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
+'1803',300,60500,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '2919',300,64800,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2964',300,60500,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '1798',400,63400,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7200,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'1803',400,63200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10400,,'',0,10100,,'',0,14300,,'',0,10000,,'',0
 '2919',400,71400,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2964',400,63200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10400,,'',0,10100,,'',0,14300,,'',0,10000,,'',0
 '1798',901,61500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'1803',901,71400,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2919',901,70400,,'',0,13100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2964',901,71400,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '1798',1500,65000,,'',0,8300,,'',0,12000,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
-'2964',1500,93300,,'',0,18600,,'',0,43000,,'',0,18400,,'',0
+'1803',1500,93300,,'',0,18600,,'',0,43000,,'',0,18400,,'',0
 '1798',1601,80700,,'',0,11900,,'',0,68400,,'',0,4600,,'',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 cbe8b873..95855e71 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,7 +1,7 @@
 '1798',201,52300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6000,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2300,,'',0,7000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'1803',201,61500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
 '2919',201,62900,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2964',201,61500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
+'1803',400,63500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,14400,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',400,71700,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2964',400,63500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,14400,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'1803',901,71600,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2919',901,70600,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17400,,'',0
-'2964',901,71600,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
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 ca43f703..d2b296ea 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,7 +1,7 @@
 '1798',201,52400,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6000,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,1700,,'',0,2100,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,6300,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'1803',201,61600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
 '2919',201,63000,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2964',201,61600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
+'1803',400,63600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,14400,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',400,71800,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2964',400,63600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,14400,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'1803',901,71700,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2919',901,70700,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17400,,'',0
-'2964',901,71700,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
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 0c40344d..4e62307a 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,11 +1,11 @@
 '1798',201,52500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6000,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,1700,,'',0,6200,,'',0,1900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,6300,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'1803',201,61600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2919',201,63000,,'',0,8200,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2964',201,61600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
+'1803',400,63600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,14400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '2919',400,71800,,'',0,20400,,'',0,12600,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2964',400,63600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,14400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '1798',500,61900,,'',0,9300,,'',0,3500,,'',0,7100,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7700,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3800,,'',0,7500,,'',0,3300,,'',0,7200,,'',0,2900,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
+'1803',500,71300,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3300,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,9700,,'',0
 '2919',500,64900,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
-'2964',500,71300,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3300,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,9700,,'',0
+'1803',901,71700,,'',0,9300,,'',0,9800,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,9900,,'',0,10200,,'',0,9900,,'',0
 '2919',901,70700,,'',0,13100,,'',0,17200,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17300,,'',0
-'2964',901,71700,,'',0,9300,,'',0,9800,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,9900,,'',0,10200,,'',0,9900,,'',0
 '1798',1200,73800,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,15800,,'',0,11600,,'',0,11800,,'',0,17700,,'',0,3200,,'',0,8000,,'',0,3100,,'',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 45d7cbec..2b3a94b7 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,11 +1,11 @@
 '1798',201,52600,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6000,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,6300,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'1803',201,61700,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2919',201,63100,,'',0,8200,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2964',201,61700,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
+'1803',400,63700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,15500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '2919',400,71900,,'',0,20400,,'',0,12600,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2964',400,63700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,15500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '1798',500,62000,,'',0,9300,,'',0,3400,,'',0,7200,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7700,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3800,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,2900,,'',0,7300,,'',0,7500,,'',0,2700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
+'1803',500,71400,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,9700,,'',0
 '2919',500,65000,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
-'2964',500,71400,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,9700,,'',0
+'1803',901,71800,,'',0,9300,,'',0,9800,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,9900,,'',0,10200,,'',0,9900,,'',0
 '2919',901,70800,,'',0,13100,,'',0,17200,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17300,,'',0
-'2964',901,71800,,'',0,9300,,'',0,9800,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,9900,,'',0,10200,,'',0,9900,,'',0
 '1798',1200,73900,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,15700,,'',0,11600,,'',0,11900,,'',0,17600,,'',0,3200,,'',0,8000,,'',0,3200,,'',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 c65c92e7..3f643eda 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,18 +1,18 @@
 '1798',101,54400,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,2800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'1803',101,61700,,'',0,3800,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8700,,'',0
 '2919',101,62100,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
-'2964',101,61700,,'',0,3800,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8700,,'',0
 '1798',201,52600,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,6300,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'1803',201,61700,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2919',201,63100,,'',0,8200,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2964',201,61700,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
+'1803',400,63700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,15500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '2919',400,71900,,'',0,20400,,'',0,12600,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2964',400,63700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,15500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '1798',500,62000,,'',0,9300,,'',0,3500,,'',0,7200,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7700,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3800,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,2900,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
+'1803',500,71400,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3300,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,9700,,'',0
 '2919',500,65000,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
-'2964',500,71400,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3300,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,9700,,'',0
+'1803',701,74000,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,25000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
 '2919',701,63900,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',701,74000,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,25000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
+'1803',901,71800,,'',0,9300,,'',0,9800,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,9900,,'',0,10200,,'',0,9900,,'',0
 '2919',901,70800,,'',0,13100,,'',0,17200,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17300,,'',0
-'2964',901,71800,,'',0,9300,,'',0,9800,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,9900,,'',0,10200,,'',0,9900,,'',0
 '1798',1200,73900,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,15800,,'',0,11600,,'',0,11900,,'',0,17600,,'',0,3200,,'',0,8000,,'',0,3100,,'',0
+'1803',1000701,64100,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,25200,,'',0,20800,,'',0,20400,,'',0
 '2919',1000701,74200,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
-'2964',1000701,64100,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,25200,,'',0,20800,,'',0,20400,,'',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 3e73ed20..4d4ff78f 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,11 +1,11 @@
 '1798',101,54800,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0
+'1803',101,62100,,'',0,3800,,'',0,8700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,2800,,'',0,8700,,'',0
 '2919',101,62500,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0
-'2964',101,62100,,'',0,3800,,'',0,8700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,2800,,'',0,8700,,'',0
 '1798',201,53000,,'',0,7000,,'',0,3000,,'',0,2900,,'',0,6000,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6300,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
+'1803',201,62200,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2919',201,63600,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2964',201,62200,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '1798',1701,62700,,'',0,3200,,'',0,8700,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
 '1798',2101,60100,,'',0,3600,,'',0,18300,,'',0,12600,,'',0,11100,,'',0,15700,,'',0,12900,,'',0,7100,,'',0,4500,,'',0,8600,,'',0,10200,,'',0,15900,,'',0,11300,,'',0
+'1803',2101,73800,,'',0,20000,,'',0,11600,,'',0,18700,,'',0,16400,,'',0,11400,,'',0,9700,,'',0,10000,,'',0,12600,,'',0
 '2919',2101,90000,,'',0,13000,,'',0,12500,,'',0,16900,,'',0,13000,,'',0,16900,,'',0,13300,,'',0
-'2964',2101,73800,,'',0,20000,,'',0,11600,,'',0,18700,,'',0,16400,,'',0,11400,,'',0,9700,,'',0,10000,,'',0,12600,,'',0
 '1798',1002101,72000,,'',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 e9c3afae..e5fe18f0 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,11 +1,11 @@
 '1798',101,54900,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,2800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'1803',101,62200,,'',0,7800,,'',0,4700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,2900,,'',0,8700,,'',0
 '2919',101,62600,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
-'2964',101,62200,,'',0,7800,,'',0,4700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,2900,,'',0,8700,,'',0
 '1798',201,53100,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6300,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'1803',201,62200,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2919',201,63600,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2964',201,62200,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '1798',1701,62800,,'',0,7200,,'',0,4700,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
 '1798',2101,60200,,'',0,3600,,'',0,18200,,'',0,12600,,'',0,11200,,'',0,15700,,'',0,12900,,'',0,7100,,'',0,8500,,'',0,4600,,'',0,10200,,'',0,15900,,'',0,11200,,'',0
+'1803',2101,73800,,'',0,20000,,'',0,11700,,'',0,18700,,'',0,16400,,'',0,11400,,'',0,9700,,'',0,10000,,'',0,12600,,'',0
 '2919',2101,90000,,'',0,13000,,'',0,12600,,'',0,16900,,'',0,13000,,'',0,16900,,'',0,13300,,'',0
-'2964',2101,73800,,'',0,20000,,'',0,11700,,'',0,18700,,'',0,16400,,'',0,11400,,'',0,9700,,'',0,10000,,'',0,12600,,'',0
 '1798',1002101,72000,,'',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 a94742c0..a0de9d71 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,11 +1,11 @@
 '1798',101,54900,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,3000,,'',0,7000,,'',0
+'1803',101,62200,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3200,,'',0,7300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,2800,,'',0,8700,,'',0
 '2919',101,62600,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0
-'2964',101,62200,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3200,,'',0,7300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,2800,,'',0,8700,,'',0
 '1798',201,53100,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2000,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
+'1803',201,62300,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2919',201,63700,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2964',201,62300,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '1798',1701,62800,,'',0,7200,,'',0,4800,,'',0,76400,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
 '1798',2101,60200,,'',0,3600,,'',0,18300,,'',0,12600,,'',0,11100,,'',0,15700,,'',0,13000,,'',0,7100,,'',0,8500,,'',0,4600,,'',0,10200,,'',0,15900,,'',0,11200,,'',0
+'1803',2101,73900,,'',0,20000,,'',0,11600,,'',0,18800,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
 '2919',2101,90100,,'',0,13000,,'',0,12500,,'',0,16900,,'',0,13000,,'',0,16900,,'',0,13300,,'',0
-'2964',2101,73900,,'',0,20000,,'',0,11600,,'',0,18800,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
 '1798',1002101,72100,,'',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 84c78c5f..98c9ac4a 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,11 +1,11 @@
 '1798',101,55000,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
+'1803',101,62300,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3200,,'',0,7300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,2800,,'',0,8700,,'',0
 '2919',101,62700,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0
-'2964',101,62300,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3200,,'',0,7300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,2800,,'',0,8700,,'',0
 '1798',201,53200,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2700,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6300,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'1803',201,62300,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2919',201,63700,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2964',201,62300,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '1798',1701,62900,,'',0,7200,,'',0,4700,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
 '1798',2101,60300,,'',0,3600,,'',0,18200,,'',0,12600,,'',0,11200,,'',0,15700,,'',0,12900,,'',0,7200,,'',0,8500,,'',0,4600,,'',0,10100,,'',0,15900,,'',0,11200,,'',0
+'1803',2101,73900,,'',0,20000,,'',0,11700,,'',0,18700,,'',0,16400,,'',0,11400,,'',0,9700,,'',0,10000,,'',0,12600,,'',0
 '2919',2101,90100,,'',0,13000,,'',0,12600,,'',0,16900,,'',0,13000,,'',0,16900,,'',0,13300,,'',0
-'2964',2101,73900,,'',0,20000,,'',0,11700,,'',0,18700,,'',0,16400,,'',0,11400,,'',0,9700,,'',0,10000,,'',0,12600,,'',0
 '1798',1002101,72100,,'',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 4e1984c0..75a82553 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,11 +1,11 @@
 '1798',101,55100,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
+'1803',101,62400,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3200,,'',0,7300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
 '2919',101,62800,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0
-'2964',101,62400,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3200,,'',0,7300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
 '1798',201,53300,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2700,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'1803',201,62400,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2919',201,63800,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2964',201,62400,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '1798',1701,63000,,'',0,7200,,'',0,4800,,'',0,76400,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
 '1798',2101,60400,,'',0,3600,,'',0,18300,,'',0,12600,,'',0,15100,,'',0,11700,,'',0,13000,,'',0,7200,,'',0,8500,,'',0,4600,,'',0,10100,,'',0,15900,,'',0,11200,,'',0
+'1803',2101,74100,,'',0,20000,,'',0,11600,,'',0,18800,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
 '2919',2101,90300,,'',0,13000,,'',0,12500,,'',0,16900,,'',0,13000,,'',0,16900,,'',0,13300,,'',0
-'2964',2101,74100,,'',0,20000,,'',0,11600,,'',0,18800,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
 '1798',1002101,72300,,'',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 c2ee3aac..cdf10cc2 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 @@
 '1798',101,55200,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
+'1803',101,62500,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
 '2919',101,62900,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
-'2964',101,62500,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
 '1798',201,53400,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2700,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'1803',201,62500,,'',0,7500,,'',0,2900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2919',201,63900,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2964',201,62500,,'',0,7500,,'',0,2900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
diff --git a/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 a0131b42..35862702 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 @@
 '1798',101,55200,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
+'1803',101,62500,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
 '2919',101,62900,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
-'2964',101,62500,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
 '1798',201,53400,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2000,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2700,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
+'1803',201,62600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2919',201,64000,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2964',201,62600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
diff --git a/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 ac3fa010..e6968de5 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,6 +1,6 @@
 '1798',201,53500,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2000,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
+'1803',201,62700,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2919',201,64100,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2964',201,62700,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '1798',300,54500,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7800,,'',0,7100,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'1803',300,55000,,'',0,10000,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '2919',300,63300,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2964',300,55000,,'',0,10000,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
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 3176232c..67b7f5e8 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,3 +1,3 @@
 '1798',201,53600,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
+'1803',201,62700,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2919',201,64100,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
-'2964',201,62700,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
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 dffc06de..ebc1016b 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,3 +1,3 @@
 '1798',201,53700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
+'1803',201,62800,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2919',201,64200,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
-'2964',201,62800,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
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 5cae190c..98ba8f41 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,3 +1,3 @@
 '1798',201,53800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2900,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
+'1803',201,62900,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2919',201,64300,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
-'2964',201,62900,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
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 b9be9885..891d5df7 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 @@
 '1798',201,53900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2000,,'',0,1700,,'',0,5900,,'',0,2000,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
+'1803',201,63000,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2919',201,64400,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
-'2964',201,63000,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
diff --git a/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 6bc9ebc3..1b646434 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 @@
 '1798',201,54100,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2000,,'',0,1700,,'',0,5900,,'',0,2000,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
+'1803',201,63200,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2919',201,64600,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8500,,'',0,8500,,'',0
-'2964',201,63200,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
diff --git a/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 408c8f62..64be8cc0 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 @@
 '1798',201,54200,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2000,,'',0,1700,,'',0,5900,,'',0,2000,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
+'1803',201,63300,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2919',201,64700,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8500,,'',0,8500,,'',0
-'2964',201,63300,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
diff --git a/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 fcdad83c..600d123d 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 @@
 '1798',201,54200,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2100,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
+'1803',201,63300,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2919',201,64700,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
-'2964',201,63300,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
diff --git a/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 380cd902..8dde3e3d 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 @@
 '1798',201,54300,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2000,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
+'1803',201,63400,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2919',201,64800,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8500,,'',0,8500,,'',0
-'2964',201,63400,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
diff --git a/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 7e631b5f..03c4c201 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 @@
 '1798',100,52500,,'',0,8000,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,2000,,'',0,800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2700,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
+'1803',100,60800,,'',0,3000,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6700,,'',0
 '2919',100,60600,,'',0,3600,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
-'2964',100,60800,,'',0,3000,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6700,,'',0
 '1798',200,53600,,'',0,2200,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2100,,'',0,5800,,'',0,2000,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7000,,'',0,1800,,'',0,1800,,'',0,1900,,'',0,5500,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
+'1803',200,60100,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0
 '2919',200,61800,,'',0,8300,,'',0,4200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4300,,'',0
-'2964',200,60100,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',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 01ab90b0..a8f593a4 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 @@
 '1798',100,52500,,'',0,8000,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,2000,,'',0,800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2700,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
+'1803',100,60800,,'',0,3000,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6700,,'',0
 '2919',100,60600,,'',0,3600,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
-'2964',100,60800,,'',0,3000,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6700,,'',0
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 f6dab25d..79c13436 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 @@
 '1798',100,52600,,'',0,8000,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,2000,,'',0,800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2700,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
+'1803',100,60900,,'',0,3000,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6700,,'',0
 '2919',100,60700,,'',0,3600,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
-'2964',100,60900,,'',0,3000,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6700,,'',0
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 cf5edc6e..7b4abb70 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 @@
 '1798',100,52600,,'',0,8100,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,2000,,'',0,800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2700,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
+'1803',100,60900,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6600,,'',0
 '2919',100,60700,,'',0,3700,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
-'2964',100,60900,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6600,,'',0
 '1798',200,53700,,'',0,2200,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2900,,'',0,6800,,'',0,1800,,'',0,1800,,'',0,1900,,'',0,5500,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
+'1803',200,60200,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0
 '2919',200,61900,,'',0,8300,,'',0,4200,,'',0,8500,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4300,,'',0
-'2964',200,60200,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',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 8476ffaf..fa4337b9 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 @@
 '1798',100,52700,,'',0,8000,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,2100,,'',0,800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2600,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
+'1803',100,61000,,'',0,3000,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6700,,'',0
 '2919',100,60800,,'',0,3600,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8600,,'',0,8600,,'',0,8700,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
-'2964',100,61000,,'',0,3000,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6700,,'',0
 '1798',200,53700,,'',0,2200,,'',0,7000,,'',0,7100,,'',0,2700,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2900,,'',0,6800,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
+'1803',200,60200,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0
 '2919',200,61900,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4200,,'',0
-'2964',200,60200,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',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 45701b82..03599ddd 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 @@
 '1798',100,52800,,'',0,8100,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,2000,,'',0,800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2700,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
+'1803',100,61100,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6600,,'',0
 '2919',100,60900,,'',0,3700,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
-'2964',100,61100,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6600,,'',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 40d2a2a1..e0dd06c9 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 @@
 '1798',100,52900,,'',0,8000,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,2100,,'',0,4800,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2600,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
+'1803',100,61200,,'',0,3000,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6700,,'',0
 '2919',100,61000,,'',0,3600,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8600,,'',0,8600,,'',0,8700,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
-'2964',100,61200,,'',0,3000,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6700,,'',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 db47df0e..daed6802 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 @@
 '1798',100,53000,,'',0,8100,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,2100,,'',0,4800,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,6600,,'',0,2900,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
+'1803',100,61300,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6600,,'',0
 '2919',100,61100,,'',0,3700,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8600,,'',0,8600,,'',0,8700,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
-'2964',100,61300,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6600,,'',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 d32c7482..8ae1dbeb 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,3 +1,3 @@
 '1798',100,53100,,'',0,8100,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,2100,,'',0,4800,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,6600,,'',0,2900,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
+'1803',100,61400,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6600,,'',0
 '2919',100,61200,,'',0,3700,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8600,,'',0,8600,,'',0,8700,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
-'2964',100,61400,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6600,,'',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 301b057c..1157e89a 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,3 +1,3 @@
 '1798',100,53200,,'',0,8100,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,2100,,'',0,4800,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,6600,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,2700,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
+'1803',100,61500,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,2900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6600,,'',0
 '2919',100,61300,,'',0,3700,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8600,,'',0,8600,,'',0,8700,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
-'2964',100,61500,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,2900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6600,,'',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 bc89f6f3..701a1bd9 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,3 +1,3 @@
 '1798',100,53300,,'',0,8100,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,2100,,'',0,4800,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6200,,'',0,2000,,'',0,2100,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,6600,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,2700,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
+'1803',100,61600,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,2900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6600,,'',0
 '2919',100,61300,,'',0,3800,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8600,,'',0,8600,,'',0,8700,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
-'2964',100,61600,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,2900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6600,,'',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 b5ed6b24..a640f652 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,3 +1,3 @@
 '1798',100,53400,,'',0,8100,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,2100,,'',0,4800,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6200,,'',0,2000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6200,,'',0,2000,,'',0,2100,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,6600,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,2700,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
+'1803',100,61700,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,2700,,'',0,6600,,'',0
 '2919',100,61400,,'',0,3800,,'',0,8100,,'',0,8100,,'',0,8600,,'',0,4600,,'',0,8600,,'',0,8700,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
-'2964',100,61700,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,2700,,'',0,6600,,'',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 9755c0ba..ac196f29 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 @@
 '1798',100,53400,,'',0,8100,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,2100,,'',0,4800,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6200,,'',0,2000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6200,,'',0,2000,,'',0,2100,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,6600,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,2700,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
+'1803',100,61700,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,2700,,'',0,6600,,'',0
 '2919',100,61400,,'',0,3800,,'',0,8100,,'',0,8100,,'',0,8600,,'',0,4600,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,9900,,'',0
-'2964',100,61700,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,2700,,'',0,6600,,'',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 44541b5d..ab811a6e 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,6 +1,6 @@
 '1798',301,60700,,'',0,9300,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
+'1803',301,70100,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
 '2919',301,63700,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9700,,'',0,10000,,'',0
-'2964',301,70100,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
 '1798',500,61100,,'',0,9300,,'',0,3300,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
+'1803',500,70600,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,2900,,'',0,7200,,'',0,6900,,'',0,2900,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,9700,,'',0
 '2919',500,64200,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9700,,'',0,10000,,'',0
-'2964',500,70600,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,2900,,'',0,7200,,'',0,6900,,'',0,2900,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,9700,,'',0
diff --git a/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 d7766c2d..366f2bd0 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,15 +1,15 @@
 '1798',300,55500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3800,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
 '1798',301,60000,,'',0,5200,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,10000,,'',0
+'1803',300,55900,,'',0,10000,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'1803',301,65400,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
 '2919',300,64200,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
 '2919',301,63000,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,5200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2964',300,55900,,'',0,10000,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'2964',301,65400,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
 '1798',601,55600,,'',0,8500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8000,,'',0,12000,,'',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
+'1803',601,60500,,'',0,12000,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
 '2919',601,60100,,'',0,13000,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2964',601,60500,,'',0,12000,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
 '1798',3100,72800,,'',0,3100,,'',0,7000,,'',0,10400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10700,,'',0,9200,,'',0,4200,,'',0,1500,,'',0,7200,,'',0,7100,,'',0,1300,,'',0,3700,,'',0
-'2964',3100,91900,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
+'1803',3100,91900,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
 '1798',1003100,64200,,'',0,6900,,'',0,3000,,'',0,7300,,'',0,4500,,'',0,14500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,10700,,'',0,7700,,'',0,9300,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,11000,,'',0
+'1803',1003100,84600,,'',0,10200,,'',0,10700,,'',0,14900,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,11200,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
 '2919',1003100,101300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
-'2964',1003100,84600,,'',0,10200,,'',0,10700,,'',0,14900,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,11200,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
 '1798',24003100,55900,,'',0,7100,,'',0,7000,,'',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 ecd03895..ae661077 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,15 +1,15 @@
 '1798',300,55500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3800,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
 '1798',301,60000,,'',0,5300,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,9900,,'',0
+'1803',300,55900,,'',0,10000,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'1803',301,65400,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
 '2919',300,64200,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
 '2919',301,63000,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,5200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2964',300,55900,,'',0,10000,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'2964',301,65400,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
 '1798',601,55600,,'',0,8500,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8000,,'',0,12000,,'',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
+'1803',601,60500,,'',0,12000,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
 '2919',601,60100,,'',0,13000,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2964',601,60500,,'',0,12000,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
 '1798',3100,72800,,'',0,3100,,'',0,7000,,'',0,10400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10800,,'',0,9200,,'',0,4200,,'',0,1500,,'',0,7200,,'',0,7100,,'',0,1300,,'',0,3600,,'',0
-'2964',3100,91900,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
+'1803',3100,91900,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
 '1798',1003100,64200,,'',0,6900,,'',0,3000,,'',0,7300,,'',0,4500,,'',0,14500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,10800,,'',0,7700,,'',0,9300,,'',0,3000,,'',0,8800,,'',0,10000,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,11000,,'',0
+'1803',1003100,84600,,'',0,10200,,'',0,10700,,'',0,14900,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,11200,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
 '2919',1003100,101300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
-'2964',1003100,84600,,'',0,10200,,'',0,10700,,'',0,14900,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,11200,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
 '1798',24003100,55900,,'',0,7100,,'',0,7000,,'',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 e02d25cc..87cdb458 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,12 +1,12 @@
 '1798',300,55600,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3800,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'1803',300,60000,,'',0,10000,,'',0,5800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '2919',300,64300,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2964',300,60000,,'',0,10000,,'',0,5800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '1798',601,55700,,'',0,8500,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3400,,'',0,8000,,'',0,12000,,'',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
+'1803',601,60600,,'',0,12000,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
 '2919',601,60200,,'',0,13000,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2964',601,60600,,'',0,12000,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
 '1798',3100,72900,,'',0,7100,,'',0,3000,,'',0,10400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10700,,'',0,9200,,'',0,4200,,'',0,1500,,'',0,7200,,'',0,7100,,'',0,1300,,'',0,3700,,'',0
-'2964',3100,92000,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
+'1803',3100,92000,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
 '1798',1003100,64300,,'',0,6900,,'',0,3000,,'',0,7300,,'',0,8500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,10700,,'',0,7700,,'',0,9300,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,10900,,'',0
+'1803',1003100,84700,,'',0,10200,,'',0,10700,,'',0,14900,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,11200,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
 '2919',1003100,101400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
-'2964',1003100,84700,,'',0,10200,,'',0,10700,,'',0,14900,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,11200,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
 '1798',24003100,60000,,'',0,3100,,'',0,7000,,'',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 765d5ba3..5a271841 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,12 +1,12 @@
 '1798',300,55700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3800,,'',0,6900,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'1803',300,60100,,'',0,10000,,'',0,5800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '2919',300,64400,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2964',300,60100,,'',0,10000,,'',0,5800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '1798',601,55700,,'',0,8500,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8000,,'',0,12000,,'',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
+'1803',601,60600,,'',0,12000,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
 '2919',601,60200,,'',0,13000,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2964',601,60600,,'',0,12000,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
 '1798',3100,72900,,'',0,7100,,'',0,3000,,'',0,10400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10800,,'',0,9200,,'',0,4200,,'',0,5500,,'',0,3200,,'',0,7100,,'',0,1300,,'',0,3600,,'',0
-'2964',3100,92000,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
+'1803',3100,92000,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
 '1798',1003100,64300,,'',0,6900,,'',0,3000,,'',0,7300,,'',0,8500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,10800,,'',0,7700,,'',0,9300,,'',0,3000,,'',0,8800,,'',0,10000,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,11000,,'',0
+'1803',1003100,84700,,'',0,10200,,'',0,10700,,'',0,14900,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,11200,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
 '2919',1003100,101400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
-'2964',1003100,84700,,'',0,10200,,'',0,10700,,'',0,14900,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,11200,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
 '1798',24003100,60000,,'',0,3100,,'',0,7000,,'',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 5002a44f..657a263a 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,12 +1,12 @@
 '1798',300,55700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3800,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'1803',300,60100,,'',0,10000,,'',0,5800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '2919',300,64400,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2964',300,60100,,'',0,10000,,'',0,5800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '1798',601,55700,,'',0,8600,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3400,,'',0,8000,,'',0,12000,,'',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
+'1803',601,60600,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
 '2919',601,60200,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2964',601,60600,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
 '1798',3100,73000,,'',0,7100,,'',0,3000,,'',0,10400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10700,,'',0,9200,,'',0,4200,,'',0,5500,,'',0,3200,,'',0,7100,,'',0,1300,,'',0,3700,,'',0
-'2964',3100,92100,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
+'1803',3100,92100,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
 '1798',1003100,64400,,'',0,6900,,'',0,3000,,'',0,7300,,'',0,8500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,10700,,'',0,7700,,'',0,9300,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,10900,,'',0
+'1803',1003100,84800,,'',0,10200,,'',0,10700,,'',0,14900,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,11200,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
 '2919',1003100,101500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
-'2964',1003100,84800,,'',0,10200,,'',0,10700,,'',0,14900,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,11200,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
 '1798',24003100,60100,,'',0,3100,,'',0,7000,,'',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 372afa1e..485dc2c9 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,9 +1,9 @@
 '1798',300,55800,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3800,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'1803',300,60200,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '2919',300,64500,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2964',300,60200,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '1798',3100,73000,,'',0,7100,,'',0,3000,,'',0,10400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10800,,'',0,9200,,'',0,4200,,'',0,5500,,'',0,3200,,'',0,7100,,'',0,1300,,'',0,3600,,'',0
-'2964',3100,92100,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
+'1803',3100,92100,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
 '1798',1003100,64400,,'',0,6900,,'',0,3000,,'',0,7300,,'',0,8500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,10800,,'',0,7700,,'',0,9300,,'',0,3000,,'',0,8800,,'',0,10000,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,11000,,'',0
+'1803',1003100,84800,,'',0,10200,,'',0,10700,,'',0,14900,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,11200,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
 '2919',1003100,101500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
-'2964',1003100,84800,,'',0,10200,,'',0,10700,,'',0,14900,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,11200,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
 '1798',24003100,60100,,'',0,3100,,'',0,7000,,'',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 016c4a17..38b109e5 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,9 +1,9 @@
 '1798',300,55900,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3800,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'1803',300,60300,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '2919',300,64600,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2964',300,60300,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '1798',3100,73100,,'',0,7100,,'',0,3000,,'',0,10400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10800,,'',0,9200,,'',0,4200,,'',0,5500,,'',0,3200,,'',0,7100,,'',0,1300,,'',0,3600,,'',0
-'2964',3100,92200,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
+'1803',3100,92200,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
 '1798',1003100,64500,,'',0,6900,,'',0,3000,,'',0,7300,,'',0,8500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,10800,,'',0,7700,,'',0,9300,,'',0,3000,,'',0,8800,,'',0,10000,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,10900,,'',0
+'1803',1003100,84900,,'',0,10200,,'',0,10700,,'',0,14900,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,11200,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
 '2919',1003100,101600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
-'2964',1003100,84900,,'',0,10200,,'',0,10700,,'',0,14900,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,11200,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
 '1798',24003100,60200,,'',0,3100,,'',0,7000,,'',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 94a72460..02fe6436 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,9 +1,9 @@
 '1798',300,60000,,'',0,3000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3800,,'',0,6900,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'1803',300,60400,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '2919',300,64700,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2964',300,60400,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '1798',3100,73200,,'',0,7100,,'',0,3000,,'',0,10400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10700,,'',0,9200,,'',0,4200,,'',0,5500,,'',0,3200,,'',0,7100,,'',0,1300,,'',0,3700,,'',0
-'2964',3100,92300,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
+'1803',3100,92300,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
 '1798',1003100,64600,,'',0,6900,,'',0,3000,,'',0,7300,,'',0,8500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,10700,,'',0,7700,,'',0,9300,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,10900,,'',0
+'1803',1003100,85000,,'',0,10200,,'',0,10700,,'',0,14900,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,15200,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
 '2919',1003100,101700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
-'2964',1003100,85000,,'',0,10200,,'',0,10700,,'',0,14900,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,15200,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
 '1798',24003100,60300,,'',0,3100,,'',0,7000,,'',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 b8d625ee..4fd0877d 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,6 +1,6 @@
 '1798',100,54900,,'',0,8200,,'',0,7000,,'',0,3200,,'',0,2200,,'',0,6100,,'',0,800,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,2000,,'',0,6300,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2500,,'',0,6700,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,7000,,'',0,2900,,'',0
+'1803',100,63200,,'',0,7100,,'',0,3900,,'',0,8700,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2600,,'',0
 '2919',100,62900,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,8700,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,9900,,'',0
-'2964',100,63200,,'',0,7100,,'',0,3900,,'',0,8700,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2600,,'',0
 '1798',300,60400,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,3600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3800,,'',0,6900,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
+'1803',300,60800,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '2919',300,65100,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2964',300,60800,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/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 fd44631b..2a69f48a 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,6 +1,6 @@
 '1798',100,55000,,'',0,8200,,'',0,7000,,'',0,3200,,'',0,2200,,'',0,6100,,'',0,800,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,2000,,'',0,6300,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2600,,'',0,6700,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,7000,,'',0,2900,,'',0
+'1803',100,63200,,'',0,7100,,'',0,3900,,'',0,8700,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2500,,'',0
 '2919',100,62900,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,8800,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,9800,,'',0
-'2964',100,63200,,'',0,7100,,'',0,3900,,'',0,8700,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2500,,'',0
 '1798',300,60500,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,3600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3800,,'',0,6900,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
+'1803',300,60800,,'',0,10000,,'',0,9900,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9300,,'',0
 '2919',300,65200,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2964',300,60800,,'',0,10000,,'',0,9900,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9300,,'',0
diff --git a/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 132395d8..96e3098a 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,6 +1,6 @@
 '1798',100,55000,,'',0,8200,,'',0,7000,,'',0,3200,,'',0,2200,,'',0,6100,,'',0,800,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,2000,,'',0,6300,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2500,,'',0,6700,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1700,,'',0,1800,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,7000,,'',0,2900,,'',0
+'1803',100,63300,,'',0,7100,,'',0,3900,,'',0,8700,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2600,,'',0
 '2919',100,63000,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,8700,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,9900,,'',0
-'2964',100,63300,,'',0,7100,,'',0,3900,,'',0,8700,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2600,,'',0
 '1798',300,60500,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,3600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3700,,'',0,6900,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
+'1803',300,60900,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '2919',300,65200,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2964',300,60900,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/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 e9d82f3d..f1d7dc14 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,3 +1,3 @@
 '1798',300,60600,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,3600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3600,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3800,,'',0,6900,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
+'1803',300,60900,,'',0,10000,,'',0,9900,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9300,,'',0
 '2919',300,65300,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2964',300,60900,,'',0,10000,,'',0,9900,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9300,,'',0
diff --git a/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 88bfdc7a..e0a2c488 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,3 +1,3 @@
 '1798',300,60600,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3600,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3800,,'',0,6800,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
+'1803',300,61000,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '2919',300,65300,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5200,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2964',300,61000,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/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 dcd5a9bf..1a027711 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,3 +1,3 @@
 '1798',300,60700,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3800,,'',0,6800,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
+'1803',300,61100,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '2919',300,65400,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5200,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2964',300,61100,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/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 b7f8a2a2..48f4367e 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,10 +1,10 @@
 '1798',300,60800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3800,,'',0,6800,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
+'1803',300,61100,,'',0,10000,,'',0,9900,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9300,,'',0
 '2919',300,65500,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5200,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2964',300,61100,,'',0,10000,,'',0,9900,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9300,,'',0
 '1798',700,62200,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20500,,'',0,20400,,'',0,20000,,'',0,20900,,'',0
+'1803',700,70900,,'',0,14600,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
 '2919',700,60900,,'',0,20100,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,15800,,'',0,16500,,'',0
-'2964',700,70900,,'',0,14600,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
 '1798',1600,74000,,'',0,16000,,'',0,64400,,'',0,8500,,'',0
 '1798',1000700,73800,,'',0,2000,,'',0,17500,,'',0,20000,,'',0,20100,,'',0,20500,,'',0,6500,,'',0,14000,,'',0,19900,,'',0,20000,,'',0
+'1803',1000700,60900,,'',0,19600,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
 '2919',1000700,70900,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
-'2964',1000700,60900,,'',0,19600,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',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 8e34271c..08662c0b 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,10 +1,10 @@
 '1798',300,60800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7800,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3700,,'',0,6800,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
+'1803',300,61200,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '2919',300,65500,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5200,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2964',300,61200,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '1798',700,62200,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20500,,'',0,20400,,'',0,20000,,'',0,20900,,'',0
+'1803',700,70900,,'',0,14600,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
 '2919',700,60900,,'',0,20100,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,15800,,'',0,16500,,'',0
-'2964',700,70900,,'',0,14600,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
 '1798',1600,74000,,'',0,16000,,'',0,64400,,'',0,8500,,'',0
 '1798',1000700,73800,,'',0,2000,,'',0,17500,,'',0,20000,,'',0,20100,,'',0,20500,,'',0,6500,,'',0,14000,,'',0,19900,,'',0,20000,,'',0
+'1803',1000700,60900,,'',0,19600,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
 '2919',1000700,70900,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
-'2964',1000700,60900,,'',0,19600,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',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 666741fa..76f3a8c7 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,3 +1,3 @@
 '1798',300,61000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7800,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3700,,'',0,6800,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
+'1803',300,61300,,'',0,10000,,'',0,9900,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7300,,'',0,2800,,'',0,3000,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,5700,,'',0,9700,,'',0,9300,,'',0
 '2919',300,65700,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9200,,'',0,5000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2964',300,61300,,'',0,10000,,'',0,9900,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7300,,'',0,2800,,'',0,3000,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,5700,,'',0,9700,,'',0,9300,,'',0
diff --git a/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 bbb5db2d..acea9c78 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,3 +1,3 @@
 '1798',300,61100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7800,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3700,,'',0,6800,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
+'1803',300,61400,,'',0,10000,,'',0,9900,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,5700,,'',0,9700,,'',0,9300,,'',0
 '2919',300,65800,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9200,,'',0,5000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2964',300,61400,,'',0,10000,,'',0,9900,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,5700,,'',0,9700,,'',0,9300,,'',0
diff --git a/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 8ae48425..1ff38eaa 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,6 +1,6 @@
 '1798',300,62500,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,7500,4,'',0,3300,4,'',0,7000,4,'',0,3000,4,'',0,7500,4,'',0,3200,4,'',0,7000,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7700,4,'',0,3800,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7100,4,'',0,3300,4,'',0,7700,4,'',0,2800,4,'',0,8500,4,'',0,8400,4,'',0,10000,4,'',0,9500,4,'',0
 '1798',301,54000,,'',0,9000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3800,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,9000,0,'Montrose Exch Only',0
+'1803',300,62800,4,'',0,10000,4,'',0,10000,4,'',0,3000,4,'',0,6700,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,7300,4,'',0,3000,4,'',0,7000,4,'',0,3500,4,'',0,7500,4,'',0,3000,4,'',0,7000,4,'',0,3400,4,'',0,7300,4,'',0,2800,4,'',0,7000,4,'',0,3200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,9700,4,'',0,9600,4,'',0,9300,4,'',0
+'1803',301,63300,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,8900,0,'Montrose Exch Only',0
 '2919',300,71200,4,'',0,9700,4,'',0,9600,4,'',0,10000,4,'',0,10000,4,'',0,5000,4,'',0,9000,4,'',0,10000,4,'',0,8800,4,'',0,9200,4,'',0,9200,4,'',0,9000,4,'',0,9900,4,'',0,10000,4,'',0,9900,4,'',0
 '2919',301,60900,,'',0,10800,,'',0,9700,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5000,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
-'2964',300,62800,4,'',0,10000,4,'',0,10000,4,'',0,3000,4,'',0,6700,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,7300,4,'',0,3000,4,'',0,7000,4,'',0,3500,4,'',0,7500,4,'',0,3000,4,'',0,7000,4,'',0,3400,4,'',0,7300,4,'',0,2800,4,'',0,7000,4,'',0,3200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,9700,4,'',0,9600,4,'',0,9300,4,'',0
-'2964',301,63300,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,8900,0,'Montrose Exch Only',0
diff --git a/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 1c072d2f..e53c926b 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,3 +1,3 @@
 '1798',300,62400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7700,,'',0,3800,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'1803',300,62700,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,9300,,'',0
 '2919',300,71100,,'',0,9700,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
-'2964',300,62700,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,9300,,'',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 4c8ab0ba..80aaa099 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,3 +1,3 @@
 '1798',300,61500,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7800,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
+'1803',300,61800,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,5600,,'',0,9300,,'',0
 '2919',300,70200,,'',0,5700,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,5000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
-'2964',300,61800,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,5600,,'',0,9300,,'',0
diff --git a/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 67138c51..5ec23a94 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,3 +1,3 @@
 '1798',300,61700,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7800,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,5500,,'',0
+'1803',300,62000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,5300,,'',0
 '2919',300,70400,,'',0,9700,,'',0,5600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,5000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
-'2964',300,62000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,5300,,'',0
diff --git a/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 b884712c..b9226020 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,3 +1,3 @@
 '1798',300,61700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7800,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,5500,,'',0
+'1803',300,62000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,5300,,'',0
 '2919',300,70400,,'',0,9700,,'',0,5600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,5000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
-'2964',300,62000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,5300,,'',0
diff --git a/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 22934240..9565aaf0 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,3 +1,3 @@
 '1798',300,61800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7800,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,5500,,'',0
+'1803',300,62100,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,5300,,'',0
 '2919',300,70500,,'',0,9700,,'',0,5600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,5900,,'',0,10000,,'',0,9900,,'',0
-'2964',300,62100,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,5300,,'',0
diff --git a/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 18186fd2..995d2cfd 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,3 +1,3 @@
 '1798',300,61300,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7800,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3700,,'',0,6800,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
+'1803',300,61600,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,5600,,'',0,9300,,'',0
 '2919',300,70000,,'',0,5700,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,5000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
-'2964',300,61600,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,5600,,'',0,9300,,'',0
diff --git a/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 09f48f26..382dfe64 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,3 +1,3 @@
 '1798',301,54200,,'',0,9100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3800,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,8900,0,'Montrose Exch Only',0
+'1803',301,63500,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
 '2919',301,61100,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
-'2964',301,63500,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
diff --git a/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 400d2263..f99f3ab6 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,3 +1,3 @@
 '1798',301,54300,,'',0,9100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3800,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,8900,0,'Montrose Exch Only',0
+'1803',301,63600,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
 '2919',301,61200,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
-'2964',301,63600,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
diff --git a/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 71a1f099..66331703 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,9 +1,9 @@
 '1798',301,54400,,'',0,9100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3800,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,8900,0,'Montrose Exch Only',0
+'1803',301,63700,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
 '2919',301,61300,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
-'2964',301,63700,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
 '1798',701,64400,0,'Montrose Exch',0,21200,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,24500,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,20700,0,'Montrose Exch',0
+'1803',701,73000,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,24800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
 '2919',701,62900,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',701,73000,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,24800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
 '1798',1000701,80300,0,'Montrose Exch',0,1900,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,24600,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,17800,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
+'1803',1000701,63100,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,24400,,'',0
 '2919',1000701,73200,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
-'2964',1000701,63100,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,24400,,'',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 fa348702..d4aac4d4 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,9 +1,9 @@
 '1798',301,54500,,'',0,9100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3800,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,8900,0,'Montrose Exch Only',0
+'1803',301,63800,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
 '2919',301,61400,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
-'2964',301,63800,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
 '1798',701,64500,0,'Montrose Exch',0,21200,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,24500,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,20700,0,'Montrose Exch',0
+'1803',701,73000,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,24800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
 '2919',701,62900,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',701,73000,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,24800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
 '1798',1000701,80300,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,24600,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,17900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
+'1803',1000701,63100,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,24400,,'',0
 '2919',1000701,73200,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
-'2964',1000701,63100,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,24400,,'',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 740981d4..2618f56d 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,3 +1,3 @@
 '1798',301,54500,,'',0,9200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3800,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,8900,0,'Montrose Exch Only',0
+'1803',301,63900,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,7000,,'',0,7200,,'',0,2900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
 '2919',301,61500,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
-'2964',301,63900,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,7000,,'',0,7200,,'',0,2900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
diff --git a/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 aa5fa4f9..eda3a884 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,3 +1,3 @@
 '1798',301,54700,,'',0,9200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,8900,0,'Montrose Exch Only',0
+'1803',301,64100,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
 '2919',301,61700,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
-'2964',301,64100,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
diff --git a/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 e1d58041..9866ee37 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,6 +1,6 @@
 '1798',101,53700,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'1803',101,61100,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8800,,'',0
 '2919',101,61500,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
-'2964',101,61100,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8800,,'',0
 '1798',301,54700,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8300,,'',0,10000,,'',0,8900,0,'Montrose Exch Only',0
+'1803',301,64200,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0,8700,0,'Montrose Exch Only',0
 '2919',301,61800,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
-'2964',301,64200,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0,8700,0,'Montrose Exch Only',0
diff --git a/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 c91e3ae9..73df9158 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,6 +1,6 @@
 '1798',101,53700,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'1803',101,61100,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8800,,'',0
 '2919',101,61600,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
-'2964',101,61100,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8800,,'',0
 '1798',301,54800,,'',0,9200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,8900,0,'Montrose Exch Only',0
+'1803',301,64200,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
 '2919',301,61800,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
-'2964',301,64200,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
diff --git a/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 effffde7..8944c480 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,6 +1,6 @@
 '1798',101,53800,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'1803',101,61200,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8800,,'',0
 '2919',101,61600,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
-'2964',101,61200,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8800,,'',0
 '1798',301,54800,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8300,,'',0,10000,,'',0,8900,0,'Montrose Exch Only',0
+'1803',301,64300,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0,8700,0,'Montrose Exch Only',0
 '2919',301,61900,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
-'2964',301,64300,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0,8700,0,'Montrose Exch Only',0
diff --git a/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 68a5f6e3..e2dd51a1 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,6 +1,6 @@
 '1798',101,53900,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,6400,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'1803',101,61300,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
 '2919',101,61700,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
-'2964',101,61300,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
 '1798',301,54900,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8300,,'',0,10000,,'',0,8900,0,'Montrose Exch Only',0
+'1803',301,64400,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0,8700,0,'Montrose Exch Only',0
 '2919',301,62000,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
-'2964',301,64400,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0,8700,0,'Montrose Exch Only',0
diff --git a/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 0315a1c4..75831464 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,8 +1,8 @@
 '1798',301,55100,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8300,,'',0,10000,,'',0
+'1803',301,64600,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0
 '2919',301,62200,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2964',301,64600,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0
 '1798',401,60700,,'',0,9500,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1803',401,60700,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',401,64900,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2964',401,60700,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '1798',1501,61700,,'',0,8300,,'',0,11800,,'',0,68300,,'',0,20200,,'',0,5100,,'',0
-'2964',1501,90000,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'1803',1501,90000,,'',0,14500,,'',0,47000,,'',0,18500,,'',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 75e8bf94..0a212567 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,8 +1,8 @@
 '1798',301,55200,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8300,,'',0,10000,,'',0
+'1803',301,64600,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
 '2919',301,62200,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2964',301,64600,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
 '1798',3101,64500,,'',0,8500,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,4600,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,7400,,'',0,1200,,'',0,3000,,'',0,7500,,'',0,6900,,'',0,2900,,'',0,1800,,'',0,38400,,'',0
-'2964',3101,83400,,'',0,10000,,'',0,10500,,'',0,10800,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,10900,,'',0,10900,,'',0
+'1803',3101,83400,,'',0,10000,,'',0,10500,,'',0,10800,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,10900,,'',0,10900,,'',0
 '1798',1003101,71600,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7400,,'',0,10100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15100,,'',0,5300,,'',0,8700,,'',0,7100,,'',0,3200,,'',0,6800,,'',0,10200,,'',0,8500,,'',0,12300,,'',0
+'1803',1003101,90600,,'',0,10100,,'',0,10700,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,14900,,'',0,11000,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
 '2919',1003101,110400,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2964',1003101,90600,,'',0,10100,,'',0,10700,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,14900,,'',0,11000,,'',0,10800,,'',0,10500,,'',0,10500,,'',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 3061260b..5db79df9 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,8 +1,8 @@
 '1798',301,55200,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8300,,'',0,10000,,'',0
+'1803',301,64700,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0
 '2919',301,62300,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2964',301,64700,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0
 '1798',3101,64600,,'',0,8500,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,4600,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,7400,,'',0,1200,,'',0,3000,,'',0,7500,,'',0,6900,,'',0,3000,,'',0,1800,,'',0,38400,,'',0
-'2964',3101,83500,,'',0,10000,,'',0,10400,,'',0,10800,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,10900,,'',0
+'1803',3101,83500,,'',0,10000,,'',0,10400,,'',0,10800,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,10900,,'',0
 '1798',1003101,71700,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7400,,'',0,10100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15100,,'',0,5300,,'',0,8700,,'',0,7100,,'',0,3200,,'',0,6800,,'',0,10300,,'',0,8500,,'',0,12300,,'',0
+'1803',1003101,90700,,'',0,10100,,'',0,10600,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
 '2919',1003101,110500,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2964',1003101,90700,,'',0,10100,,'',0,10600,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,10800,,'',0,10500,,'',0,10500,,'',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 b2bb24fa..5995185d 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,8 +1,8 @@
 '1798',301,55300,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3300,,'',0,7700,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,10000,,'',0
+'1803',301,64700,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
 '2919',301,62300,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2964',301,64700,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
 '1798',3101,64700,,'',0,8500,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,4600,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,7400,,'',0,1200,,'',0,7000,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,1800,,'',0,38400,,'',0
-'2964',3101,83600,,'',0,10000,,'',0,10400,,'',0,10800,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,10900,,'',0
+'1803',3101,83600,,'',0,10000,,'',0,10400,,'',0,10800,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,10900,,'',0
 '1798',1003101,71800,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7400,,'',0,10100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15100,,'',0,9300,,'',0,4700,,'',0,7100,,'',0,3200,,'',0,6800,,'',0,10300,,'',0,8500,,'',0,12300,,'',0
+'1803',1003101,90800,,'',0,10100,,'',0,10600,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
 '2919',1003101,110600,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2964',1003101,90800,,'',0,10100,,'',0,10600,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,10800,,'',0,10500,,'',0,10500,,'',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 a862d1c2..293f262e 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,8 +1,8 @@
 '1798',301,55300,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,10000,,'',0
+'1803',301,64800,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0
 '2919',301,62400,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2964',301,64800,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0
 '1798',3101,64700,,'',0,8500,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,4600,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,11600,,'',0,7400,,'',0,1200,,'',0,7000,,'',0,3500,,'',0,6800,,'',0,3000,,'',0,1800,,'',0,38400,,'',0
-'2964',3101,83600,,'',0,10000,,'',0,10400,,'',0,10800,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,10900,,'',0
+'1803',3101,83600,,'',0,10000,,'',0,10400,,'',0,10800,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,10900,,'',0
 '1798',1003101,71800,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7400,,'',0,10100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15200,,'',0,9300,,'',0,4700,,'',0,7100,,'',0,3100,,'',0,6800,,'',0,10300,,'',0,8500,,'',0,12300,,'',0
+'1803',1003101,90800,,'',0,10100,,'',0,10600,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
 '2919',1003101,110600,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2964',1003101,90800,,'',0,10100,,'',0,10600,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,10800,,'',0,10500,,'',0,10500,,'',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 14beedfe..9702236d 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,8 +1,8 @@
 '1798',301,55400,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,10000,,'',0
+'1803',301,64800,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
 '2919',301,62400,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2964',301,64800,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
 '1798',3101,64800,,'',0,8500,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,4600,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,11600,,'',0,7400,,'',0,1200,,'',0,7000,,'',0,3500,,'',0,6800,,'',0,3000,,'',0,1800,,'',0,38400,,'',0
-'2964',3101,83700,,'',0,10000,,'',0,10400,,'',0,10800,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,10900,,'',0
+'1803',3101,83700,,'',0,10000,,'',0,10400,,'',0,10800,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,10900,,'',0
 '1798',1003101,71900,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7400,,'',0,10100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15200,,'',0,9300,,'',0,4700,,'',0,7100,,'',0,3100,,'',0,6800,,'',0,10300,,'',0,8500,,'',0,12300,,'',0
+'1803',1003101,90900,,'',0,10100,,'',0,10600,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
 '2919',1003101,110700,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2964',1003101,90900,,'',0,10100,,'',0,10600,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,10800,,'',0,10500,,'',0,10500,,'',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 3fa5e96c..9d1d1ce4 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,8 +1,8 @@
 '1798',301,55500,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3300,,'',0,7700,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,10000,,'',0
+'1803',301,64900,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
 '2919',301,62500,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2964',301,64900,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
 '1798',3101,64800,,'',0,8500,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,4600,,'',0,14500,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,11600,,'',0,7400,,'',0,1200,,'',0,7000,,'',0,3500,,'',0,6800,,'',0,2900,,'',0,1800,,'',0,38400,,'',0
-'2964',3101,83700,,'',0,10000,,'',0,10500,,'',0,10800,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,10900,,'',0,10900,,'',0
+'1803',3101,83700,,'',0,10000,,'',0,10500,,'',0,10800,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,10900,,'',0,10900,,'',0
 '1798',1003101,71900,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7400,,'',0,10100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15200,,'',0,9300,,'',0,4700,,'',0,7100,,'',0,3100,,'',0,6800,,'',0,10200,,'',0,8500,,'',0,12300,,'',0
+'1803',1003101,90900,,'',0,10100,,'',0,10700,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,14900,,'',0,11000,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
 '2919',1003101,110700,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2964',1003101,90900,,'',0,10100,,'',0,10700,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,14900,,'',0,11000,,'',0,10800,,'',0,10500,,'',0,10500,,'',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 7fc43304..99790d7b 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,11 +1,11 @@
 '1798',300,55000,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7800,,'',0,7100,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
 '1798',301,55500,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3300,,'',0,7600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,10000,,'',0
+'1803',300,55400,,'',0,10000,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'1803',301,65000,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0
 '2919',300,63700,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
 '2919',301,62600,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2964',300,55400,,'',0,10000,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'2964',301,65000,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0
 '1798',3101,64900,,'',0,8500,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,4600,,'',0,14500,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,7400,,'',0,1200,,'',0,7000,,'',0,3500,,'',0,6900,,'',0,2900,,'',0,1800,,'',0,38400,,'',0
-'2964',3101,83800,,'',0,10000,,'',0,10500,,'',0,10800,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,10900,,'',0,10900,,'',0
+'1803',3101,83800,,'',0,10000,,'',0,10500,,'',0,10800,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,10900,,'',0,10900,,'',0
 '1798',1003101,72000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7400,,'',0,10100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15100,,'',0,9300,,'',0,4700,,'',0,7100,,'',0,3200,,'',0,6800,,'',0,10200,,'',0,8500,,'',0,12300,,'',0
+'1803',1003101,91000,,'',0,10100,,'',0,10700,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,14900,,'',0,11000,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
 '2919',1003101,110800,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2964',1003101,91000,,'',0,10100,,'',0,10700,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,14900,,'',0,11000,,'',0,10800,,'',0,10500,,'',0,10500,,'',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 27b62949..6b058739 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,11 +1,11 @@
 '1798',300,55000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,7900,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7800,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
 '1798',301,55600,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,10000,,'',0
+'1803',300,55400,,'',0,10000,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'1803',301,65000,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
 '2919',300,63700,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
 '2919',301,62600,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2964',300,55400,,'',0,10000,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'2964',301,65000,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
 '1798',3101,64900,,'',0,8500,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,4600,,'',0,14500,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,11600,,'',0,7400,,'',0,1200,,'',0,7000,,'',0,3500,,'',0,6800,,'',0,2900,,'',0,1800,,'',0,38400,,'',0
-'2964',3101,83800,,'',0,10000,,'',0,10500,,'',0,10800,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,10900,,'',0,10900,,'',0
+'1803',3101,83800,,'',0,10000,,'',0,10500,,'',0,10800,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,10900,,'',0,10900,,'',0
 '1798',1003101,72000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7400,,'',0,10100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15200,,'',0,9300,,'',0,4700,,'',0,7100,,'',0,3100,,'',0,6800,,'',0,10200,,'',0,8500,,'',0,12300,,'',0
+'1803',1003101,91000,,'',0,10100,,'',0,10700,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,14900,,'',0,11000,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
 '2919',1003101,110800,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2964',1003101,91000,,'',0,10100,,'',0,10700,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,14900,,'',0,11000,,'',0,10800,,'',0,10500,,'',0,10500,,'',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 c90de517..1522fc8e 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 @@
 '1798',101,55300,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
+'1803',101,62600,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
 '2919',101,63000,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
-'2964',101,62600,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
diff --git a/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 b0665cf5..3f189ffb 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 @@
 '1798',101,55400,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
+'1803',101,62700,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
 '2919',101,63100,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
-'2964',101,62700,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
diff --git a/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 b0665cf5..3f189ffb 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 @@
 '1798',101,55400,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
+'1803',101,62700,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
 '2919',101,63100,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
-'2964',101,62700,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
diff --git a/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 3fd302fc..ecb6a294 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 @@
 '1798',101,55500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
+'1803',101,62800,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
 '2919',101,63200,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
-'2964',101,62800,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
diff --git a/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 ce8008d4..7fdaff68 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 @@
 '1798',101,55600,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
+'1803',101,62900,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
 '2919',101,63300,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
-'2964',101,62900,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
diff --git a/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 4d11eca2..f1e20151 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 @@
 '1798',101,55700,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,6000,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
+'1803',101,63000,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
 '2919',101,63400,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
-'2964',101,63000,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
diff --git a/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 d9440e13..6eb0fad7 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,11 +1,11 @@
 '1798',300,54300,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3100,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'1803',300,54900,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '2919',300,63100,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2964',300,54900,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '1798',500,61000,,'',0,9300,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
+'1803',500,70500,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,9700,,'',0
 '2919',500,64100,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9700,,'',0,10000,,'',0
-'2964',500,70500,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,9700,,'',0
 '1798',1700,64800,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,4400,,'',0,7600,,'',0,7600,,'',0
 '1798',2100,65300,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,16100,,'',0,13500,,'',0,20500,,'',0,9300,,'',0,15600,,'',0,11200,,'',0
+'1803',2100,82700,,'',0,20200,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9900,,'',0,9400,,'',0,13100,,'',0
 '2919',2100,95000,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
-'2964',2100,82700,,'',0,20200,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9900,,'',0,9400,,'',0,13100,,'',0
 '1798',1002100,152600,,'',0,9100,,'',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 8964db0d..3992f0a0 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,11 +1,11 @@
 '1798',300,54300,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3100,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'1803',300,54900,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '2919',300,63100,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2964',300,54900,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '1798',500,61000,,'',0,9300,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
+'1803',500,70500,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,9700,,'',0
 '2919',500,64100,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9700,,'',0,10000,,'',0
-'2964',500,70500,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,9700,,'',0
 '1798',1700,64900,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,4300,,'',0,7700,,'',0,7600,,'',0
 '1798',2100,65400,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,16100,,'',0,13500,,'',0,20500,,'',0,9300,,'',0,15600,,'',0,11100,,'',0
+'1803',2100,82800,,'',0,20200,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9800,,'',0,9400,,'',0,13100,,'',0
 '2919',2100,95100,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
-'2964',2100,82800,,'',0,20200,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9800,,'',0,9400,,'',0,13100,,'',0
 '1798',1002100,152600,,'',0,9100,,'',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 02897187..132ffebf 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,11 +1,11 @@
 '1798',300,54300,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7800,,'',0,3100,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'1803',300,54900,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '2919',300,63100,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2964',300,54900,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '1798',500,61100,,'',0,9300,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
+'1803',500,70500,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,2900,,'',0,7200,,'',0,6900,,'',0,2900,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,9700,,'',0
 '2919',500,64100,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
-'2964',500,70500,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,2900,,'',0,7200,,'',0,6900,,'',0,2900,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,9700,,'',0
 '1798',1700,64900,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,4400,,'',0,7600,,'',0,7600,,'',0
 '1798',2100,65400,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,16100,,'',0,13600,,'',0,20500,,'',0,9200,,'',0,15600,,'',0,11200,,'',0
+'1803',2100,82800,,'',0,20200,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9900,,'',0,9400,,'',0,13100,,'',0
 '2919',2100,95100,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
-'2964',2100,82800,,'',0,20200,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9900,,'',0,9400,,'',0,13100,,'',0
 '1798',1002100,152700,,'',0,9100,,'',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 13fd5801..8b9e9b32 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,3 +1,3 @@
 '1798',300,54500,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7800,,'',0,7100,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'1803',300,55100,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '2919',300,63300,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2964',300,55100,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/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 37d3a256..f429d0de 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,3 +1,3 @@
 '1798',300,54600,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7800,,'',0,7100,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'1803',300,55100,,'',0,9900,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '2919',300,63300,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2964',300,55100,,'',0,9900,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/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 c6520e71..445aff14 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,3 +1,3 @@
 '1798',300,54600,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7800,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'1803',300,55200,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '2919',300,63400,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2964',300,55200,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/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 b45041e7..eb1c7ff3 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,3 +1,3 @@
 '1798',300,54700,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7800,,'',0,7100,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'1803',300,55200,,'',0,10000,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '2919',300,63500,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2964',300,55200,,'',0,10000,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/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 d8a71ea5..9daa1047 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,3 +1,3 @@
 '1798',300,54800,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7800,,'',0,7100,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'1803',300,55300,,'',0,9900,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '2919',300,63500,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2964',300,55300,,'',0,9900,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/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 630083df..92d0ab0b 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,3 +1,3 @@
 '1798',300,54800,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7800,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'1803',300,55300,,'',0,10000,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '2919',300,63600,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2964',300,55300,,'',0,10000,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/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 b823e2b9..1a893f76 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,3 +1,3 @@
 '1798',300,54900,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,7900,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7800,,'',0,7100,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'1803',300,55300,,'',0,10000,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '2919',300,63600,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2964',300,55300,,'',0,10000,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/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 c0fe2686..22792648 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 @@
 '1798',100,55100,,'',0,8200,,'',0,7000,,'',0,3200,,'',0,2200,,'',0,6100,,'',0,800,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,2000,,'',0,6300,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2600,,'',0,6700,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1900,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,7000,,'',0,2900,,'',0
+'1803',100,63400,,'',0,7100,,'',0,3900,,'',0,8700,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2600,,'',0
 '2919',100,63100,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,8700,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,9900,,'',0
-'2964',100,63400,,'',0,7100,,'',0,3900,,'',0,8700,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2600,,'',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 accdc957..1fdd2d68 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 @@
 '1798',100,55300,,'',0,8200,,'',0,7000,,'',0,3200,,'',0,2200,,'',0,6100,,'',0,800,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2600,,'',0,6700,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,7000,,'',0,2900,,'',0
+'1803',100,63500,,'',0,7100,,'',0,3900,,'',0,8700,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2500,,'',0
 '2919',100,63200,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,8800,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,9800,,'',0
-'2964',100,63500,,'',0,7100,,'',0,3900,,'',0,8700,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2500,,'',0
 '1798',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 f853dbf2..6c0d832e 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 @@
 '1798',100,55300,,'',0,8200,,'',0,7100,,'',0,3200,,'',0,6200,,'',0,2100,,'',0,800,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,2600,,'',0,6700,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6900,,'',0,2900,,'',0
+'1803',100,63500,,'',0,7100,,'',0,4000,,'',0,8700,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2400,,'',0
 '2919',100,63200,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,8800,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,9800,,'',0
-'2964',100,63500,,'',0,7100,,'',0,4000,,'',0,8700,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2400,,'',0
 '1798',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 af047323..8d5c3822 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 @@
 '1798',100,55400,,'',0,8200,,'',0,7100,,'',0,3200,,'',0,6200,,'',0,2100,,'',0,800,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,2600,,'',0,6700,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6900,,'',0,2900,,'',0
+'1803',100,63600,,'',0,7100,,'',0,4000,,'',0,8700,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2400,,'',0
 '2919',100,63300,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,8800,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,9800,,'',0
-'2964',100,63600,,'',0,7100,,'',0,4000,,'',0,8700,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2400,,'',0
 '1798',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 03097d89..1189d3a1 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 @@
 '1798',100,55500,,'',0,8200,,'',0,7100,,'',0,3200,,'',0,6200,,'',0,2100,,'',0,800,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,2600,,'',0,6700,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6900,,'',0,2900,,'',0
+'1803',100,63700,,'',0,7100,,'',0,4000,,'',0,8700,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2400,,'',0
 '2919',100,63400,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,8800,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,9800,,'',0
-'2964',100,63700,,'',0,7100,,'',0,4000,,'',0,8700,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2400,,'',0
 '1798',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 1e334c15..dd39402b 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 @@
 '1798',100,55600,4,'',0,8200,4,'',0,7100,4,'',0,3200,4,'',0,6200,4,'',0,2100,4,'',0,800,4,'',0,2000,4,'',0,5900,4,'',0,1900,4,'',0,1900,4,'',0,5900,4,'',0,1900,4,'',0,1800,4,'',0,6100,4,'',0,2300,4,'',0,2000,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6600,4,'',0,2600,4,'',0,6700,4,'',0,2100,4,'',0,2000,4,'',0,6100,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1900,4,'',0,1900,4,'',0,6000,4,'',0,2500,4,'',0,2900,4,'',0,6900,4,'',0,2800,4,'',0,6700,4,'',0,2800,4,'',0,6900,4,'',0,2900,4,'',0
 '1798',101,53000,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2400,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'1803',100,63800,4,'',0,7100,4,'',0,4000,4,'',0,8700,4,'',0,7200,4,'',0,3000,4,'',0,7200,4,'',0,3100,4,'',0,7100,4,'',0,3300,4,'',0,7100,4,'',0,3400,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3400,4,'',0,7300,4,'',0,3400,4,'',0,7400,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,7000,4,'',0,2900,4,'',0,6800,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,6600,4,'',0,2400,4,'',0
+'1803',101,60500,,'',0,3700,,'',0,8700,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
 '2919',100,63500,4,'',0,7900,4,'',0,4100,4,'',0,8100,4,'',0,8600,4,'',0,8800,4,'',0,4600,4,'',0,9000,4,'',0,9000,4,'',0,9200,4,'',0,9100,4,'',0,9000,4,'',0,5000,4,'',0,9000,4,'',0,8800,4,'',0,8700,4,'',0,9000,4,'',0,9800,4,'',0
 '2919',101,61000,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
-'2964',100,63800,4,'',0,7100,4,'',0,4000,4,'',0,8700,4,'',0,7200,4,'',0,3000,4,'',0,7200,4,'',0,3100,4,'',0,7100,4,'',0,3300,4,'',0,7100,4,'',0,3400,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3400,4,'',0,7300,4,'',0,3400,4,'',0,7400,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,7000,4,'',0,2900,4,'',0,6800,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,6600,4,'',0,2400,4,'',0
-'2964',101,60500,,'',0,3700,,'',0,8700,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
 '1798',1200,72400,,'',0,3500,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,15600,,'',0,11600,,'',0,13900,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
 '1798',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 69c296fc..d1490733 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 @@
 '1798',101,54400,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,2800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'1803',101,61700,,'',0,3800,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8700,,'',0
 '2919',101,62100,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
-'2964',101,61700,,'',0,3800,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8700,,'',0
+'1803',701,73900,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,25000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
 '2919',701,63800,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',701,73900,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,25000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
+'1803',1000701,64000,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,25200,,'',0,20800,,'',0,20400,,'',0
 '2919',1000701,74100,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
-'2964',1000701,64000,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,25200,,'',0,20800,,'',0,20400,,'',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 803944e5..2cd164da 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 @@
 '1798',100,54300,,'',0,8200,,'',0,3000,,'',0,7200,,'',0,2200,,'',0,6100,,'',0,800,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6300,,'',0,2000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2500,,'',0,2600,,'',0,6200,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,7000,,'',0,2900,,'',0
+'1803',100,62600,,'',0,3100,,'',0,7900,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2600,,'',0
 '2919',100,62300,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,4700,,'',0,8600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,5900,,'',0
-'2964',100,62600,,'',0,3100,,'',0,7900,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2600,,'',0
+'1803',700,70200,,'',0,14500,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20900,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
 '2919',700,60200,,'',0,20000,,'',0,15100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,16500,,'',0
-'2964',700,70200,,'',0,14500,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20900,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
+'1803',1000700,60200,,'',0,15500,,'',0,20100,,'',0,24800,,'',0,21200,,'',0,20900,,'',0,20500,,'',0
 '2919',1000700,70200,,'',0,15500,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
-'2964',1000700,60200,,'',0,15500,,'',0,20100,,'',0,24800,,'',0,21200,,'',0,20900,,'',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 aac2ff90..355d6496 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 @@
 '1798',100,54400,,'',0,8200,,'',0,3000,,'',0,7200,,'',0,2200,,'',0,6100,,'',0,800,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6300,,'',0,2000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2500,,'',0,2700,,'',0,6200,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,1800,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6600,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,7000,,'',0,2900,,'',0
+'1803',100,62700,,'',0,3100,,'',0,7900,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,2600,,'',0
 '2919',100,62400,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,4700,,'',0,8600,,'',0,8900,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8700,,'',0,9000,,'',0,9900,,'',0
-'2964',100,62700,,'',0,3100,,'',0,7900,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,2600,,'',0
+'1803',700,70300,,'',0,14500,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20900,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
 '2919',700,60300,,'',0,20000,,'',0,15100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,16500,,'',0
-'2964',700,70300,,'',0,14500,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20900,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
+'1803',1000700,60300,,'',0,15500,,'',0,20100,,'',0,24800,,'',0,21200,,'',0,20900,,'',0,20500,,'',0
 '2919',1000700,70300,,'',0,15500,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
-'2964',1000700,60300,,'',0,15500,,'',0,20100,,'',0,24800,,'',0,21200,,'',0,20900,,'',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 c83952dc..747b7755 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 @@
 '1798',100,54500,,'',0,8200,,'',0,3000,,'',0,7200,,'',0,2200,,'',0,6100,,'',0,800,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6300,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2500,,'',0,2600,,'',0,6200,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,7000,,'',0,2900,,'',0
+'1803',100,62800,,'',0,3100,,'',0,7900,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,7100,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2600,,'',0
 '2919',100,62500,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,4700,,'',0,8600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,9900,,'',0
-'2964',100,62800,,'',0,3100,,'',0,7900,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,7100,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2600,,'',0
+'1803',700,70400,,'',0,14500,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20900,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
 '2919',700,60400,,'',0,20000,,'',0,15100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,16500,,'',0
-'2964',700,70400,,'',0,14500,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20900,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
+'1803',1000700,60400,,'',0,15500,,'',0,24100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20500,,'',0
 '2919',1000700,70400,,'',0,15500,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
-'2964',1000700,60400,,'',0,15500,,'',0,24100,,'',0,20800,,'',0,21200,,'',0,20900,,'',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 ba7b2e97..9dfe0569 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 @@
 '1798',101,53200,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2400,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'1803',101,60600,,'',0,3700,,'',0,8700,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
 '2919',101,61100,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
-'2964',101,60600,,'',0,3700,,'',0,8700,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
 '1798',1200,72500,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,15600,,'',0,11600,,'',0,13900,,'',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 a8441d3f..44b97b93 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 @@
 '1798',101,53300,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2400,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'1803',101,60700,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,2900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
 '2919',101,61200,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
-'2964',101,60700,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,2900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
 '1798',1200,72600,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,15600,,'',0,11600,,'',0,13900,,'',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 3e44acb5..f20fbddd 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 @@
 '1798',101,53300,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2400,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'1803',101,60800,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
 '2919',101,61300,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
-'2964',101,60800,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
 '1798',1200,72600,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,15600,,'',0,11700,,'',0,13800,,'',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 d868a906..86e8d827 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 @@
 '1798',101,53600,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,6400,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'1803',101,61000,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
 '2919',101,61400,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
-'2964',101,61000,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
 '1798',1200,73400,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,11700,,'',0,15600,,'',0,11800,,'',0,17700,,'',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 23548a74..63fb3671 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 @@
 '1798',100,54200,,'',0,8200,,'',0,3000,,'',0,7200,,'',0,2200,,'',0,6100,,'',0,800,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6300,,'',0,2000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2500,,'',0,2600,,'',0,6200,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,7000,,'',0,2900,,'',0
+'1803',100,62500,,'',0,3100,,'',0,7900,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2600,,'',0
 '2919',100,62200,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,4700,,'',0,8600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
-'2964',100,62500,,'',0,3100,,'',0,7900,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2600,,'',0
+'1803',700,70100,,'',0,14500,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20900,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
 '2919',700,60100,,'',0,20000,,'',0,15100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,16500,,'',0
-'2964',700,70100,,'',0,14500,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20900,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
+'1803',1000700,60100,,'',0,15500,,'',0,20100,,'',0,24800,,'',0,21200,,'',0,20900,,'',0,20500,,'',0
 '2919',1000700,70100,,'',0,15500,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
-'2964',1000700,60100,,'',0,15500,,'',0,20100,,'',0,24800,,'',0,21200,,'',0,20900,,'',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 8188d2c1..831f8fbd 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 @@
 '1798',101,54100,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,2800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'1803',101,61500,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8800,,'',0
 '2919',101,61900,,'',0,8100,,'',0,4000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
-'2964',101,61500,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8800,,'',0
diff --git a/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 22ca4368..2d687614 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 @@
 '1798',101,54200,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,2800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'1803',101,61500,,'',0,3800,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8700,,'',0
 '2919',101,61900,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
-'2964',101,61500,,'',0,3800,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8700,,'',0
+'1803',701,73700,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,25000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
 '2919',701,63600,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',701,73700,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,25000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
+'1803',1000701,63800,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,24800,,'',0,20400,,'',0
 '2919',1000701,73900,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
-'2964',1000701,63800,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,24800,,'',0,20400,,'',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 c05f85f2..6a243b15 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 @@
 '1798',101,54200,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,2800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'1803',101,61600,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8800,,'',0
 '2919',101,62000,,'',0,8100,,'',0,4000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
-'2964',101,61600,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8800,,'',0
+'1803',701,73700,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,25000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
 '2919',701,63600,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',701,73700,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,25000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
+'1803',1000701,63800,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,24800,,'',0,20400,,'',0
 '2919',1000701,73900,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
-'2964',1000701,63800,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,24800,,'',0,20400,,'',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 c7b98e06..118e1369 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 @@
 '1798',101,54300,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,2800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'1803',101,61600,,'',0,3800,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8700,,'',0
 '2919',101,62000,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
-'2964',101,61600,,'',0,3800,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8700,,'',0
+'1803',701,73800,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,25000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
 '2919',701,63700,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',701,73800,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,25000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
+'1803',1000701,63900,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,24800,,'',0,20400,,'',0
 '2919',1000701,74000,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
-'2964',1000701,63900,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,24800,,'',0,20400,,'',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 b79eee6b..ba12e273 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,3 +1,3 @@
 '1798',301,60100,,'',0,5200,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,10000,,'',0
+'1803',301,65500,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
 '2919',301,63100,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,5200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2964',301,65500,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
diff --git a/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 e9ddbae1..a2657a68 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,3 +1,3 @@
 '1798',301,60200,,'',0,5200,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,10000,,'',0
+'1803',301,65600,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
 '2919',301,63200,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,5200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2964',301,65600,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
diff --git a/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 cd33bf3b..a45b5f42 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,3 +1,3 @@
 '1798',301,60200,,'',0,5300,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,9900,,'',0
+'1803',301,65600,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
 '2919',301,63200,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,5200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2964',301,65600,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
diff --git a/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 d4adaf53..bb3d38bc 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,3 +1,3 @@
 '1798',301,60300,,'',0,5200,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,10000,,'',0
+'1803',301,65700,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
 '2919',301,63300,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,5200,,'',0,9000,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2964',301,65700,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
diff --git a/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 e9bb3958..cc3ebb7d 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,6 +1,6 @@
 '1798',301,60300,,'',0,5300,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,9900,,'',0
+'1803',301,65700,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
 '2919',301,63300,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2964',301,65700,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
 '1798',601,61100,,'',0,4700,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,4000,,'',0,16000,,'',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
+'1803',601,61900,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10100,,'',0,15000,,'',0,9800,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2919',601,61500,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15800,,'',0
-'2964',601,61900,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10100,,'',0,15000,,'',0,9800,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
diff --git a/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 1834061a..d34ef73d 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,6 +1,6 @@
 '1798',301,60500,,'',0,5300,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,9900,,'',0
+'1803',301,65900,,'',0,14100,,'',0,10100,,'',0,3000,,'',0,2800,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
 '2919',301,63500,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2964',301,65900,,'',0,14100,,'',0,10100,,'',0,3000,,'',0,2800,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
 '1798',601,61200,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,4000,,'',0,16000,,'',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
+'1803',601,62000,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10100,,'',0,11000,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2919',601,61600,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,15800,,'',0
-'2964',601,62000,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10100,,'',0,11000,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
diff --git a/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 609a8e38..e199c00a 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,3 +1,3 @@
 '1798',300,54400,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7800,,'',0,3100,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'1803',300,55000,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '2919',300,63200,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2964',300,55000,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/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 cea82899..bd78e187 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,6 +1,6 @@
 '1798',301,60800,,'',0,9300,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
+'1803',301,70200,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
 '2919',301,63800,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9700,,'',0,10000,,'',0
-'2964',301,70200,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
 '1798',501,61100,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3100,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'1803',501,64500,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '2919',501,62800,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2964',501,64500,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
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 77f2e87b..d79c6dce 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,12 +1,12 @@
 '1798',300,54200,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3100,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
 '1798',301,60900,4,'',0,9300,4,'',0,3200,4,'',0,7000,4,'',0,3200,4,'',0,7000,4,'',0,3500,4,'',0,7300,4,'',0,3000,4,'',0,7200,4,'',0,3500,4,'',0,7300,4,'',0,3000,4,'',0,7500,4,'',0,7600,4,'',0,3600,4,'',0,7600,4,'',0,3600,4,'',0,7800,4,'',0,7500,4,'',0,3400,4,'',0,7300,4,'',0,2900,4,'',0,7300,4,'',0,3500,4,'',0,6700,4,'',0,8500,4,'',0,4300,4,'',0,9900,4,'',0
+'1803',300,54800,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'1803',301,70300,4,'',0,10100,4,'',0,10100,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,3400,4,'',0,7100,4,'',0,3000,4,'',0,7600,4,'',0,3500,4,'',0,6900,4,'',0,3000,4,'',0,7400,4,'',0,3200,4,'',0,6800,4,'',0,2900,4,'',0,7200,4,'',0,2900,4,'',0,6900,4,'',0,3000,4,'',0,6900,4,'',0,2800,4,'',0,9700,4,'',0,9500,4,'',0
 '2919',300,63000,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,5900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2919',301,63900,4,'',0,10900,4,'',0,9800,4,'',0,9700,4,'',0,10100,4,'',0,10100,4,'',0,9100,4,'',0,9100,4,'',0,10000,4,'',0,8800,4,'',0,9200,4,'',0,5000,4,'',0,9000,4,'',0,9700,4,'',0,10000,4,'',0
-'2964',300,54800,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'2964',301,70300,4,'',0,10100,4,'',0,10100,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,3400,4,'',0,7100,4,'',0,3000,4,'',0,7600,4,'',0,3500,4,'',0,6900,4,'',0,3000,4,'',0,7400,4,'',0,3200,4,'',0,6800,4,'',0,2900,4,'',0,7200,4,'',0,2900,4,'',0,6900,4,'',0,3000,4,'',0,6900,4,'',0,2800,4,'',0,9700,4,'',0,9500,4,'',0
 '1798',500,60900,,'',0,9300,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
 '1798',501,61200,4,'',0,2900,4,'',0,6800,4,'',0,2800,4,'',0,7600,4,'',0,3300,4,'',0,7000,4,'',0,3000,4,'',0,7400,4,'',0,3200,4,'',0,7000,4,'',0,3400,4,'',0,7400,4,'',0,7500,4,'',0,3300,4,'',0,7500,4,'',0,3800,4,'',0,7600,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,3500,4,'',0,7800,4,'',0,3100,4,'',0,8500,4,'',0,8400,4,'',0,10000,4,'',0,9500,4,'',0
+'1803',500,70400,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,9700,,'',0
+'1803',501,64600,4,'',0,9700,4,'',0,7000,4,'',0,2700,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7200,4,'',0,3000,4,'',0,6900,4,'',0,3300,4,'',0,7400,4,'',0,3000,4,'',0,7100,4,'',0,3600,4,'',0,7400,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,2900,4,'',0,9700,4,'',0,9700,4,'',0,9400,4,'',0
 '2919',500,64000,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9700,,'',0,10000,,'',0
 '2919',501,62900,4,'',0,9700,4,'',0,9500,4,'',0,9900,4,'',0,9900,4,'',0,9000,4,'',0,5000,4,'',0,9900,4,'',0,8800,4,'',0,9300,4,'',0,9300,4,'',0,9000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'2964',500,70400,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,9700,,'',0
-'2964',501,64600,4,'',0,9700,4,'',0,7000,4,'',0,2700,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7200,4,'',0,3000,4,'',0,6900,4,'',0,3300,4,'',0,7400,4,'',0,3000,4,'',0,7100,4,'',0,3600,4,'',0,7400,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,2900,4,'',0,9700,4,'',0,9700,4,'',0,9400,4,'',0
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 aba5e6be..dbf5855e 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,11 +1,11 @@
 '1798',401,60700,,'',0,9500,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1803',401,60700,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',401,64900,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2964',401,60700,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '1798',1501,61700,,'',0,8300,,'',0,11800,,'',0,68300,,'',0,20200,,'',0,5100,,'',0
-'2964',1501,90000,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'1803',1501,90000,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
 '1798',3100,73200,,'',0,7100,,'',0,3000,,'',0,10400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10800,,'',0,9200,,'',0,4200,,'',0,5500,,'',0,3200,,'',0,7100,,'',0,1300,,'',0,3600,,'',0
-'2964',3100,92300,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
+'1803',3100,92300,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
 '1798',1003100,64600,,'',0,6900,,'',0,3000,,'',0,7300,,'',0,8500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,10800,,'',0,7700,,'',0,9300,,'',0,3000,,'',0,8800,,'',0,10000,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,10900,,'',0
+'1803',1003100,85000,,'',0,10200,,'',0,10700,,'',0,14900,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,15200,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
 '2919',1003100,101700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
-'2964',1003100,85000,,'',0,10200,,'',0,10700,,'',0,14900,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,15200,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
 '1798',24003100,60300,,'',0,3100,,'',0,7000,,'',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 b86adc61..f64bbffc 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 @@
 '1798',401,60700,,'',0,9600,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'1803',401,60700,,'',0,5200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',401,64900,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2964',401,60700,,'',0,5200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '1798',1501,61700,,'',0,8300,,'',0,11800,,'',0,68400,,'',0,20200,,'',0,5100,,'',0
-'2964',1501,90100,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'1803',1501,90100,,'',0,14500,,'',0,47000,,'',0,18500,,'',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 fdae7d37..afa45a70 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 @@
 '1798',401,60800,,'',0,9500,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1803',401,60800,,'',0,9200,,'',0,5800,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',401,65000,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2964',401,60800,,'',0,9200,,'',0,5800,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '1798',1501,61800,,'',0,8300,,'',0,11800,,'',0,68300,,'',0,20200,,'',0,5100,,'',0
-'2964',1501,90100,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'1803',1501,90100,,'',0,14500,,'',0,47000,,'',0,18500,,'',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 8fc09ff4..c504c751 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 @@
 '1798',401,60800,,'',0,9600,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'1803',401,60800,,'',0,9200,,'',0,5800,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',401,65000,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2964',401,60800,,'',0,9200,,'',0,5800,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '1798',1501,61800,,'',0,8300,,'',0,11800,,'',0,68400,,'',0,20200,,'',0,5100,,'',0
-'2964',1501,90200,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'1803',1501,90200,,'',0,14500,,'',0,47000,,'',0,18500,,'',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 b94f4a89..0670f79b 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 @@
 '1798',401,60900,,'',0,9500,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1803',401,60900,,'',0,9200,,'',0,5800,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',401,65100,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2964',401,60900,,'',0,9200,,'',0,5800,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '1798',1501,61800,,'',0,8300,,'',0,11900,,'',0,68300,,'',0,20200,,'',0,5100,,'',0
-'2964',1501,90200,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'1803',1501,90200,,'',0,14500,,'',0,47000,,'',0,18500,,'',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 c3c2f95c..169fcd43 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 @@
 '1798',401,60900,,'',0,9600,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'1803',401,60900,,'',0,9200,,'',0,5800,,'',0,14100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',401,65100,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2964',401,60900,,'',0,9200,,'',0,5800,,'',0,14100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '1798',1501,61900,,'',0,8300,,'',0,11800,,'',0,68400,,'',0,20200,,'',0,5100,,'',0
-'2964',1501,90300,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'1803',1501,90300,,'',0,14500,,'',0,47000,,'',0,18500,,'',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 9f557e7c..a9dec098 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 @@
 '1798',401,61000,,'',0,9600,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'1803',401,61000,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',401,65200,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2964',401,61000,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '1798',1501,61900,,'',0,8300,,'',0,11900,,'',0,68300,,'',0,20300,,'',0,5000,,'',0
-'2964',1501,90300,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'1803',1501,90300,,'',0,14500,,'',0,47000,,'',0,18500,,'',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 528dcd90..1f6041d1 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,3 +1,3 @@
 '1798',401,61100,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'1803',401,61100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',401,65300,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2964',401,61100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/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 5a03d62b..7664bb48 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,3 +1,3 @@
 '1798',401,61100,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'1803',401,61100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',401,65300,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2964',401,61100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/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 5a03d62b..7664bb48 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 @@
 '1798',401,61100,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'1803',401,61100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',401,65300,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2964',401,61100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/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 3425eb21..77087ba8 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 @@
 '1798',401,61200,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'1803',401,61200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',401,65400,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2964',401,61200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/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 a7808b12..2bbb74ac 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 @@
 '1798',401,61300,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'1803',401,61300,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',401,65500,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2964',401,61300,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/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 a7808b12..2bbb74ac 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 @@
 '1798',401,61300,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'1803',401,61300,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',401,65500,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2964',401,61300,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/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 119cda5a..800e3f7d 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,3 +1,3 @@
 '1798',401,61400,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'1803',401,61400,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',401,65600,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2964',401,61400,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
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 b29e76b8..71c7e368 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 @@
 '1798',401,61500,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'1803',401,61500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',401,65700,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2964',401,61500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/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 b29e76b8..71c7e368 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 @@
 '1798',401,61500,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'1803',401,61500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',401,65700,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2964',401,61500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/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 8accc423..7276045d 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 @@
 '1798',401,61600,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'1803',401,61600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',401,65800,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2964',401,61600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/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 8accc423..7276045d 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 @@
 '1798',401,61600,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'1803',401,61600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',401,65800,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2964',401,61600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/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 7caae281..b0de9b04 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 @@
 '1798',400,61800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'1803',400,61700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',400,65900,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2964',400,61700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/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 d347e706..af2297bc 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 @@
 '1798',400,61800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'1803',400,61800,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',400,70000,,'',0,20400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2964',400,61800,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/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 336bf285..44302202 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 @@
 '1798',400,61900,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'1803',400,61800,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',400,70000,,'',0,20400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2964',400,61800,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/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 bb511ace..69f0e487 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 @@
 '1798',400,62100,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'1803',400,62100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',400,70300,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2964',400,62100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/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 cbd730e8..d7150df6 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 @@
 '1798',400,62200,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'1803',400,62100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',400,70300,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2964',400,62100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/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 cbd730e8..d7150df6 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 @@
 '1798',400,62200,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'1803',400,62100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',400,70300,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2964',400,62100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/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 55cf3d7b..3d698005 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 @@
 '1798',400,62300,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'1803',400,62200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',400,70400,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2964',400,62200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/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 bb377952..f445730f 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 @@
 '1798',400,62400,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'1803',400,62300,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',400,70500,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2964',400,62300,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/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 62c39082..68c9ee5a 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 @@
 '1798',400,62500,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'1803',400,62400,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',400,70600,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2964',400,62400,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/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 62c39082..68c9ee5a 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 @@
 '1798',400,62500,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'1803',400,62400,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',400,70600,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2964',400,62400,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/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 b0bf2c79..794446bc 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 @@
 '1798',400,62600,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'1803',400,62500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',400,70700,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2964',400,62500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/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 b0bf2c79..794446bc 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 @@
 '1798',400,62600,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'1803',400,62500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',400,70700,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2964',400,62500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/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 efacce70..75db4c2e 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 @@
 '1798',400,62700,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'1803',400,62600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',400,70800,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2964',400,62600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/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 efacce70..75db4c2e 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,3 +1,3 @@
 '1798',400,62700,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'1803',400,62600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',400,70800,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2964',400,62600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/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 a772bca6..c4fc487b 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,3 +1,3 @@
 '1798',400,62800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'1803',400,62700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',400,70900,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2964',400,62700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
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 444c4666..a8cc673c 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 @@
 '1798',400,63000,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'1803',400,62900,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',400,71100,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16000,,'',0,13500,,'',0
-'2964',400,62900,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '1798',1500,64600,,'',0,8300,,'',0,12000,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
-'2964',1500,93000,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'1803',1500,93000,,'',0,18500,,'',0,43000,,'',0,18500,,'',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 58ce2bcf..89ea6efa 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 @@
 '1798',400,63100,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7200,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0
+'1803',400,62900,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10400,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',400,71100,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2964',400,62900,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10400,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '1798',1500,64700,,'',0,8300,,'',0,12000,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
-'2964',1500,93000,,'',0,18600,,'',0,43000,,'',0,18400,,'',0
+'1803',1500,93000,,'',0,18600,,'',0,43000,,'',0,18400,,'',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 0ba8b6e7..8c7092b1 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 @@
 '1798',400,63200,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7200,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0
+'1803',400,63000,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10400,,'',0,10100,,'',0,14300,,'',0,10000,,'',0
 '2919',400,71200,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2964',400,63000,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10400,,'',0,10100,,'',0,14300,,'',0,10000,,'',0
 '1798',1500,64800,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2964',1500,93100,,'',0,18600,,'',0,43000,,'',0,18400,,'',0
+'1803',1500,93100,,'',0,18600,,'',0,43000,,'',0,18400,,'',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 232842f3..ab68f83e 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 @@
 '1798',400,63300,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7200,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0
+'1803',400,63100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10400,,'',0,10100,,'',0,14300,,'',0,10000,,'',0
 '2919',400,71300,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2964',400,63100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10400,,'',0,10100,,'',0,14300,,'',0,10000,,'',0
 '1798',1500,64800,,'',0,8300,,'',0,12000,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
-'2964',1500,93100,,'',0,18600,,'',0,43000,,'',0,18400,,'',0
+'1803',1500,93100,,'',0,18600,,'',0,43000,,'',0,18400,,'',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 50bf1137..76a88f1a 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 @@
 '1798',400,63300,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7200,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'1803',400,63100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10400,,'',0,10100,,'',0,14300,,'',0,10000,,'',0
 '2919',400,71300,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2964',400,63100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10400,,'',0,10100,,'',0,14300,,'',0,10000,,'',0
 '1798',1500,64900,,'',0,8300,,'',0,12000,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
-'2964',1500,93200,,'',0,18600,,'',0,43000,,'',0,18400,,'',0
+'1803',1500,93200,,'',0,18600,,'',0,43000,,'',0,18400,,'',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 7c31ee21..79ca8c32 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,10 +1,10 @@
 '1798',400,63400,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7200,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0
+'1803',400,63200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10400,,'',0,10100,,'',0,14300,,'',0,10000,,'',0
 '2919',400,71400,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2964',400,63200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10400,,'',0,10100,,'',0,14300,,'',0,10000,,'',0
 '1798',1500,64900,,'',0,8300,,'',0,12000,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
-'2964',1500,93200,,'',0,18600,,'',0,43000,,'',0,18400,,'',0
+'1803',1500,93200,,'',0,18600,,'',0,43000,,'',0,18400,,'',0
 '1798',3101,64500,,'',0,8500,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,4600,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,7400,,'',0,1200,,'',0,3000,,'',0,7500,,'',0,6900,,'',0,3000,,'',0,1800,,'',0,38400,,'',0
-'2964',3101,83400,,'',0,10000,,'',0,10400,,'',0,10800,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,10900,,'',0
+'1803',3101,83400,,'',0,10000,,'',0,10400,,'',0,10800,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,10900,,'',0
 '1798',1003101,71600,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7400,,'',0,10100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15100,,'',0,5300,,'',0,8700,,'',0,7100,,'',0,3200,,'',0,6800,,'',0,10300,,'',0,8500,,'',0,12300,,'',0
+'1803',1003101,90600,,'',0,10100,,'',0,10600,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
 '2919',1003101,110400,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2964',1003101,90600,,'',0,10100,,'',0,10600,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,10800,,'',0,10500,,'',0,10500,,'',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 be0e3688..d3179ea7 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,5 +1,5 @@
 '1798',3101,64400,,'',0,8500,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,4600,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,7400,,'',0,1200,,'',0,3000,,'',0,7500,,'',0,6900,,'',0,3000,,'',0,1800,,'',0,38400,,'',0
-'2964',3101,83300,,'',0,10000,,'',0,10400,,'',0,10800,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,10900,,'',0
+'1803',3101,83300,,'',0,10000,,'',0,10400,,'',0,10800,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,10900,,'',0
 '1798',1003101,71500,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7400,,'',0,10100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15100,,'',0,5300,,'',0,8700,,'',0,7100,,'',0,3200,,'',0,6800,,'',0,10300,,'',0,8500,,'',0,12300,,'',0
+'1803',1003101,90500,,'',0,10100,,'',0,10600,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
 '2919',1003101,110300,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2964',1003101,90500,,'',0,10100,,'',0,10600,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,10800,,'',0,10500,,'',0,10500,,'',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 811204dc..f63cc1d9 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,5 +1,5 @@
 '1798',3101,64300,,'',0,8500,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,4600,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,7400,,'',0,1200,,'',0,3000,,'',0,7500,,'',0,6900,,'',0,3000,,'',0,1800,,'',0,38400,,'',0
-'2964',3101,83200,,'',0,10000,,'',0,10400,,'',0,10800,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,10900,,'',0
+'1803',3101,83200,,'',0,10000,,'',0,10400,,'',0,10800,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,10900,,'',0
 '1798',1003101,71400,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7400,,'',0,10100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15100,,'',0,5300,,'',0,8700,,'',0,7100,,'',0,3200,,'',0,6800,,'',0,10400,,'',0,8500,,'',0,12300,,'',0
+'1803',1003101,90400,,'',0,10100,,'',0,10500,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,10500,,'',0,10500,,'',0
 '2919',1003101,110200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2964',1003101,90400,,'',0,10100,,'',0,10500,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,10500,,'',0,10500,,'',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 2ddef90d..c1dbee2e 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,7 +1,7 @@
 '1798',201,52300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1700,,'',0,1600,,'',0,6000,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2300,,'',0,7000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'1803',201,61500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
 '2919',201,62900,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2964',201,61500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
+'1803',400,63500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,14400,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',400,71700,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2964',400,63500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,14400,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'1803',901,71600,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2919',901,70600,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17400,,'',0
-'2964',901,71600,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
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 8ea6533b..f5028902 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,4 +1,4 @@
 '1798',501,60400,,'',0,2800,,'',0,6800,,'',0,2600,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'1803',501,63800,,'',0,9600,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9500,,'',0
 '2919',501,62100,,'',0,9600,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,4900,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2964',501,63800,,'',0,9600,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9500,,'',0
 '1798',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 2ca08ed8..7536e2d7 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,4 +1,4 @@
 '1798',501,60400,,'',0,2800,,'',0,6800,,'',0,2600,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'1803',501,63800,,'',0,9600,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9500,,'',0
 '2919',501,62100,,'',0,9600,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,4900,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2964',501,63800,,'',0,9600,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9500,,'',0
 '1798',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 12b36c89..c36db470 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,3 +1,3 @@
 '1798',501,60500,,'',0,2800,,'',0,6700,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'1803',501,63800,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
 '2919',501,62100,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2964',501,63800,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
diff --git a/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 553b84c2..04a8ab19 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,3 +1,3 @@
 '1798',501,60500,,'',0,2800,,'',0,6800,,'',0,2600,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'1803',501,63900,,'',0,9600,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9500,,'',0
 '2919',501,62200,,'',0,9600,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2964',501,63900,,'',0,9600,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9500,,'',0
diff --git a/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 1b5156e1..37367b5a 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,3 +1,3 @@
 '1798',501,60600,,'',0,2800,,'',0,6700,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'1803',501,63900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
 '2919',501,62200,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2964',501,63900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
diff --git a/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 df38263d..ab13aac0 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,3 +1,3 @@
 '1798',501,60700,,'',0,2800,,'',0,6700,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'1803',501,64000,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
 '2919',501,62300,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2964',501,64000,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
diff --git a/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 2f5f7fe4..2736fea9 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,3 +1,3 @@
 '1798',501,60700,,'',0,2800,,'',0,6700,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3600,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'1803',501,64000,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
 '2919',501,62300,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2964',501,64000,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
diff --git a/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 6bfb4da1..7d69a327 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,3 +1,3 @@
 '1798',501,60800,,'',0,2800,,'',0,6700,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3600,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'1803',501,64100,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
 '2919',501,62400,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2964',501,64100,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
diff --git a/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 52dfdb17..58701113 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,3 +1,3 @@
 '1798',501,60800,,'',0,2900,,'',0,6700,,'',0,2800,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3100,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'1803',501,64200,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
 '2919',501,62500,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2964',501,64200,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
diff --git a/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 76c74a6e..68b48148 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,3 +1,3 @@
 '1798',501,60900,,'',0,2800,,'',0,6800,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'1803',501,64200,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '2919',501,62500,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2964',501,64200,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/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 5e5a8feb..f6d8b6a2 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,3 +1,3 @@
 '1798',501,61000,,'',0,2900,,'',0,6700,,'',0,2800,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3100,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'1803',501,64400,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
 '2919',501,62700,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2964',501,64400,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
diff --git a/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 98a528fb..d07cc967 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,3 +1,3 @@
 '1798',501,61000,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3100,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'1803',501,64400,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '2919',501,62700,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2964',501,64400,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/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 4b38834d..1e51bf6d 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,3 +1,3 @@
 '1798',501,61100,,'',0,2900,,'',0,6700,,'',0,2800,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3100,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'1803',501,64500,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
 '2919',501,62800,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2964',501,64500,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
diff --git a/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 37498e1c..729e7e15 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,8 +1,8 @@
 '1798',601,61400,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,4000,,'',0,16000,,'',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
+'1803',601,62200,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10100,,'',0,11000,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2919',601,61800,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11800,,'',0
-'2964',601,62200,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10100,,'',0,11000,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '1798',1701,63200,,'',0,7200,,'',0,4800,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
 '1798',2101,60600,,'',0,3600,,'',0,18300,,'',0,12600,,'',0,15200,,'',0,11700,,'',0,13000,,'',0,7200,,'',0,8500,,'',0,4600,,'',0,10100,,'',0,15900,,'',0,11100,,'',0
+'1803',2101,74300,,'',0,20000,,'',0,15700,,'',0,14800,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
 '2919',2101,90500,,'',0,13000,,'',0,16600,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
-'2964',2101,74300,,'',0,20000,,'',0,15700,,'',0,14800,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
 '1798',1002101,72500,,'',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 c9bdcf8d..cbff3d94 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,8 +1,8 @@
 '1798',601,61500,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,4000,,'',0,16000,,'',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
+'1803',601,62300,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10100,,'',0,11000,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2919',601,61900,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
-'2964',601,62300,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10100,,'',0,11000,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '1798',1701,63300,,'',0,7200,,'',0,4800,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
 '1798',2101,60700,,'',0,3600,,'',0,18300,,'',0,12600,,'',0,15200,,'',0,11700,,'',0,13000,,'',0,7200,,'',0,8500,,'',0,4600,,'',0,10100,,'',0,15900,,'',0,11100,,'',0
+'1803',2101,74300,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
 '2919',2101,90500,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
-'2964',2101,74300,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
 '1798',1002101,72600,,'',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 5863988b..dec24efd 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 @@
 '1798',1701,63300,,'',0,7200,,'',0,4900,,'',0,76400,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
 '1798',2101,60700,,'',0,3600,,'',0,18300,,'',0,12600,,'',0,15200,,'',0,11700,,'',0,13000,,'',0,7200,,'',0,8600,,'',0,4600,,'',0,10000,,'',0,15900,,'',0,11100,,'',0
+'1803',2101,74400,,'',0,20000,,'',0,15700,,'',0,14800,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
 '2919',2101,90600,,'',0,13000,,'',0,16600,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
-'2964',2101,74400,,'',0,20000,,'',0,15700,,'',0,14800,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
 '1798',1002101,72600,,'',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 64acf599..d3e688f1 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 @@
 '1798',1700,64700,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,4400,,'',0,7600,,'',0,7600,,'',0
 '1798',2100,65200,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,16100,,'',0,13500,,'',0,20500,,'',0,9300,,'',0,15600,,'',0,11200,,'',0
+'1803',2100,82600,,'',0,20200,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9900,,'',0,9400,,'',0,13100,,'',0
 '2919',2100,94900,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
-'2964',2100,82600,,'',0,20200,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9900,,'',0,9400,,'',0,13100,,'',0
 '1798',1002100,152500,,'',0,9100,,'',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 ea270936..abe5926b 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,3 +1,3 @@
 '1798',601,61500,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,4000,,'',0,16100,,'',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
+'1803',601,62300,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,10600,,'',0,14500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2919',601,61900,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11800,,'',0
-'2964',601,62300,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,10600,,'',0,14500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
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 285194d8..c9424c85 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,3 +1,3 @@
 '1798',601,61600,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,8000,,'',0,12100,,'',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
+'1803',601,62400,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2919',601,62000,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11800,,'',0
-'2964',601,62400,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
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 10676b02..0d20b904 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,3 +1,3 @@
 '1798',500,61200,,'',0,9300,,'',0,3300,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
+'1803',500,70700,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,2800,,'',0,9700,,'',0
 '2919',500,64300,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9700,,'',0,10000,,'',0
-'2964',500,70700,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,2800,,'',0,9700,,'',0
diff --git a/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 430d917d..1c524adf 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,3 +1,3 @@
 '1798',500,61300,,'',0,9300,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7700,,'',0,3600,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
+'1803',500,70700,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,2800,,'',0,9700,,'',0
 '2919',500,64300,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
-'2964',500,70700,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,2800,,'',0,9700,,'',0
diff --git a/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 78c75c99..8c9a6d07 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,3 +1,3 @@
 '1798',500,61400,,'',0,9300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,7100,,'',0,3500,,'',0,7700,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3800,,'',0,7500,,'',0,3300,,'',0,7200,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
+'1803',500,70900,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,2800,,'',0,9700,,'',0
 '2919',500,64500,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9700,,'',0,10000,,'',0
-'2964',500,70900,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,2800,,'',0,9700,,'',0
diff --git a/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 386638dd..00943af6 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,3 +1,3 @@
 '1798',500,61600,,'',0,9300,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,7100,,'',0,3500,,'',0,7700,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3800,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
+'1803',500,71000,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,5700,,'',0
 '2919',500,64600,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
-'2964',500,71000,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,5700,,'',0
diff --git a/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 f25b6c6e..b516667a 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,3 +1,3 @@
 '1798',500,61600,,'',0,9300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,7100,,'',0,3500,,'',0,7700,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3800,,'',0,7500,,'',0,3300,,'',0,7200,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
+'1803',500,71000,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,5700,,'',0
 '2919',500,64600,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
-'2964',500,71000,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,5700,,'',0
diff --git a/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 adf4d191..767e8c1a 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,3 +1,3 @@
 '1798',500,61700,,'',0,9300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7700,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3800,,'',0,7500,,'',0,3300,,'',0,7200,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
+'1803',500,71100,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,5700,,'',0
 '2919',500,64700,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
-'2964',500,71100,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,5700,,'',0
diff --git a/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 eed87cfa..db4b9c4d 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,4 +1,4 @@
 '1798',500,61800,,'',0,9300,,'',0,3400,,'',0,7200,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7700,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3800,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
+'1803',500,71200,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,5700,,'',0
 '2919',500,64800,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
-'2964',500,71200,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,5700,,'',0
 '1798',1200,73700,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,11800,,'',0,15600,,'',0,11800,,'',0,17700,,'',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 f6c91caa..357ff84c 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,4 +1,4 @@
 '1798',500,61900,,'',0,9300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7700,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3800,,'',0,7500,,'',0,3300,,'',0,7200,,'',0,2900,,'',0,7300,,'',0,7500,,'',0,2700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
+'1803',500,71300,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,9700,,'',0
 '2919',500,64900,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
-'2964',500,71300,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,9700,,'',0
 '1798',1200,73700,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,11800,,'',0,15600,,'',0,11800,,'',0,17700,,'',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 00616e78..77752aca 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,3 +1,3 @@
 '1798',601,55800,,'',0,8600,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3400,,'',0,8000,,'',0,12000,,'',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
+'1803',601,60700,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
 '2919',601,60300,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2964',601,60700,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
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 9d35c2c9..db2c4cb3 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,3 +1,3 @@
 '1798',601,55800,,'',0,8600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,16000,,'',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
+'1803',601,60700,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
 '2919',601,60300,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2964',601,60700,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
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 18b84ac8..d758fa54 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,3 +1,3 @@
 '1798',601,55900,,'',0,8600,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7400,,'',0,4000,,'',0,16000,,'',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
+'1803',601,60800,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
 '2919',601,60400,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2964',601,60800,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
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 a6c56200..349e0858 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,3 +1,3 @@
 '1798',601,55900,,'',0,8600,,'',0,7100,,'',0,3600,,'',0,7500,,'',0,7400,,'',0,4000,,'',0,16000,,'',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
+'1803',601,60800,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
 '2919',601,60400,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2964',601,60800,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
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 d639747f..17d8faeb 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,3 +1,3 @@
 '1798',601,60000,,'',0,4600,,'',0,7100,,'',0,3600,,'',0,7500,,'',0,7400,,'',0,4000,,'',0,16000,,'',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
+'1803',601,60900,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
 '2919',601,60500,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2964',601,60900,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
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 d639747f..17d8faeb 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,3 +1,3 @@
 '1798',601,60000,,'',0,4600,,'',0,7100,,'',0,3600,,'',0,7500,,'',0,7400,,'',0,4000,,'',0,16000,,'',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
+'1803',601,60900,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
 '2919',601,60500,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2964',601,60900,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
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 99953c37..a9bf1f1d 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,3 +1,3 @@
 '1798',601,60100,,'',0,4600,,'',0,7100,,'',0,3600,,'',0,7500,,'',0,7400,,'',0,4000,,'',0,16000,,'',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
+'1803',601,61000,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
 '2919',601,60600,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2964',601,61000,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
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 34984421..640845eb 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,3 +1,3 @@
 '1798',601,60200,,'',0,4600,,'',0,7100,,'',0,3600,,'',0,7500,,'',0,7400,,'',0,4000,,'',0,16000,,'',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
+'1803',601,61100,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
 '2919',601,60700,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2964',601,61100,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
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 feeb27ef..559c1bae 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,3 +1,3 @@
 '1798',601,60300,,'',0,4600,,'',0,7100,,'',0,3600,,'',0,7500,,'',0,7400,,'',0,4000,,'',0,16000,,'',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
+'1803',601,61100,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10400,,'',0,10000,,'',0,5000,,'',0
 '2919',601,60700,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
-'2964',601,61100,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10400,,'',0,10000,,'',0,5000,,'',0
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 68a23b9e..0daaeb41 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,3 +1,3 @@
 '1798',601,60300,,'',0,4600,,'',0,7100,,'',0,3700,,'',0,7500,,'',0,7300,,'',0,4000,,'',0,16000,,'',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
+'1803',601,61200,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,5900,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
 '2919',601,60800,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2964',601,61200,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,5900,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
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 c1b69fd7..6136b6ca 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,3 +1,3 @@
 '1798',601,60400,,'',0,4600,,'',0,7100,,'',0,3600,,'',0,7500,,'',0,7400,,'',0,4000,,'',0,16000,,'',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
+'1803',601,61200,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,5000,,'',0
 '2919',601,60800,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
-'2964',601,61200,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,5000,,'',0
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 74db8d2d..c0946d7a 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,3 +1,3 @@
 '1798',601,60400,,'',0,4600,,'',0,7100,,'',0,3700,,'',0,7500,,'',0,7300,,'',0,4000,,'',0,16000,,'',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
+'1803',601,61300,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,9900,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,9000,,'',0
 '2919',601,60900,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2964',601,61300,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,9900,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,9000,,'',0
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 d83c40de..959ab649 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,3 +1,3 @@
 '1798',601,60500,,'',0,4600,,'',0,7100,,'',0,3700,,'',0,7500,,'',0,7300,,'',0,4000,,'',0,16000,,'',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
+'1803',601,61300,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,9900,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2919',601,60900,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
-'2964',601,61300,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,9900,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
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 e9e38e80..22f959bc 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,3 +1,3 @@
 '1798',601,60600,,'',0,4600,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,4000,,'',0,16000,,'',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
+'1803',601,61400,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,9900,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2919',601,61000,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
-'2964',601,61400,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,9900,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
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 e9e38e80..22f959bc 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,3 +1,3 @@
 '1798',601,60600,,'',0,4600,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,4000,,'',0,16000,,'',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
+'1803',601,61400,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,9900,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2919',601,61000,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
-'2964',601,61400,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,9900,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
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 20d3dbd7..0c328634 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,3 +1,3 @@
 '1798',601,60700,,'',0,4600,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,4000,,'',0,16000,,'',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
+'1803',601,61500,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,9900,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2919',601,61100,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
-'2964',601,61500,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,9900,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
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 02e7872a..3c941c82 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,3 +1,3 @@
 '1798',601,60700,,'',0,4700,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,4000,,'',0,16000,,'',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
+'1803',601,61500,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10100,,'',0,15000,,'',0,9800,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2919',601,61100,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15800,,'',0
-'2964',601,61500,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10100,,'',0,15000,,'',0,9800,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
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 b423b9f0..bc039494 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,3 +1,3 @@
 '1798',601,60800,,'',0,4600,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,4000,,'',0,16000,,'',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
+'1803',601,61600,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,9900,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2919',601,61200,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
-'2964',601,61600,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,9900,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
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 97727d0f..ab5cc280 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,3 +1,3 @@
 '1798',601,60900,,'',0,4600,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,4000,,'',0,16000,,'',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
+'1803',601,61700,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,9900,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2919',601,61300,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
-'2964',601,61700,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,9900,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
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 f9829ff2..ac64cdff 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,3 +1,3 @@
 '1798',601,60900,,'',0,4700,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,4000,,'',0,16000,,'',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
+'1803',601,61700,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10100,,'',0,15000,,'',0,9800,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2919',601,61300,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15800,,'',0
-'2964',601,61700,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10100,,'',0,15000,,'',0,9800,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
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 32b4cd70..e5c5ad6d 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,3 +1,3 @@
 '1798',601,61000,,'',0,4700,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,4000,,'',0,16000,,'',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
+'1803',601,61800,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10100,,'',0,15000,,'',0,9800,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2919',601,61400,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15800,,'',0
-'2964',601,61800,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10100,,'',0,15000,,'',0,9800,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
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 b2c28a50..6cd31855 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,3 +1,3 @@
 '1798',601,61100,,'',0,4700,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,4000,,'',0,16000,,'',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
+'1803',601,61900,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10100,,'',0,15000,,'',0,9800,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2919',601,61500,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15800,,'',0
-'2964',601,61900,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10100,,'',0,15000,,'',0,9800,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
diff --git a/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 309109b4..dcbee45c 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,3 +1,3 @@
 '1798',601,61700,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,8000,,'',0,12100,,'',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
+'1803',601,62500,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2919',601,62100,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
-'2964',601,62500,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
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 309109b4..dcbee45c 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,3 +1,3 @@
 '1798',601,61700,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,8000,,'',0,12100,,'',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
+'1803',601,62500,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2919',601,62100,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
-'2964',601,62500,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
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 28d74986..89415031 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,3 +1,3 @@
 '1798',601,61800,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,8000,,'',0,12100,,'',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
+'1803',601,62600,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2919',601,62200,,'',0,13100,,'',0,9600,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
-'2964',601,62600,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
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 2ccf9407..37e6c96a 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 @@
 '1798',601,61900,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,8000,,'',0,12100,,'',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
+'1803',601,62700,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2919',601,62300,,'',0,13100,,'',0,9600,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
-'2964',601,62700,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
diff --git a/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 b91f131e..7a685dc5 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 @@
 '1798',601,61900,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,8000,,'',0,12100,,'',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
+'1803',601,62700,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2919',601,62300,,'',0,13100,,'',0,9600,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
-'2964',601,62700,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
diff --git a/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 11237271..1d1f5ea8 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 @@
 '1798',601,61900,,'',0,8900,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,8000,,'',0,12100,,'',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
+'1803',601,62700,,'',0,12100,,'',0,10200,,'',0,10000,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,8900,,'',0
 '2919',601,62300,,'',0,13100,,'',0,9700,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
-'2964',601,62700,,'',0,12100,,'',0,10200,,'',0,10000,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,8900,,'',0
diff --git a/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 cfbd9eaf..5e75350b 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 @@
 '1798',601,62000,,'',0,8900,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,8000,,'',0,12100,,'',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
+'1803',601,62800,,'',0,12100,,'',0,10200,,'',0,10000,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,8900,,'',0
 '2919',601,62400,,'',0,13100,,'',0,9700,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
-'2964',601,62800,,'',0,12100,,'',0,10200,,'',0,10000,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,8900,,'',0
diff --git a/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 7b1c8c70..2741fc3b 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 @@
 '1798',601,62100,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,8000,,'',0,12200,,'',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
+'1803',601,62900,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,14700,,'',0,10500,,'',0,10100,,'',0,10800,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2919',601,62500,,'',0,13100,,'',0,9600,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
-'2964',601,62900,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,14700,,'',0,10500,,'',0,10100,,'',0,10800,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
diff --git a/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 4aa4b3df..577e6f92 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 @@
 '1798',700,62000,,'',0,21100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20500,,'',0,20500,,'',0,20000,,'',0,20900,,'',0
+'1803',700,70700,,'',0,14500,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20900,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
 '2919',700,60700,,'',0,20000,,'',0,15100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,16500,,'',0
-'2964',700,70700,,'',0,14500,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20900,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
 '1798',1600,73800,,'',0,12000,,'',0,68300,,'',0,8500,,'',0
 '1798',1000700,73600,,'',0,2000,,'',0,17500,,'',0,20000,,'',0,20000,,'',0,20500,,'',0,6500,,'',0,14000,,'',0,20000,,'',0,20000,,'',0
+'1803',1000700,60700,,'',0,19500,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20500,,'',0
 '2919',1000700,70700,,'',0,19500,,'',0,15600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
-'2964',1000700,60700,,'',0,19500,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20500,,'',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 adacf238..ae791967 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 @@
 '1798',700,62100,,'',0,21100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20500,,'',0,20500,,'',0,20000,,'',0,20900,,'',0
+'1803',700,70800,,'',0,14500,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20900,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
 '2919',700,60800,,'',0,20000,,'',0,15100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,16500,,'',0
-'2964',700,70800,,'',0,14500,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20900,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
 '1798',1600,73900,,'',0,12000,,'',0,68300,,'',0,8500,,'',0
 '1798',1000700,73700,,'',0,2000,,'',0,17500,,'',0,20000,,'',0,20000,,'',0,20500,,'',0,6500,,'',0,14000,,'',0,20000,,'',0,20000,,'',0
+'1803',1000700,60800,,'',0,19500,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20500,,'',0
 '2919',1000700,70800,,'',0,19500,,'',0,15600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
-'2964',1000700,60800,,'',0,19500,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20500,,'',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 56b67128..737b951e 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 @@
 '1798',700,62100,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20500,,'',0,20400,,'',0,20000,,'',0,20900,,'',0
+'1803',700,70800,,'',0,14600,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
 '2919',700,60800,,'',0,20100,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,15800,,'',0,16500,,'',0
-'2964',700,70800,,'',0,14600,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
 '1798',1600,73900,,'',0,12000,,'',0,68400,,'',0,8500,,'',0
 '1798',1000700,73700,,'',0,2000,,'',0,17500,,'',0,20000,,'',0,20100,,'',0,20500,,'',0,6500,,'',0,14000,,'',0,19900,,'',0,20000,,'',0
+'1803',1000700,60800,,'',0,19600,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
 '2919',1000700,70800,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,15900,,'',0
-'2964',1000700,60800,,'',0,19600,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',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 4afe206f..ff73cd44 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 @@
 '1798',700,62300,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20500,,'',0,20400,,'',0,20000,,'',0,20900,,'',0
+'1803',700,71000,,'',0,14600,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
 '2919',700,61000,,'',0,20100,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',700,71000,,'',0,14600,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
 '1798',1600,74100,,'',0,16000,,'',0,64400,,'',0,8500,,'',0
 '1798',1000700,73900,,'',0,2000,,'',0,17500,,'',0,20000,,'',0,20100,,'',0,20500,,'',0,6500,,'',0,14000,,'',0,19900,,'',0,20000,,'',0
+'1803',1000700,61000,,'',0,19600,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
 '2919',1000700,71000,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
-'2964',1000700,61000,,'',0,19600,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',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 73f5ca1f..57bf5204 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 @@
 '1798',700,62400,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20500,,'',0,20400,,'',0,19900,,'',0,20900,,'',0
+'1803',700,71100,,'',0,14600,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '2919',700,61000,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',700,71100,,'',0,14600,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '1798',1000700,74000,,'',0,6000,,'',0,13500,,'',0,20000,,'',0,20100,,'',0,20500,,'',0,6500,,'',0,14000,,'',0,19900,,'',0,19900,,'',0
+'1803',1000700,61000,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
 '2919',1000700,71100,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
-'2964',1000700,61000,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',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 7ff69667..ee2f65d9 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 @@
 '1798',700,62500,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20500,,'',0,20400,,'',0,19900,,'',0,20900,,'',0
+'1803',700,71200,,'',0,14600,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '2919',700,61100,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',700,71200,,'',0,14600,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '1798',1000700,74100,,'',0,6000,,'',0,13500,,'',0,20000,,'',0,20100,,'',0,20500,,'',0,6500,,'',0,14000,,'',0,19900,,'',0,19900,,'',0
+'1803',1000700,61100,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
 '2919',1000700,71200,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
-'2964',1000700,61100,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',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 7ff69667..ee2f65d9 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 @@
 '1798',700,62500,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20500,,'',0,20400,,'',0,19900,,'',0,20900,,'',0
+'1803',700,71200,,'',0,14600,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '2919',700,61100,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',700,71200,,'',0,14600,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '1798',1000700,74100,,'',0,6000,,'',0,13500,,'',0,20000,,'',0,20100,,'',0,20500,,'',0,6500,,'',0,14000,,'',0,19900,,'',0,19900,,'',0
+'1803',1000700,61100,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
 '2919',1000700,71200,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
-'2964',1000700,61100,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',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 bceae09f..4a361cc3 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 @@
 '1798',700,62600,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20500,,'',0,20400,,'',0,19900,,'',0,20900,,'',0
+'1803',700,71300,,'',0,14600,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '2919',700,61200,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',700,71300,,'',0,14600,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '1798',1000700,74200,,'',0,6000,,'',0,13500,,'',0,20000,,'',0,20100,,'',0,20500,,'',0,6500,,'',0,14000,,'',0,19900,,'',0,19900,,'',0
+'1803',1000700,61200,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
 '2919',1000700,71300,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
-'2964',1000700,61200,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',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 a6244d42..d8fc3026 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 @@
 '1798',700,62600,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20600,,'',0,20300,,'',0,19900,,'',0,20900,,'',0
+'1803',700,71300,,'',0,14600,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '2919',700,61200,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',700,71300,,'',0,14600,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '1798',1000700,74200,,'',0,6000,,'',0,13500,,'',0,20000,,'',0,20100,,'',0,20600,,'',0,6500,,'',0,13900,,'',0,19900,,'',0,19900,,'',0
+'1803',1000700,61200,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
 '2919',1000700,71300,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
-'2964',1000700,61200,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',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 aafe5b07..1fe8b656 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 @@
 '1798',700,62700,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20500,,'',0,20400,,'',0,19900,,'',0,20900,,'',0
+'1803',700,71400,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '2919',700,61300,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',700,71400,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '1798',1000700,74300,,'',0,6000,,'',0,13500,,'',0,20000,,'',0,20100,,'',0,20500,,'',0,6500,,'',0,14000,,'',0,19900,,'',0,19900,,'',0
+'1803',1000700,61300,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
 '2919',1000700,71400,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
-'2964',1000700,61300,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',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 be458354..ffaf47c4 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 @@
 '1798',700,62800,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20500,,'',0,20400,,'',0,19900,,'',0,20900,,'',0
+'1803',700,71500,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '2919',700,61400,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',700,71500,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '1798',1000700,74400,,'',0,6000,,'',0,13500,,'',0,20000,,'',0,20100,,'',0,20500,,'',0,6500,,'',0,14000,,'',0,19900,,'',0,19900,,'',0
+'1803',1000700,61400,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
 '2919',1000700,71500,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
-'2964',1000700,61400,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',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 be458354..ffaf47c4 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 @@
 '1798',700,62800,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20500,,'',0,20400,,'',0,19900,,'',0,20900,,'',0
+'1803',700,71500,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '2919',700,61400,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',700,71500,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '1798',1000700,74400,,'',0,6000,,'',0,13500,,'',0,20000,,'',0,20100,,'',0,20500,,'',0,6500,,'',0,14000,,'',0,19900,,'',0,19900,,'',0
+'1803',1000700,61400,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
 '2919',1000700,71500,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
-'2964',1000700,61400,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',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 c18e2999..e3234bee 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 @@
 '1798',700,62900,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20500,,'',0,20400,,'',0,19900,,'',0,20900,,'',0
+'1803',700,71600,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '2919',700,61500,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',700,71600,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '1798',1600,74700,,'',0,16000,,'',0,64400,,'',0,8500,,'',0
 '1798',1000700,74500,,'',0,6000,,'',0,13500,,'',0,20000,,'',0,20100,,'',0,20500,,'',0,6500,,'',0,14000,,'',0,19900,,'',0,19900,,'',0
+'1803',1000700,61500,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
 '2919',1000700,71600,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
-'2964',1000700,61500,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',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 bcf8005a..88bc7ff8 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 @@
 '1798',700,63000,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20600,,'',0,20300,,'',0,19900,,'',0,20900,,'',0
+'1803',700,71700,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '2919',700,61600,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',700,71700,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '1798',1600,74800,,'',0,16000,,'',0,64400,,'',0,8500,,'',0
 '1798',1000700,74600,,'',0,6000,,'',0,13500,,'',0,20000,,'',0,20100,,'',0,20600,,'',0,6500,,'',0,13900,,'',0,19900,,'',0,19900,,'',0
+'1803',1000700,61600,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
 '2919',1000700,71700,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
-'2964',1000700,61600,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',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 d91a4e34..6124aa84 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 @@
 '1798',700,63000,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20600,,'',0,20300,,'',0,19900,,'',0,20900,,'',0
+'1803',700,71700,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '2919',700,61600,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',700,71700,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '1798',1600,74900,,'',0,15900,,'',0,64400,,'',0,8500,,'',0
 '1798',1000700,74600,,'',0,6000,,'',0,13500,,'',0,20000,,'',0,20100,,'',0,20600,,'',0,6500,,'',0,13900,,'',0,19900,,'',0,19900,,'',0
+'1803',1000700,61600,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
 '2919',1000700,71700,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
-'2964',1000700,61600,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',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 7527bba0..750c27ba 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 @@
 '1798',700,63100,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20600,,'',0,20300,,'',0,19900,,'',0,24900,,'',0
+'1803',700,71800,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '2919',700,61700,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',700,71800,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '1798',1600,74900,,'',0,16000,,'',0,64400,,'',0,8500,,'',0
 '1798',1000700,74700,,'',0,6000,,'',0,13500,,'',0,20000,,'',0,20100,,'',0,20600,,'',0,6500,,'',0,13900,,'',0,19900,,'',0,19900,,'',0
+'1803',1000700,61700,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
 '2919',1000700,71800,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
-'2964',1000700,61700,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',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 f3b4de2c..de5bd245 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 @@
 '1798',700,63100,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20600,,'',0,20300,,'',0,19900,,'',0,24900,,'',0
+'1803',700,71800,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '2919',700,61700,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',700,71800,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '1798',1600,75000,,'',0,15900,,'',0,64400,,'',0,8500,,'',0
 '1798',1000700,74700,,'',0,6000,,'',0,13500,,'',0,20000,,'',0,20100,,'',0,20600,,'',0,6500,,'',0,13900,,'',0,19900,,'',0,19900,,'',0
+'1803',1000700,61700,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
 '2919',1000700,71800,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
-'2964',1000700,61700,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',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 88ebbbad..fea7655f 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 @@
 '1798',700,63200,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20600,,'',0,20300,,'',0,19900,,'',0,24900,,'',0
+'1803',700,71900,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '2919',700,61800,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',700,71900,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '1798',1000700,74800,,'',0,6000,,'',0,13500,,'',0,20000,,'',0,20100,,'',0,20600,,'',0,6500,,'',0,13900,,'',0,19900,,'',0,19900,,'',0
+'1803',1000700,61800,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
 '2919',1000700,71900,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
-'2964',1000700,61800,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',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 6428dead..edb22141 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 @@
 '1798',700,63300,4,'',0,21100,4,'',0,20000,4,'',0,20100,4,'',0,20000,4,'',0,20600,4,'',0,20300,4,'',0,19900,4,'',0,24900,4,'',0
 '1798',701,63300,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,24900,0,'Montrose Exch',0
+'1803',700,72000,4,'',0,18600,4,'',0,21600,4,'',0,21000,4,'',0,21000,4,'',0,20800,4,'',0,20500,4,'',0,10000,4,'',0,16900,4,'',0
+'1803',701,72000,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '2919',700,61900,4,'',0,20200,4,'',0,19100,4,'',0,20000,4,'',0,20000,4,'',0,20000,4,'',0,19800,4,'',0,12500,4,'',0
 '2919',701,61900,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',700,72000,4,'',0,18600,4,'',0,21600,4,'',0,21000,4,'',0,21000,4,'',0,20800,4,'',0,20500,4,'',0,10000,4,'',0,16900,4,'',0
-'2964',701,72000,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',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 47c0d38b..01cdedf3 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 @@
 '1798',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,20600,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,24900,0,'Montrose Exch',0
+'1803',701,72100,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '2919',701,62000,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',701,72100,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '1798',1000701,75000,0,'Montrose Exch',0,6000,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
+'1803',1000701,62000,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
 '2919',1000701,72100,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
-'2964',1000701,62000,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',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 47c0d38b..01cdedf3 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 @@
 '1798',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,20600,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,24900,0,'Montrose Exch',0
+'1803',701,72100,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '2919',701,62000,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',701,72100,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '1798',1000701,75000,0,'Montrose Exch',0,6000,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
+'1803',1000701,62000,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
 '2919',1000701,72100,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
-'2964',1000701,62000,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',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 29cfa363..f57dd6c5 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 @@
 '1798',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,20600,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,24900,0,'Montrose Exch',0
+'1803',701,72200,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '2919',701,62100,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',701,72200,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '1798',1000701,75100,0,'Montrose Exch',0,6000,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
+'1803',1000701,62100,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
 '2919',1000701,72200,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
-'2964',1000701,62100,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',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 29cfa363..f57dd6c5 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 @@
 '1798',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,20600,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,24900,0,'Montrose Exch',0
+'1803',701,72200,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '2919',701,62100,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',701,72200,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '1798',1000701,75100,0,'Montrose Exch',0,6000,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
+'1803',1000701,62100,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
 '2919',1000701,72200,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
-'2964',1000701,62100,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',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 bfc4c2fd..4348b1d8 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 @@
 '1798',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,20500,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,24900,0,'Montrose Exch',0
+'1803',701,72200,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '2919',701,62100,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',701,72200,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '1798',1000701,75200,0,'Montrose Exch',0,5900,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
+'1803',1000701,62100,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,20400,,'',0
 '2919',1000701,72200,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
-'2964',1000701,62100,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,20400,,'',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 37c714cd..1b9d54ae 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 @@
 '1798',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,20600,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,24900,0,'Montrose Exch',0
+'1803',701,72300,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '2919',701,62200,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',701,72300,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '1798',1000701,75200,0,'Montrose Exch',0,6000,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
+'1803',1000701,62200,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
 '2919',1000701,72300,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
-'2964',1000701,62200,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',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 9e880227..55affd30 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 @@
 '1798',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,20600,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,24900,0,'Montrose Exch',0
+'1803',701,72300,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '2919',701,62200,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',701,72300,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '1798',1000701,75300,0,'Montrose Exch',0,5900,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
+'1803',1000701,62200,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,20400,,'',0
 '2919',1000701,72300,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
-'2964',1000701,62200,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,20400,,'',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 bf52ce48..ed44edd3 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 @@
 '1798',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,20600,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,24900,0,'Montrose Exch',0
+'1803',701,72400,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '2919',701,62300,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',701,72400,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '1798',1000701,75300,0,'Montrose Exch',0,6000,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
+'1803',1000701,62300,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
 '2919',1000701,72400,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
-'2964',1000701,62300,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',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 4997d27f..f4bfa8ef 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 @@
 '1798',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,20500,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,24900,0,'Montrose Exch',0
+'1803',701,72400,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '2919',701,62300,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',701,72400,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '1798',1000701,75400,0,'Montrose Exch',0,5900,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
+'1803',1000701,62300,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,20400,,'',0
 '2919',1000701,72400,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
-'2964',1000701,62300,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,20400,,'',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 f91a73d9..ed7eb669 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 @@
 '1798',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,20500,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,24900,0,'Montrose Exch',0
+'1803',701,72500,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,24500,,'',0,10000,,'',0,12900,,'',0
 '2919',701,62400,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',701,72500,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,24500,,'',0,10000,,'',0,12900,,'',0
 '1798',1000701,75500,0,'Montrose Exch',0,5900,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,17900,0,'Montrose Exch',0,15900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
+'1803',1000701,62400,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,20400,,'',0
 '2919',1000701,72500,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
-'2964',1000701,62400,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,20400,,'',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 32dbb95d..332de17f 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 @@
 '1798',1601,75600,,'',0,15900,,'',0,64400,,'',0,8500,,'',0
 '1798',1000701,75500,0,'Montrose Exch',0,6000,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,17900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,15900,0,'Montrose Exch',0
+'1803',1000701,62500,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
 '2919',1000701,72600,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
-'2964',1000701,62500,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',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 15f9388c..8a84f01d 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 @@
 '1798',1601,75700,,'',0,15900,,'',0,68400,,'',0,4500,,'',0
 '1798',1000701,75700,0,'Montrose Exch',0,5900,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,17900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
+'1803',1000701,62600,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,20400,,'',0
 '2919',1000701,72700,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
-'2964',1000701,62600,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,20400,,'',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 4845191f..76a100ca 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 @@
 '1798',201,51400,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5800,,'',0,1600,,'',0,1500,,'',0,2000,,'',0,6600,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2400,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,1600,,'',0,2300,,'',0,5700,,'',0,1700,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'1803',201,60600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
 '2919',201,62000,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'2964',201,60600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
 '1798',1601,75800,,'',0,15900,,'',0,68400,,'',0,4500,,'',0
 '1798',1000701,75800,0,'Montrose Exch',0,5900,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,17900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
+'1803',1000701,62700,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,20400,,'',0
 '2919',1000701,72800,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
-'2964',1000701,62700,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,20400,,'',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 06bd39f9..2338d6a0 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 @@
 '1798',1601,75900,,'',0,15900,,'',0,68400,,'',0,4500,,'',0
 '1798',1000701,75900,0,'Montrose Exch',0,5900,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,24600,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,17900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
+'1803',1000701,62800,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,20400,,'',0
 '2919',1000701,72900,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
-'2964',1000701,62800,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,20400,,'',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 7d62ad27..91ecf270 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 @@
 '1798',1601,80000,,'',0,11900,,'',0,68400,,'',0,4500,,'',0
 '1798',1000701,80000,0,'Montrose Exch',0,1900,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,24600,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,17800,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
+'1803',1000701,62800,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,24400,,'',0
 '2919',1000701,72900,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
-'2964',1000701,62800,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,24400,,'',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 dc669a28..33078466 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 @@
 '1798',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,20500,0,'Montrose Exch',0,24300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,20900,0,'Montrose Exch',0
+'1803',701,72800,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,24500,,'',0,10000,,'',0,12900,,'',0
 '2919',701,62700,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',701,72800,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,24500,,'',0,10000,,'',0,12900,,'',0
 '1798',1601,80000,,'',0,11900,,'',0,68400,,'',0,4500,,'',0
 '1798',1000701,80000,0,'Montrose Exch',0,1900,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,24600,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,17900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
+'1803',1000701,62900,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,24400,,'',0
 '2919',1000701,73000,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
-'2964',1000701,62900,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,24400,,'',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 62c4cec7..1190755c 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 @@
 '1798',701,64200,0,'Montrose Exch',0,21200,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,24500,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,20800,0,'Montrose Exch',0
+'1803',701,72800,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,24500,,'',0,10000,,'',0,12800,,'',0
 '2919',701,62700,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',701,72800,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,24500,,'',0,10000,,'',0,12800,,'',0
 '1798',1601,80000,,'',0,11900,,'',0,68400,,'',0,4500,,'',0
 '1798',1000701,80100,0,'Montrose Exch',0,1900,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,24600,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,17800,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
+'1803',1000701,62900,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,24400,,'',0
 '2919',1000701,73000,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
-'2964',1000701,62900,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,24400,,'',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 77437ec0..269916ab 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 @@
 '1798',701,64200,0,'Montrose Exch',0,21200,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,24500,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,20800,0,'Montrose Exch',0
+'1803',701,72800,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,24500,,'',0,10000,,'',0,12800,,'',0
 '2919',701,62700,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',701,72800,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,24500,,'',0,10000,,'',0,12800,,'',0
 '1798',1601,80100,,'',0,11900,,'',0,68400,,'',0,4500,,'',0
 '1798',1000701,80100,0,'Montrose Exch',0,1900,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,24600,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,17800,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
+'1803',1000701,62900,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,24400,,'',0
 '2919',1000701,73000,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
-'2964',1000701,62900,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,24400,,'',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 8bf4c6e9..7a971ba2 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 @@
 '1798',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,24500,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,20900,0,'Montrose Exch',0
+'1803',701,72900,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,24500,,'',0,10000,,'',0,12900,,'',0
 '2919',701,62800,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',701,72900,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,24500,,'',0,10000,,'',0,12900,,'',0
 '1798',1601,80100,,'',0,11900,,'',0,68400,,'',0,4500,,'',0
 '1798',1000701,80100,0,'Montrose Exch',0,1900,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,24600,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,17900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
+'1803',1000701,63000,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,24400,,'',0
 '2919',1000701,73100,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
-'2964',1000701,63000,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,24400,,'',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 2c5f46df..8b9859e8 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 @@
 '1798',701,64300,0,'Montrose Exch',0,21200,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,24500,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,20800,0,'Montrose Exch',0
+'1803',701,72900,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,24800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
 '2919',701,62800,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',701,72900,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,24800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
 '1798',1000701,80200,0,'Montrose Exch',0,1900,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,24600,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,17800,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
+'1803',1000701,63000,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,24400,,'',0
 '2919',1000701,73100,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
-'2964',1000701,63000,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,24400,,'',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 c2333075..1c0585a6 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,2 +1,2 @@
 '1798',1501,62000,,'',0,8300,,'',0,11800,,'',0,68400,,'',0,20200,,'',0,5100,,'',0
-'2964',1501,90400,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'1803',1501,90400,,'',0,14500,,'',0,47000,,'',0,18500,,'',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 44fe24af..645f456c 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,2 +1,2 @@
 '1798',1500,64400,,'',0,8300,,'',0,12000,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
-'2964',1500,92800,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'1803',1500,92800,,'',0,18500,,'',0,43000,,'',0,18500,,'',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 9042129e..c76275d3 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 @@
 '1798',1500,64000,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2964',1500,92400,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'1803',1500,92400,,'',0,18500,,'',0,43000,,'',0,18500,,'',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 ec99231e..4a91a388 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 @@
 '1798',1501,62400,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2964',1501,90900,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'1803',1501,90900,,'',0,14500,,'',0,47000,,'',0,18500,,'',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 cd8aecee..8a4da8da 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 @@
 '1798',1501,62500,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2964',1501,91000,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'1803',1501,91000,,'',0,14500,,'',0,47000,,'',0,18500,,'',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 a64e056c..c64555c0 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 @@
 '1798',1501,62700,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2964',1501,91200,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'1803',1501,91200,,'',0,14500,,'',0,47000,,'',0,18500,,'',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 feda7d0f..320def46 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 @@
 '1798',1501,62900,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2964',1501,91400,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'1803',1501,91400,,'',0,14500,,'',0,47000,,'',0,18500,,'',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 7d7a98a7..0c7447eb 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 @@
 '1798',1501,63000,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2964',1501,91500,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'1803',1501,91500,,'',0,18500,,'',0,43000,,'',0,18500,,'',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 b26fe6f6..c687f50a 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 @@
 '1798',1501,63100,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2964',1501,91600,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'1803',1501,91600,,'',0,18500,,'',0,43000,,'',0,18500,,'',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 747569d4..1f2e9c85 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 @@
 '1798',1501,63200,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2964',1501,91600,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'1803',1501,91600,,'',0,18500,,'',0,43000,,'',0,18500,,'',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 bb9faf60..d889cf99 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 @@
 '1798',1500,63400,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
 '1798',1501,63400,4,'',0,8300,4,'',0,11900,4,'',0,68400,4,'',0,20300,4,'',0,9000,4,'',0
-'2964',1500,91800,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
-'2964',1501,91800,4,'',0,18500,4,'',0,43000,4,'',0,18500,4,'',0
+'1803',1500,91800,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'1803',1501,91800,4,'',0,18500,4,'',0,43000,4,'',0,18500,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 f9436404..f098c0d8 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 @@
 '1798',1500,63500,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2964',1500,91900,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'1803',1500,91900,,'',0,18500,,'',0,43000,,'',0,18500,,'',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 b6df0d20..fe72bc18 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 @@
 '1798',1500,63700,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2964',1500,92100,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'1803',1500,92100,,'',0,18500,,'',0,43000,,'',0,18500,,'',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 b6df0d20..fe72bc18 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 @@
 '1798',1500,63700,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2964',1500,92100,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'1803',1500,92100,,'',0,18500,,'',0,43000,,'',0,18500,,'',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 9e61a1c8..c6f61d5a 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 @@
 '1798',1500,63900,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2964',1500,92300,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'1803',1500,92300,,'',0,18500,,'',0,43000,,'',0,18500,,'',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 79023ec9..f9d509f6 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,2 +1,2 @@
 '1798',1500,64100,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2964',1500,92500,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'1803',1500,92500,,'',0,18500,,'',0,43000,,'',0,18500,,'',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 c74f299e..9ee53e5e 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,2 +1,2 @@
 '1798',1500,64500,,'',0,8300,,'',0,12000,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
-'2964',1500,92900,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'1803',1500,92900,,'',0,18500,,'',0,43000,,'',0,18500,,'',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 bb2d041b..f90cb227 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 @@
 '1798',701,64900,0,'Montrose Exch',0,25200,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20500,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,20600,0,'Montrose Exch',0
+'1803',701,73400,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,24800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
 '2919',701,63300,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',701,73400,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,24800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
 '1798',1000701,80700,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,17500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,17900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
+'1803',1000701,63500,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,24800,,'',0,20400,,'',0
 '2919',1000701,73600,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
-'2964',1000701,63500,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,24800,,'',0,20400,,'',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 ac21cea9..75ef4fed 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 @@
 '1798',701,64700,0,'Montrose Exch',0,21200,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,24100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20500,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,20600,0,'Montrose Exch',0
+'1803',701,73200,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,24800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
 '2919',701,63100,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',701,73200,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,24800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
 '1798',1000701,80500,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,17500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,17900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
+'1803',1000701,63300,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,24800,,'',0,20400,,'',0
 '2919',1000701,73400,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
-'2964',1000701,63300,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,24800,,'',0,20400,,'',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 507ca2cf..ffbd1326 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,5 +1,5 @@
 '1798',1701,63100,,'',0,7200,,'',0,4800,,'',0,76400,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
 '1798',2101,60500,,'',0,3600,,'',0,18300,,'',0,12600,,'',0,15100,,'',0,11700,,'',0,13000,,'',0,7200,,'',0,8500,,'',0,4600,,'',0,10100,,'',0,15900,,'',0,11200,,'',0
+'1803',2101,74200,,'',0,20000,,'',0,11600,,'',0,18800,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
 '2919',2101,90400,,'',0,13000,,'',0,12500,,'',0,16900,,'',0,13000,,'',0,16900,,'',0,17300,,'',0
-'2964',2101,74200,,'',0,20000,,'',0,11600,,'',0,18800,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
 '1798',1002101,72400,,'',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 d59273c5..f4612204 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 @@
 '1798',1701,63400,,'',0,7200,,'',0,4900,,'',0,76400,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
 '1798',2101,60800,,'',0,3600,,'',0,18300,,'',0,12600,,'',0,15200,,'',0,11700,,'',0,13000,,'',0,7200,,'',0,8600,,'',0,4600,,'',0,10000,,'',0,15900,,'',0,11100,,'',0
+'1803',2101,74500,,'',0,20000,,'',0,15700,,'',0,14800,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
 '2919',2101,90700,,'',0,13000,,'',0,16600,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
-'2964',2101,74500,,'',0,20000,,'',0,15700,,'',0,14800,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
 '1798',1002101,72700,,'',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 ba683648..555b9496 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 @@
 '1798',1701,63500,,'',0,7200,,'',0,4900,,'',0,76400,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
 '1798',2101,60900,,'',0,3600,,'',0,18300,,'',0,12600,,'',0,15200,,'',0,11700,,'',0,13000,,'',0,7200,,'',0,8600,,'',0,4600,,'',0,10000,,'',0,15900,,'',0,11100,,'',0
+'1803',2101,74600,,'',0,20000,,'',0,15700,,'',0,14800,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
 '2919',2101,90800,,'',0,13000,,'',0,16600,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
-'2964',2101,74600,,'',0,20000,,'',0,15700,,'',0,14800,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
 '1798',1002101,72800,,'',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 25ac9d2c..00101f8b 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 @@
 '1798',1700,64400,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,7600,,'',0
 '1798',2100,64900,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,16000,,'',0,13400,,'',0,20400,,'',0,9600,,'',0,11600,,'',0,15200,,'',0
+'1803',2100,82300,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,9400,,'',0,13100,,'',0
 '2919',2100,94600,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
-'2964',2100,82300,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,9400,,'',0,13100,,'',0
 '1798',1002100,152000,,'',0,9100,,'',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 941dcd69..f1ff79f9 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 @@
 '1798',1700,64500,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,7600,,'',0
 '1798',2100,65000,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,16000,,'',0,13400,,'',0,20400,,'',0,9600,,'',0,11600,,'',0,15200,,'',0
+'1803',2100,82400,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,9400,,'',0,13100,,'',0
 '2919',2100,94700,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
-'2964',2100,82400,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,9400,,'',0,13100,,'',0
 '1798',1002100,152100,,'',0,9100,,'',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 1b4ffa06..5945c834 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 @@
 '1798',1700,64600,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,7600,,'',0
 '1798',2100,65100,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,16000,,'',0,13400,,'',0,20500,,'',0,9500,,'',0,11600,,'',0,15100,,'',0
+'1803',2100,82500,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,15900,,'',0,11400,,'',0,9800,,'',0,9400,,'',0,13100,,'',0
 '2919',2100,94800,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
-'2964',2100,82500,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,15900,,'',0,11400,,'',0,9800,,'',0,9400,,'',0,13100,,'',0
 '1798',1002100,152200,,'',0,9100,,'',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 5001c44c..2ab24d40 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 @@
 '1798',1700,64700,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,7600,,'',0
 '1798',2100,65200,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,16000,,'',0,13500,,'',0,20400,,'',0,9500,,'',0,15600,,'',0,11100,,'',0
+'1803',2100,82600,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,15900,,'',0,11400,,'',0,9800,,'',0,9400,,'',0,13100,,'',0
 '2919',2100,94900,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
-'2964',2100,82600,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,15900,,'',0,11400,,'',0,9800,,'',0,9400,,'',0,13100,,'',0
 '1798',1002100,152300,,'',0,9100,,'',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 3ab45b4a..ac3a3740 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 @@
 '1798',2101,61000,,'',0,3600,,'',0,18300,,'',0,12600,,'',0,15200,,'',0,11700,,'',0,13000,,'',0,7200,,'',0,8600,,'',0,4600,,'',0,10000,,'',0,15900,,'',0,11100,,'',0
+'1803',2101,74600,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
 '2919',2101,90800,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
-'2964',2101,74600,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
 '1798',1002101,72900,,'',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 27a1fb74..5ef5e5c5 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 @@
 '1798',2101,61200,,'',0,3600,,'',0,18300,,'',0,12600,,'',0,15200,,'',0,11700,,'',0,13000,,'',0,7200,,'',0,8600,,'',0,8600,,'',0,10000,,'',0,11900,,'',0,11100,,'',0
+'1803',2101,74700,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
 '2919',2101,90900,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
-'2964',2101,74700,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',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 24c7e278..d4535ce8 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 @@
 '1798',2101,61400,,'',0,3600,,'',0,18300,,'',0,12600,,'',0,15200,,'',0,11700,,'',0,13000,,'',0,7200,,'',0,8600,,'',0,8600,,'',0,10000,,'',0,11900,,'',0,11100,,'',0
+'1803',2101,74900,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
 '2919',2101,91100,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
-'2964',2101,74900,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
 '1798',1002101,74100,,'',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 24c7e278..d4535ce8 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 @@
 '1798',2101,61400,,'',0,3600,,'',0,18300,,'',0,12600,,'',0,15200,,'',0,11700,,'',0,13000,,'',0,7200,,'',0,8600,,'',0,8600,,'',0,10000,,'',0,11900,,'',0,11100,,'',0
+'1803',2101,74900,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
 '2919',2101,91100,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
-'2964',2101,74900,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
 '1798',1002101,74100,,'',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 bb5dcb3c..0c10b865 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 @@
 '1798',2101,61500,,'',0,3600,,'',0,18300,,'',0,16600,,'',0,11200,,'',0,11700,,'',0,13000,,'',0,7200,,'',0,8600,,'',0,8600,,'',0,10000,,'',0,11900,,'',0,11100,,'',0
+'1803',2101,75000,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
 '2919',2101,91200,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
-'2964',2101,75000,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
 '1798',1002101,74200,,'',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 9dc4b1d8..8dd7d5fa 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 @@
 '1798',2101,61600,,'',0,3600,,'',0,18400,,'',0,16500,,'',0,11200,,'',0,11700,,'',0,17000,,'',0,3200,,'',0,8600,,'',0,8600,,'',0,10000,,'',0,11900,,'',0,11100,,'',0
+'1803',2101,75100,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
 '2919',2101,91300,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
-'2964',2101,75100,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
 '1798',1002101,74300,,'',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 ca908867..843d23d3 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 @@
 '1798',2101,61800,,'',0,3600,,'',0,18400,,'',0,16500,,'',0,11200,,'',0,11700,,'',0,17100,,'',0,3200,,'',0,8600,,'',0,8600,,'',0,9900,,'',0,11900,,'',0,11100,,'',0
+'1803',2101,75300,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
 '2919',2101,91500,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
-'2964',2101,75300,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
 '1798',1002101,74500,,'',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 ec89712d..681c967a 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 @@
 '1798',2101,62000,,'',0,3600,,'',0,18400,,'',0,16500,,'',0,11200,,'',0,11800,,'',0,17000,,'',0,3300,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,11800,,'',0,11100,,'',0
+'1803',2101,75500,,'',0,20000,,'',0,15800,,'',0,18800,,'',0,12500,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,16600,,'',0
 '2919',2101,91700,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12900,,'',0,17200,,'',0
-'2964',2101,75500,,'',0,20000,,'',0,15800,,'',0,18800,,'',0,12500,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,16600,,'',0
 '1798',1002101,74700,,'',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 1a1ba7b5..43924a28 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 @@
 '1798',2101,62100,,'',0,3600,,'',0,18400,,'',0,16500,,'',0,11200,,'',0,11800,,'',0,17100,,'',0,3300,,'',0,8600,,'',0,8500,,'',0,9900,,'',0,11800,,'',0,11100,,'',0
+'1803',2101,75600,,'',0,20000,,'',0,15800,,'',0,18800,,'',0,12500,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,16600,,'',0
 '2919',2101,91800,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12900,,'',0,17200,,'',0
-'2964',2101,75600,,'',0,20000,,'',0,15800,,'',0,18800,,'',0,12500,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,16600,,'',0
 '1798',1002101,74800,,'',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 1e7294a2..78d14b3f 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 @@
 '1798',2101,62200,,'',0,3600,,'',0,18400,,'',0,16500,,'',0,11200,,'',0,11800,,'',0,17100,,'',0,3300,,'',0,8600,,'',0,8500,,'',0,9900,,'',0,11800,,'',0,11100,,'',0
+'1803',2101,75700,,'',0,20000,,'',0,15800,,'',0,18800,,'',0,12500,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,16600,,'',0
 '2919',2101,91900,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12900,,'',0,17200,,'',0
-'2964',2101,75700,,'',0,20000,,'',0,15800,,'',0,18800,,'',0,12500,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,16600,,'',0
 '1798',1002101,74900,,'',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 81ee1371..e72eea01 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 @@
 '1798',2101,62300,,'',0,3600,,'',0,18400,,'',0,16500,,'',0,11200,,'',0,11800,,'',0,17100,,'',0,3300,,'',0,8600,,'',0,8500,,'',0,9900,,'',0,11800,,'',0,11100,,'',0
+'1803',2101,75800,,'',0,20000,,'',0,15800,,'',0,18800,,'',0,12500,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,16600,,'',0
 '2919',2101,92000,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12900,,'',0,17200,,'',0
-'2964',2101,75800,,'',0,20000,,'',0,15800,,'',0,18800,,'',0,12500,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,16600,,'',0
 '1798',1002101,75000,,'',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 f78c9be5..b921472f 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 @@
 '1798',2100,63700,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,12000,,'',0,17200,,'',0,20400,,'',0,9700,,'',0,11700,,'',0,11200,,'',0
+'1803',2100,81300,,'',0,20000,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,10000,,'',0,9500,,'',0,17100,,'',0
 '2919',2100,93500,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,13100,,'',0
-'2964',2100,81300,,'',0,20000,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,10000,,'',0,9500,,'',0,17100,,'',0
 '1798',1002100,150000,,'',0,5100,,'',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 46ad4465..0af82ffb 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 @@
 '1798',2100,63800,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,12000,,'',0,17200,,'',0,20400,,'',0,9700,,'',0,11700,,'',0,11200,,'',0
+'1803',2100,81400,,'',0,20000,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,15400,,'',0,10000,,'',0,5500,,'',0,17100,,'',0
 '2919',2100,93600,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,13100,,'',0
-'2964',2100,81400,,'',0,20000,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,15400,,'',0,10000,,'',0,5500,,'',0,17100,,'',0
 '1798',1002100,150100,,'',0,5100,,'',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 e37a33ed..00ce3512 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 @@
 '1798',2100,63800,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,12000,,'',0,17200,,'',0,20400,,'',0,9700,,'',0,11700,,'',0,11200,,'',0
+'1803',2100,81400,,'',0,20100,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,5500,,'',0,17100,,'',0
 '2919',2100,93600,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,13100,,'',0
-'2964',2100,81400,,'',0,20100,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,5500,,'',0,17100,,'',0
 '1798',1002100,150100,,'',0,5100,,'',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 73cfee71..6c2c02a7 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 @@
 '1798',2100,63900,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,12000,,'',0,17200,,'',0,20400,,'',0,9700,,'',0,11700,,'',0,11200,,'',0
+'1803',2100,81500,,'',0,20100,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,5500,,'',0,17100,,'',0
 '2919',2100,93700,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,13100,,'',0
-'2964',2100,81500,,'',0,20100,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,5500,,'',0,17100,,'',0
 '1798',1002100,150200,,'',0,5100,,'',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 7f061bbf..354b819d 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 @@
 '1798',2100,64000,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,12000,,'',0,17200,,'',0,20400,,'',0,9700,,'',0,11700,,'',0,15200,,'',0
+'1803',2100,81500,,'',0,20200,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,5500,,'',0,17100,,'',0
 '2919',2100,93800,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,13100,,'',0
-'2964',2100,81500,,'',0,20200,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,5500,,'',0,17100,,'',0
 '1798',1002100,150300,,'',0,5100,,'',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 4fbafd31..ed51b58c 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 @@
 '1798',2100,64100,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,12000,,'',0,17200,,'',0,20400,,'',0,9700,,'',0,11700,,'',0,15200,,'',0
+'1803',2100,81600,,'',0,20100,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,5400,,'',0,17100,,'',0
 '2919',2100,93800,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
-'2964',2100,81600,,'',0,20100,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,5400,,'',0,17100,,'',0
 '1798',1002100,150400,,'',0,5100,,'',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 11af14a4..c1f803d6 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 @@
 '1798',2100,64300,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,16000,,'',0,13300,,'',0,20400,,'',0,9700,,'',0,11600,,'',0,15200,,'',0
+'1803',2100,81800,,'',0,20200,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,9500,,'',0,13100,,'',0
 '2919',2100,94100,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,13100,,'',0
-'2964',2100,81800,,'',0,20200,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,9500,,'',0,13100,,'',0
 '1798',1002100,150700,,'',0,5100,,'',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 c66ae48c..473def03 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 @@
 '1798',2100,64500,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,16000,,'',0,13300,,'',0,20400,,'',0,9700,,'',0,11600,,'',0,15200,,'',0
+'1803',2100,81900,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,9400,,'',0,13100,,'',0
 '2919',2100,94200,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
-'2964',2100,81900,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,9400,,'',0,13100,,'',0
 '1798',1002100,150900,,'',0,9100,,'',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 c74d1b16..d4f05775 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 @@
 '1798',2100,64600,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,16000,,'',0,13300,,'',0,20400,,'',0,9700,,'',0,11600,,'',0,15200,,'',0
+'1803',2100,82000,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,9400,,'',0,13100,,'',0
 '2919',2100,94300,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
-'2964',2100,82000,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,9400,,'',0,13100,,'',0
 '1798',1002100,151000,,'',0,9100,,'',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 f8c63fb1..10eff354 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 @@
 '1798',2100,64700,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,16000,,'',0,13300,,'',0,20400,,'',0,9700,,'',0,11600,,'',0,15200,,'',0
+'1803',2100,82100,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,9400,,'',0,13100,,'',0
 '2919',2100,94400,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
-'2964',2100,82100,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,9400,,'',0,13100,,'',0
 '1798',1002100,151100,,'',0,9100,,'',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 f8c63fb1..10eff354 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 @@
 '1798',2100,64700,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,16000,,'',0,13300,,'',0,20400,,'',0,9700,,'',0,11600,,'',0,15200,,'',0
+'1803',2100,82100,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,9400,,'',0,13100,,'',0
 '2919',2100,94400,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
-'2964',2100,82100,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,9400,,'',0,13100,,'',0
 '1798',1002100,151100,,'',0,9100,,'',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 de471e7f..4d069b5c 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 @@
 '1798',2100,64800,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,16000,,'',0,13400,,'',0,20400,,'',0,9600,,'',0,11600,,'',0,15200,,'',0
+'1803',2100,82200,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,9400,,'',0,13100,,'',0
 '2919',2100,94500,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
-'2964',2100,82200,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,9400,,'',0,13100,,'',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 9379379f..7ad3c775 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,3 +1,3 @@
 '1798',400,61900,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'1803',400,61900,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',400,70100,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2964',400,61900,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
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 7e54a4cc..fa1b2156 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 @@
 '1798',400,62100,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'1803',400,62000,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',400,70200,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2964',400,62000,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/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 4d32b8cd..a0fcafe0 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,6 +1,6 @@
 '1798',3100,73300,,'',0,7100,,'',0,3000,,'',0,10400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10800,,'',0,9200,,'',0,4200,,'',0,5500,,'',0,3200,,'',0,7100,,'',0,1300,,'',0,3600,,'',0
-'2964',3100,92400,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
+'1803',3100,92400,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
 '1798',1003100,64700,,'',0,6900,,'',0,3000,,'',0,7300,,'',0,8500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,10800,,'',0,7700,,'',0,9300,,'',0,3000,,'',0,8800,,'',0,10000,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,10900,,'',0
+'1803',1003100,85100,,'',0,10200,,'',0,14700,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,15200,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
 '2919',1003100,101800,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
-'2964',1003100,85100,,'',0,10200,,'',0,14700,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,15200,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
 '1798',24003100,60400,,'',0,3100,,'',0,7000,,'',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 63af6104..3693e66c 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,6 +1,6 @@
 '1798',3100,73400,,'',0,7100,,'',0,3000,,'',0,10400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10800,,'',0,9200,,'',0,4200,,'',0,5500,,'',0,3200,,'',0,7100,,'',0,1300,,'',0,3600,,'',0
-'2964',3100,92500,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
+'1803',3100,92500,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
 '1798',1003100,64900,,'',0,6900,,'',0,3000,,'',0,7300,,'',0,8500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,10800,,'',0,7700,,'',0,9300,,'',0,3000,,'',0,8800,,'',0,10000,,'',0,7600,,'',0,11400,,'',0,11500,,'',0,10900,,'',0
+'1803',1003100,85200,,'',0,10200,,'',0,14700,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,15100,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
 '2919',1003100,102000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2964',1003100,85200,,'',0,10200,,'',0,14700,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,15100,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
 '1798',24003100,60500,,'',0,3100,,'',0,7000,,'',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 5d5dd681..fdf069cf 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,3 +1,3 @@
 '1798',1003101,70600,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7400,,'',0,10100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,11100,,'',0,9300,,'',0,8700,,'',0,7100,,'',0,3200,,'',0,6800,,'',0,10400,,'',0,4500,,'',0,16300,,'',0
+'1803',1003101,85600,,'',0,10100,,'',0,14500,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10900,,'',0,10500,,'',0,10500,,'',0
 '2919',1003101,105400,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2964',1003101,85600,,'',0,10100,,'',0,14500,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10900,,'',0,10500,,'',0,10500,,'',0
diff --git a/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 38d03cb7..dc1ba4f9 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,3 +1,3 @@
 '1798',1003101,70700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7400,,'',0,10100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,11100,,'',0,9300,,'',0,8700,,'',0,7100,,'',0,3200,,'',0,6800,,'',0,10400,,'',0,4500,,'',0,16300,,'',0
+'1803',1003101,85700,,'',0,10100,,'',0,14500,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10900,,'',0,10500,,'',0,10500,,'',0
 '2919',1003101,105500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2964',1003101,85700,,'',0,10100,,'',0,14500,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10900,,'',0,10500,,'',0,10500,,'',0
diff --git a/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 c9eef68b..2f58ffb8 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,3 +1,3 @@
 '1798',1003101,70700,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7400,,'',0,10100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,11100,,'',0,9300,,'',0,8700,,'',0,7100,,'',0,3200,,'',0,6800,,'',0,10300,,'',0,4500,,'',0,16300,,'',0
+'1803',1003101,85700,,'',0,10100,,'',0,14600,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
 '2919',1003101,105500,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2964',1003101,85700,,'',0,10100,,'',0,14600,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
diff --git a/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 cc698f3a..faae24fe 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 @@
 '1798',1003100,65500,,'',0,6900,,'',0,3100,,'',0,7200,,'',0,8500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,10800,,'',0,7700,,'',0,9400,,'',0,3000,,'',0,8700,,'',0,10000,,'',0,7600,,'',0,11400,,'',0,11500,,'',0,10900,,'',0
+'1803',1003100,85800,,'',0,14200,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,15100,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
 '2919',1003100,102600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2964',1003100,85800,,'',0,14200,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,15100,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
diff --git a/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 63b7ad1b..a946ed25 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 @@
 '1798',1003100,65500,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,8500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,7700,,'',0,9400,,'',0,3000,,'',0,8700,,'',0,9900,,'',0,7600,,'',0,11400,,'',0,11500,,'',0,10900,,'',0
+'1803',1003100,85800,,'',0,14200,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,15100,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
 '2919',1003100,102600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2964',1003100,85800,,'',0,14200,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,15100,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
diff --git a/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 b345ead9..f74f2ff9 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 @@
 '1798',1003100,65600,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,8500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,7700,,'',0,9400,,'',0,3000,,'',0,8700,,'',0,9900,,'',0,7600,,'',0,11400,,'',0,11500,,'',0,10900,,'',0
+'1803',1003100,85900,,'',0,14200,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,15100,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
 '2919',1003100,102700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2964',1003100,85900,,'',0,14200,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,15100,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
diff --git a/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 595093a1..84ba3144 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 @@
 '1798',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,20600,0,'Montrose Exch',0,24300,0,'Montrose Exch',0,15900,0,'Montrose Exch',0,24900,0,'Montrose Exch',0
+'1803',701,72600,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,24500,,'',0,10000,,'',0,12900,,'',0
 '2919',701,62500,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',701,72600,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,24500,,'',0,10000,,'',0,12900,,'',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 9cad44bb..f013591e 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 @@
 '1798',2101,61100,,'',0,3600,,'',0,18300,,'',0,12600,,'',0,15200,,'',0,11700,,'',0,13000,,'',0,7200,,'',0,8600,,'',0,4600,,'',0,10000,,'',0,15900,,'',0,11100,,'',0
+'1803',2101,74700,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
 '2919',2101,90900,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
-'2964',2101,74700,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
 '1798',1002101,73000,,'',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 603900a9..08afb619 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,19 +1,19 @@
 '1798',101,54700,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,2800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,2600,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'1803',101,62000,,'',0,3800,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,2900,,'',0,8700,,'',0
 '2919',101,62400,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0
-'2964',101,62000,,'',0,3800,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,2900,,'',0,8700,,'',0
+'1803',400,63800,4,'',0,9200,4,'',0,9800,4,'',0,10100,4,'',0,10100,4,'',0,10600,4,'',0,10500,4,'',0,10000,4,'',0,10500,4,'',0,10700,4,'',0,9300,4,'',0,15500,4,'',0,10400,4,'',0,10000,4,'',0,10300,4,'',0,10000,4,'',0
 '2919',400,72000,4,'',0,20400,4,'',0,12600,4,'',0,17100,4,'',0,13000,4,'',0,17000,4,'',0,13000,4,'',0,15900,4,'',0,13500,4,'',0
-'2964',400,63800,4,'',0,9200,4,'',0,9800,4,'',0,10100,4,'',0,10100,4,'',0,10600,4,'',0,10500,4,'',0,10000,4,'',0,10500,4,'',0,10700,4,'',0,9300,4,'',0,15500,4,'',0,10400,4,'',0,10000,4,'',0,10300,4,'',0,10000,4,'',0
 '1798',500,62100,4,'',0,9300,4,'',0,3500,4,'',0,7200,4,'',0,3100,4,'',0,6900,4,'',0,3500,4,'',0,7300,4,'',0,3000,4,'',0,7200,4,'',0,7500,4,'',0,3300,4,'',0,7100,4,'',0,3500,4,'',0,7700,4,'',0,3600,4,'',0,7600,4,'',0,7500,4,'',0,3800,4,'',0,7500,4,'',0,3300,4,'',0,7100,4,'',0,2900,4,'',0,7300,4,'',0,7400,4,'',0,2700,4,'',0,8500,4,'',0,4300,4,'',0,9900,4,'',0
+'1803',500,71500,4,'',0,10100,4,'',0,10100,4,'',0,3100,4,'',0,7000,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7300,4,'',0,3400,4,'',0,7100,4,'',0,3000,4,'',0,7600,4,'',0,7500,4,'',0,2900,4,'',0,7000,4,'',0,3300,4,'',0,7200,4,'',0,2800,4,'',0,6900,4,'',0,3200,4,'',0,6900,4,'',0,2900,4,'',0,6900,4,'',0,2900,4,'',0,6800,4,'',0,9700,4,'',0
 '2919',500,65100,4,'',0,14900,4,'',0,5800,4,'',0,9800,4,'',0,10100,4,'',0,10100,4,'',0,9100,4,'',0,9100,4,'',0,10000,4,'',0,8800,4,'',0,9200,4,'',0,9000,4,'',0,9000,4,'',0,5600,4,'',0,10000,4,'',0
-'2964',500,71500,4,'',0,10100,4,'',0,10100,4,'',0,3100,4,'',0,7000,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7300,4,'',0,3400,4,'',0,7100,4,'',0,3000,4,'',0,7600,4,'',0,7500,4,'',0,2900,4,'',0,7000,4,'',0,3300,4,'',0,7200,4,'',0,2800,4,'',0,6900,4,'',0,3200,4,'',0,6900,4,'',0,2900,4,'',0,6900,4,'',0,2900,4,'',0,6800,4,'',0,9700,4,'',0
+'1803',701,74100,4,'',0,18700,4,'',0,21600,4,'',0,21000,4,'',0,25000,4,'',0,20800,4,'',0,20500,4,'',0,10000,4,'',0,12800,4,'',0
 '2919',701,64000,4,'',0,20200,4,'',0,19200,4,'',0,20000,4,'',0,20000,4,'',0,20000,4,'',0,19800,4,'',0,12500,4,'',0
-'2964',701,74100,4,'',0,18700,4,'',0,21600,4,'',0,21000,4,'',0,25000,4,'',0,20800,4,'',0,20500,4,'',0,10000,4,'',0,12800,4,'',0
+'1803',901,71900,4,'',0,9300,4,'',0,9800,4,'',0,10300,4,'',0,10500,4,'',0,10300,4,'',0,10500,4,'',0,10000,4,'',0,10500,4,'',0,10700,4,'',0,10300,4,'',0,10500,4,'',0,10300,4,'',0,9900,4,'',0,10200,4,'',0,9900,4,'',0
 '2919',901,70900,4,'',0,13100,4,'',0,17200,4,'',0,12300,4,'',0,17100,4,'',0,13000,4,'',0,17000,4,'',0,13000,4,'',0,11900,4,'',0,17300,4,'',0
-'2964',901,71900,4,'',0,9300,4,'',0,9800,4,'',0,10300,4,'',0,10500,4,'',0,10300,4,'',0,10500,4,'',0,10000,4,'',0,10500,4,'',0,10700,4,'',0,10300,4,'',0,10500,4,'',0,10300,4,'',0,9900,4,'',0,10200,4,'',0,9900,4,'',0
 '1798',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,17600,4,'',0,3200,4,'',0,8000,4,'',0,3100,4,'',0
 '1798',2101,60000,,'',0,3600,,'',0,18200,,'',0,12600,,'',0,11100,,'',0,15700,,'',0,12900,,'',0,7100,,'',0,4500,,'',0,8600,,'',0,10200,,'',0,15900,,'',0,11300,,'',0
+'1803',2101,73600,,'',0,20000,,'',0,11600,,'',0,18700,,'',0,16400,,'',0,11400,,'',0,9700,,'',0,10000,,'',0,12600,,'',0
 '2919',2101,85800,,'',0,17000,,'',0,12500,,'',0,16900,,'',0,13000,,'',0,16900,,'',0,13300,,'',0
-'2964',2101,73600,,'',0,20000,,'',0,11600,,'',0,18700,,'',0,16400,,'',0,11400,,'',0,9700,,'',0,10000,,'',0,12600,,'',0
+'1803',1000701,64200,4,'',0,19800,4,'',0,20200,4,'',0,20800,4,'',0,25200,4,'',0,20800,4,'',0,20400,4,'',0
 '2919',1000701,74300,4,'',0,19700,4,'',0,19700,4,'',0,20000,4,'',0,19900,4,'',0,19900,4,'',0
-'2964',1000701,64200,4,'',0,19800,4,'',0,20200,4,'',0,20800,4,'',0,25200,4,'',0,20800,4,'',0,20400,4,'',0
 '1798',1002101,71800,,'',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 be555694..b4720f1b 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,9 +1,9 @@
 '1798',201,52900,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,6300,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'1803',201,62000,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2919',201,63400,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2964',201,62000,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '1798',301,55900,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,7300,,'',0,3600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,10000,,'',0
+'1803',301,65300,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
 '2919',301,62900,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,5200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2964',301,65300,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
 '1798',601,55500,,'',0,8500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8000,,'',0,12000,,'',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
+'1803',601,60400,,'',0,12000,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
 '2919',601,60000,,'',0,13000,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2964',601,60400,,'',0,12000,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
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 a4e0e447..1c9d3299 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,7 +1,7 @@
 '1798',1701,62600,,'',0,3200,,'',0,8700,,'',0,76400,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
 '1798',3100,72700,,'',0,3100,,'',0,7000,,'',0,10400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10700,,'',0,9200,,'',0,4200,,'',0,1500,,'',0,7200,,'',0,7100,,'',0,1300,,'',0,3700,,'',0
-'2964',3100,91800,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
+'1803',3100,91800,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
 '1798',1003100,64100,,'',0,6900,,'',0,3000,,'',0,7300,,'',0,4500,,'',0,14500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,10700,,'',0,7700,,'',0,9300,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,11000,,'',0
+'1803',1003100,84500,,'',0,10200,,'',0,10700,,'',0,14900,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,11200,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
 '2919',1003100,101200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
-'2964',1003100,84500,,'',0,10200,,'',0,10700,,'',0,14900,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,11200,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
 '1798',24003100,55800,,'',0,7100,,'',0,3000,,'',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 f14666ea..b0335fc3 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 @@
 '1798',2100,63400,,'',0,7600,,'',0,9200,,'',0,5700,,'',0,16100,,'',0,11200,,'',0,12000,,'',0,17200,,'',0,20400,,'',0,9700,,'',0,11700,,'',0,11200,,'',0
 '1798',2101,62400,,'',0,7600,,'',0,14400,,'',0,16500,,'',0,11200,,'',0,11800,,'',0,17100,,'',0,3300,,'',0,8600,,'',0,8500,,'',0,9900,,'',0,11800,,'',0,11100,,'',0
+'1803',2100,81000,,'',0,20100,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,9900,,'',0,9500,,'',0,17100,,'',0
+'1803',2101,75900,,'',0,20000,,'',0,15800,,'',0,18800,,'',0,12500,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,16600,,'',0
 '2919',2100,93200,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,12800,,'',0,17200,,'',0
 '2919',2101,92100,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12900,,'',0,17200,,'',0
-'2964',2100,81000,,'',0,20100,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,9900,,'',0,9500,,'',0,17100,,'',0
-'2964',2101,75900,,'',0,20000,,'',0,15800,,'',0,18800,,'',0,12500,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,16600,,'',0
 '1798',1002100,145700,,'',0,9100,,'',0
 '1798',1002101,75100,,'',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 d881df0c..8bbb913a 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 @@
 '1798',2101,62600,,'',0,7600,,'',0,14400,,'',0,16500,,'',0,11200,,'',0,11800,,'',0,17200,,'',0,3300,,'',0,8600,,'',0,8500,,'',0,9800,,'',0,11800,,'',0,11100,,'',0
+'1803',2101,80100,,'',0,20000,,'',0,11900,,'',0,18800,,'',0,12500,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,16500,,'',0
 '2919',2101,92300,,'',0,13000,,'',0,16800,,'',0,13000,,'',0,17000,,'',0,12800,,'',0,17200,,'',0
-'2964',2101,80100,,'',0,20000,,'',0,11900,,'',0,18800,,'',0,12500,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,16500,,'',0
 '1798',1002101,75300,,'',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 c00077fe..524f18af 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 @@
 '1798',2101,62700,,'',0,7600,,'',0,14500,,'',0,16500,,'',0,11200,,'',0,11800,,'',0,17100,,'',0,3300,,'',0,8600,,'',0,8500,,'',0,9900,,'',0,11800,,'',0,11000,,'',0
+'1803',2101,80300,,'',0,20000,,'',0,11800,,'',0,18800,,'',0,12500,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,16600,,'',0
 '2919',2101,92500,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12900,,'',0,17200,,'',0
-'2964',2101,80300,,'',0,20000,,'',0,11800,,'',0,18800,,'',0,12500,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,16600,,'',0
 '1798',1002101,75500,,'',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 d8f4b91d..00bdeb29 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 @@
 '1798',2100,63200,,'',0,7600,,'',0,9200,,'',0,5700,,'',0,16100,,'',0,11200,,'',0,12000,,'',0,17200,,'',0,20400,,'',0,9700,,'',0,11700,,'',0,11200,,'',0
 '1798',2101,62900,4,'',0,7600,4,'',0,14500,4,'',0,16500,4,'',0,11200,4,'',0,11800,4,'',0,17200,4,'',0,3300,4,'',0,8600,4,'',0,8500,4,'',0,9800,4,'',0,11800,4,'',0,11000,4,'',0
+'1803',2100,80800,,'',0,20000,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,10000,,'',0,9500,,'',0,17100,,'',0
+'1803',2101,80500,4,'',0,20000,4,'',0,11900,4,'',0,18800,4,'',0,12500,4,'',0,11400,4,'',0,9600,4,'',0,9900,4,'',0,16500,4,'',0
 '2919',2100,93000,,'',0,17000,,'',0,12800,,'',0,13000,,'',0,17000,,'',0,12800,,'',0,17200,,'',0
 '2919',2101,92700,4,'',0,13000,4,'',0,16800,4,'',0,13000,4,'',0,17000,4,'',0,12800,4,'',0,17200,4,'',0
-'2964',2100,80800,,'',0,20000,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,10000,,'',0,9500,,'',0,17100,,'',0
-'2964',2101,80500,4,'',0,20000,4,'',0,11900,4,'',0,18800,4,'',0,12500,4,'',0,11400,4,'',0,9600,4,'',0,9900,4,'',0,16500,4,'',0
 '1798',1002100,145500,,'',0,9100,,'',0
 '1798',1002101,75700,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 7ac8384b..e6792458 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 @@
 '1798',2100,63300,,'',0,7600,,'',0,9200,,'',0,5700,,'',0,16100,,'',0,11200,,'',0,12000,,'',0,17200,,'',0,20400,,'',0,9700,,'',0,11700,,'',0,11200,,'',0
+'1803',2100,80900,,'',0,20000,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,10000,,'',0,9500,,'',0,17100,,'',0
 '2919',2100,93100,,'',0,17000,,'',0,12800,,'',0,13000,,'',0,17000,,'',0,12800,,'',0,17200,,'',0
-'2964',2100,80900,,'',0,20000,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,10000,,'',0,9500,,'',0,17100,,'',0
 '1798',1002100,145600,,'',0,9100,,'',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 2fe7baf5..367b9858 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,22 +1,22 @@
 '1798',3100,95500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0
 '1798',3101,171100,,'',0,3000,,'',0,7200,,'',0
-'2964',3100,94000,,'',0,10500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0
+'1803',3100,94000,,'',0,10500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0
 '1798',3200,95700,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,11400,,'',0,48500,,'',0
 '1798',3201,171100,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,16000,,'',0
+'1803',3200,81100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3400,,'',0
 '2919',3200,91000,,'',0,9600,,'',0,10200,,'',0,10700,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10300,,'',0,10000,,'',0
-'2964',3200,81100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3400,,'',0
 '1798',3300,61700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3100,,'',0,6600,,'',0,51300,,'',0,7700,,'',0,4000,,'',0,7800,,'',0,3100,,'',0,8200,,'',0,7200,,'',0,3700,,'',0,7800,,'',0,10600,,'',0,9900,,'',0
 '1798',3301,170900,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,4000,,'',0
+'1803',3300,195700,,'',0,14500,,'',0
 '2919',3300,190700,,'',0
-'2964',3300,195700,,'',0,14500,,'',0
 '1798',3400,61800,,'',0,3000,,'',0,7000,,'',0,79400,,'',0,59100,,'',0
 '1798',3401,170900,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,4000,,'',0
 '1798',3500,74300,,'',0,6500,,'',0,3600,,'',0,35900,,'',0,33200,,'',0,26800,,'',0
+'1803',3500,84200,,'',0,67200,,'',0,22000,,'',0
 '2919',3500,95100,,'',0,30300,,'',0,59700,,'',0
-'2964',3500,84200,,'',0,67200,,'',0,22000,,'',0
 '1798',3900,84600,,'',0,8900,,'',0,1100,,'',0,9000,,'',0,1000,,'',0,9000,,'',0,8000,,'',0,9000,,'',0,1000,,'',0,9000,,'',0,1000,,'',0,9000,,'',0,3500,,'',0,9000,,'',0,1000,,'',0,9000,,'',0,7500,,'',0,4900,,'',0
+'1803',3900,84600,,'',0,8800,,'',0,1200,,'',0,8800,,'',0,1200,,'',0,8900,,'',0,1100,,'',0,9000,,'',0,1000,,'',0,9000,,'',0,1000,,'',0,9100,,'',0,7900,,'',0,9000,,'',0,1000,,'',0,8900,,'',0,3100,,'',0,8700,,'',0
 '2919',3900,84100,,'',0,8700,,'',0,9800,,'',0,8800,,'',0,3200,,'',0,8800,,'',0,9700,,'',0,8800,,'',0,3200,,'',0,8800,,'',0,8200,,'',0,8700,,'',0,3800,,'',0,8600,,'',0
-'2964',3900,84600,,'',0,8800,,'',0,1200,,'',0,8800,,'',0,1200,,'',0,8900,,'',0,1100,,'',0,9000,,'',0,1000,,'',0,9000,,'',0,1000,,'',0,9100,,'',0,7900,,'',0,9000,,'',0,1000,,'',0,8900,,'',0,3100,,'',0,8700,,'',0
 '1798',1003100,103000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0
 '1798',1003101,185800,,'',0,8500,,'',0
-'2964',1003100,91000,,'',0,10200,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11000,,'',0
+'1803',1003100,91000,,'',0,10200,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11000,,'',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 92defd59..07b98748 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,11 +1,11 @@
 '1798',3101,62600,,'',0,8500,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,8700,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11300,,'',0,3400,,'',0,5200,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7200,,'',0,1700,,'',0,38500,,'',0
-'2964',3101,81600,,'',0,10000,,'',0,10200,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0
+'1803',3101,81600,,'',0,10000,,'',0,10200,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0
 '1798',3201,55600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3700,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6800,,'',0,9200,,'',0,10800,,'',0
+'1803',3201,74600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2919',3201,84500,,'',0,9600,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2964',3201,74600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '1798',3900,84600,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
+'1803',3900,84600,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,11900,,'',0
 '2919',3900,84100,,'',0,18500,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,17000,,'',0,12500,,'',0
-'2964',3900,84600,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,11900,,'',0
 '1798',1003101,65600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,14200,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,9200,,'',0,8700,,'',0,3100,,'',0,7300,,'',0,3000,,'',0,10400,,'',0,8500,,'',0,16300,,'',0
+'1803',1003101,84600,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,10500,,'',0,10500,,'',0
 '2919',1003101,104300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2964',1003101,84600,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,10500,,'',0,10500,,'',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 5b109891..914d656a 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,10 +1,10 @@
 '1798',3100,74400,,'',0,7100,,'',0,3000,,'',0,10400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,9200,,'',0,8200,,'',0,1500,,'',0,3200,,'',0,7100,,'',0,1300,,'',0,7500,,'',0
 '1798',3101,63200,,'',0,8500,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,8600,,'',0,10500,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,11400,,'',0,7400,,'',0,1200,,'',0,3100,,'',0,7500,,'',0,2900,,'',0,7100,,'',0,1800,,'',0,38400,,'',0
-'2964',3100,93400,,'',0,10400,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11100,,'',0
-'2964',3101,82200,,'',0,10000,,'',0,10300,,'',0,10800,,'',0,11100,,'',0,11000,,'',0,15000,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
+'1803',3100,93400,,'',0,10400,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11100,,'',0
+'1803',3101,82200,,'',0,10000,,'',0,10300,,'',0,10800,,'',0,11100,,'',0,11000,,'',0,15000,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
 '1798',1003100,70100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,8500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,14900,,'',0,3700,,'',0,9400,,'',0,7000,,'',0,4700,,'',0,9900,,'',0,7600,,'',0,11400,,'',0,11500,,'',0,14900,,'',0
 '1798',1003101,70200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7400,,'',0,10100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,9300,,'',0,8700,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,10400,,'',0,4500,,'',0,16300,,'',0
+'1803',1003100,90400,,'',0,10200,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,11100,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
+'1803',1003101,85200,,'',0,10100,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,14900,,'',0,10500,,'',0,10500,,'',0
 '2919',1003100,103200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0
 '2919',1003101,105000,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2964',1003100,90400,,'',0,10200,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,11100,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
-'2964',1003101,85200,,'',0,10100,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,14900,,'',0,10500,,'',0,10500,,'',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 e17cb0b0..780d6c93 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,12 +1,12 @@
 '1798',3100,74700,,'',0,7100,,'',0,3000,,'',0,10400,,'',0,14900,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,9300,,'',0,8200,,'',0,1500,,'',0,3200,,'',0,7000,,'',0,1300,,'',0,7500,,'',0
-'2964',3100,93700,,'',0,10400,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0
+'1803',3100,93700,,'',0,10400,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0
 '1798',3200,61600,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,3400,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,7900,,'',0,2700,,'',0,9200,,'',0,10700,,'',0
+'1803',3200,80700,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,13000,,'',0
 '2919',3200,90600,,'',0,9600,,'',0,10200,,'',0,10700,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10300,,'',0,10000,,'',0
-'2964',3200,80700,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,13000,,'',0
 '1798',3300,61400,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3100,,'',0,6600,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7700,,'',0,7700,,'',0,4000,,'',0,7800,,'',0,3100,,'',0,8200,,'',0,7200,,'',0,3700,,'',0,7900,,'',0,7900,,'',0,2700,,'',0,2900,,'',0,7000,,'',0
+'1803',3300,83900,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,10400,,'',0,10500,,'',0
 '2919',3300,93400,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,9900,,'',0
-'2964',3300,83900,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,10400,,'',0,10500,,'',0
 '1798',1003100,70400,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,8500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,3700,,'',0,9400,,'',0,7000,,'',0,4600,,'',0,9900,,'',0,7600,,'',0,11400,,'',0,11500,,'',0,14900,,'',0
+'1803',1003100,90700,,'',0,10200,,'',0,10700,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,10600,,'',0,14400,,'',0,10000,,'',0
 '2919',1003100,103500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0
-'2964',1003100,90700,,'',0,10200,,'',0,10700,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,10600,,'',0,14400,,'',0,10000,,'',0
 '1798',24003100,61600,,'',0,3100,,'',0,7100,,'',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 86dbe3d6..7d9d7dc0 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,24 +1,24 @@
 '1798',3100,74900,,'',0,7100,,'',0,3000,,'',0,10400,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,9300,,'',0,8200,,'',0,1500,,'',0,3200,,'',0,7000,,'',0,1300,,'',0,7500,,'',0
 '1798',3101,171000,,'',0,3000,,'',0,7200,,'',0
-'2964',3100,93900,,'',0,10500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0
+'1803',3100,93900,,'',0,10500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0
 '1798',3200,61800,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,3400,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,7800,,'',0,7900,,'',0,2700,,'',0,9200,,'',0,10700,,'',0
 '1798',3201,171000,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,16000,,'',0
+'1803',3200,81000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,13000,,'',0
 '2919',3200,90900,,'',0,9600,,'',0,10200,,'',0,10700,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10300,,'',0,10000,,'',0
-'2964',3200,81000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,13000,,'',0
 '1798',3300,61600,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3100,,'',0,6600,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7800,,'',0,7700,,'',0,4000,,'',0,7800,,'',0,3100,,'',0,8200,,'',0,7200,,'',0,3700,,'',0,7800,,'',0,7900,,'',0,2700,,'',0,6900,,'',0,3000,,'',0
 '1798',3301,171000,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,4000,,'',0
+'1803',3300,84100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,10300,,'',0,14500,,'',0
 '2919',3300,93600,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,9900,,'',0
-'2964',3300,84100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,10300,,'',0,14500,,'',0
 '1798',3400,61700,,'',0,3000,,'',0,7000,,'',0,30600,,'',0,48800,,'',0,59100,,'',0,5700,,'',0
 '1798',3401,171000,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,4000,,'',0
 '1798',3501,72700,,'',0,2500,,'',0,7500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
+'1803',3501,82500,,'',0,63100,,'',0,26000,,'',0
 '2919',3501,93300,,'',0,30300,,'',0,59800,,'',0
-'2964',3501,82500,,'',0,63100,,'',0,26000,,'',0
 '1798',3900,84800,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
+'1803',3900,84800,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,11900,,'',0
 '2919',3900,84300,,'',0,18500,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,17000,,'',0,12500,,'',0
-'2964',3900,84800,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,11900,,'',0
 '1798',1003100,70600,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,8500,,'',0,10600,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,3700,,'',0,9400,,'',0,7000,,'',0,4600,,'',0,9900,,'',0,7600,,'',0,11400,,'',0,11400,,'',0,14900,,'',0
 '1798',1003101,185700,,'',0,8500,,'',0
+'1803',1003100,90900,,'',0,10200,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,14500,,'',0,10400,,'',0,10000,,'',0
 '2919',1003100,103700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0
-'2964',1003100,90900,,'',0,10200,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,14500,,'',0,10400,,'',0,10000,,'',0
 '1798',24003100,61700,,'',0,3100,,'',0,7100,,'',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 27bad864..09a440d3 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,3 +1,3 @@
 '1798',3201,55900,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,7700,,'',0,3500,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
+'1803',3201,75000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2919',3201,84900,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2964',3201,75000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
diff --git a/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 22ebf9b3..e6392b20 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,6 +1,6 @@
 '1798',3201,60000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,7700,,'',0,3500,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
+'1803',3201,75100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2919',3201,85000,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2964',3201,75100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '1798',3900,91400,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'1803',3900,91300,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
 '2919',3900,90800,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
-'2964',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-current/raw/current_gtfs_schedule_stop_107761 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107761
index cb5c4ffc..69f0e5c6 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,6 +1,6 @@
 '1798',3201,60100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,7700,,'',0,3500,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
+'1803',3201,75200,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2919',3201,85100,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2964',3201,75200,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '1798',3900,91500,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'1803',3900,91400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
 '2919',3900,90900,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
-'2964',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-current/raw/current_gtfs_schedule_stop_107762 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107762
index 6c791505..a432f2c3 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,6 +1,6 @@
 '1798',3201,60100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
+'1803',3201,75200,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2919',3201,85100,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2964',3201,75200,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '1798',3900,91500,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'1803',3900,91400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
 '2919',3900,90900,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
-'2964',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-current/raw/current_gtfs_schedule_stop_107763 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107763
index c6af3497..009694d5 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,6 +1,6 @@
 '1798',3201,60200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,7700,,'',0,3500,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
+'1803',3201,75300,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2919',3201,85200,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2964',3201,75300,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '1798',3900,91600,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'1803',3900,91500,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
 '2919',3900,91000,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
-'2964',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-current/raw/current_gtfs_schedule_stop_107764 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107764
index 290a1b79..3aa30269 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,6 +1,6 @@
 '1798',3201,60200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
+'1803',3201,75300,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2919',3201,85200,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2964',3201,75300,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '1798',3900,91700,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'1803',3900,91600,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
 '2919',3900,91100,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
-'2964',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-current/raw/current_gtfs_schedule_stop_107765 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107765
index 55d4a000..f56b3152 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,6 +1,6 @@
 '1798',3201,60300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
+'1803',3201,75400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2919',3201,85300,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2964',3201,75400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '1798',3900,91800,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'1803',3900,91700,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
 '2919',3900,91200,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
-'2964',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-current/raw/current_gtfs_schedule_stop_107766 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107766
index 6e5374c6..4930b28d 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,6 +1,6 @@
 '1798',3201,60400,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,7700,,'',0,3500,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
+'1803',3201,75500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2919',3201,85400,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2964',3201,75500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '1798',3900,91800,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'1803',3900,91700,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
 '2919',3900,91200,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
-'2964',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-current/raw/current_gtfs_schedule_stop_107767 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107767
index 10d5cc62..41d5e63d 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,3 +1,3 @@
 '1798',3201,60400,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
+'1803',3201,75500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2919',3201,85400,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2964',3201,75500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
diff --git a/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 10d5cc62..41d5e63d 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,3 +1,3 @@
 '1798',3201,60400,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
+'1803',3201,75500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2919',3201,85400,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2964',3201,75500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
diff --git a/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 0c6a66d4..ae52ff01 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,3 +1,3 @@
 '1798',3201,60500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
+'1803',3201,75600,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2919',3201,85500,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2964',3201,75600,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
diff --git a/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 376425b0..f3d6c523 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,3 +1,3 @@
 '1798',3201,60600,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
+'1803',3201,75700,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2919',3201,85600,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2964',3201,75700,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
diff --git a/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 bea137a2..0da45ea2 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,3 +1,3 @@
 '1798',3201,60700,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
+'1803',3201,75800,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2919',3201,85700,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2964',3201,75800,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
diff --git a/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 bea137a2..0da45ea2 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,3 +1,3 @@
 '1798',3201,60700,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
+'1803',3201,75800,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2919',3201,85700,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2964',3201,75800,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
diff --git a/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 eda654fe..78262beb 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,6 +1,6 @@
 '1798',3200,60800,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
 '1798',3201,60800,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7000,4,'',0,3500,4,'',0,7000,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3600,4,'',0,7500,4,'',0,3500,4,'',0,7900,4,'',0,7700,4,'',0,3400,4,'',0,8000,4,'',0,7400,4,'',0,3700,4,'',0,7900,4,'',0,4000,4,'',0,6700,4,'',0,9200,4,'',0,10800,4,'',0
+'1803',3200,75900,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
+'1803',3201,75900,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,7000,4,'',0,3200,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7400,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,3500,4,'',0,7000,4,'',0,3500,4,'',0,17000,4,'',0
 '2919',3200,85800,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
 '2919',3201,85800,4,'',0,9600,4,'',0,10200,4,'',0,14600,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10400,4,'',0,10000,4,'',0
-'2964',3200,75900,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
-'2964',3201,75900,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,7000,4,'',0,3200,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7400,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,3500,4,'',0,7000,4,'',0,3500,4,'',0,17000,4,'',0
diff --git a/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 c13e2c9e..911cc3c8 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,3 +1,3 @@
 '1798',3200,60900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
+'1803',3200,80000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2919',3200,85900,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2964',3200,80000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
diff --git a/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 e00041c1..e82e6449 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,3 +1,3 @@
 '1798',3200,61000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
+'1803',3200,80100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2919',3200,90000,,'',0,5600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2964',3200,80100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
diff --git a/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 5fae7333..c5479bee 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,3 +1,3 @@
 '1798',3200,61000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
+'1803',3200,80100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2919',3200,90000,,'',0,5600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2964',3200,80100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
diff --git a/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 63b2c3a5..4c734f64 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,3 +1,3 @@
 '1798',3200,61100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,3900,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
+'1803',3200,80200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2919',3200,90100,,'',0,5600,,'',0,10200,,'',0,14700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10300,,'',0,10000,,'',0
-'2964',3200,80200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
diff --git a/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 4c5b555a..8002c224 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,3 +1,3 @@
 '1798',3200,61200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,3400,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,8000,,'',0,2700,,'',0,9200,,'',0,10700,,'',0
+'1803',3200,80300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2919',3200,90200,,'',0,5600,,'',0,14200,,'',0,10600,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2964',3200,80300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
diff --git a/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 70d9dd8e..fe099597 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,3 +1,3 @@
 '1798',3200,61200,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,7900,,'',0,2700,,'',0,9200,,'',0,10800,,'',0
+'1803',3200,80300,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2919',3200,90200,,'',0,5600,,'',0,14200,,'',0,10700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10300,,'',0,10000,,'',0
-'2964',3200,80300,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
diff --git a/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 632fc048..b5948462 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 @@
 '1798',3900,91400,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'1803',3900,91300,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
 '2919',3900,90800,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
-'2964',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-current/raw/current_gtfs_schedule_stop_107783 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107783
index 870c0c51..e75863ef 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 @@
 '1798',3900,90200,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
+'1803',3900,90100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11900,,'',0
 '2919',3900,85600,,'',0,18600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16500,,'',0
-'2964',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-current/raw/current_gtfs_schedule_stop_107786 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107786
index 2ef10555..7ec285e2 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 @@
 '1798',3301,55600,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3400,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0
+'1803',3301,82100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,10500,,'',0,10500,,'',0
 '2919',3301,91600,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
-'2964',3301,82100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,10500,,'',0,10500,,'',0
diff --git a/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 0e580f35..5fbd4e3f 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 @@
 '1798',3301,55700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3400,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0
+'1803',3301,82100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,10500,,'',0,10500,,'',0
 '2919',3301,91600,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
-'2964',3301,82100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,10500,,'',0,10500,,'',0
 '1798',3400,61400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3300,,'',0,7700,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,7900,,'',0,5700,,'',0,9700,,'',0
+'1803',3400,80300,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
 '2919',3400,83600,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
-'2964',3400,80300,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/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 816eb18b..cb3aa089 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 @@
 '1798',3301,55800,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3400,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
+'1803',3301,82300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
 '2919',3301,91800,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
-'2964',3301,82300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
 '1798',3900,92700,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'1803',3900,92600,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
 '2919',3900,92000,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
-'2964',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-current/raw/current_gtfs_schedule_stop_107789 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107789
index 816eb18b..cb3aa089 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 @@
 '1798',3301,55800,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3400,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
+'1803',3301,82300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
 '2919',3301,91800,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
-'2964',3301,82300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
 '1798',3900,92700,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'1803',3900,92600,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
 '2919',3900,92000,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
-'2964',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-current/raw/current_gtfs_schedule_stop_107790 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107790
index 52bcea9a..250eeeef 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 @@
 '1798',3301,55900,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3600,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
+'1803',3301,82400,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
 '2919',3301,91900,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
-'2964',3301,82400,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
diff --git a/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 ea17013d..78e3ea98 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 @@
 '1798',3301,60000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,3400,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
+'1803',3301,82500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
 '2919',3301,92000,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
-'2964',3301,82500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
diff --git a/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 a1c9d4a4..c8d77e46 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 @@
 '1798',3301,60000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3600,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
+'1803',3301,82500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
 '2919',3301,92000,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
-'2964',3301,82500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
diff --git a/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 5c5c1366..3e9c345f 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 @@
 '1798',3301,60100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3600,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
+'1803',3301,82600,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
 '2919',3301,92100,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
-'2964',3301,82600,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
diff --git a/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 b8dc3968..20cfa66b 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 @@
 '1798',3301,60200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3600,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
+'1803',3301,82700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
 '2919',3301,92200,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
-'2964',3301,82700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
 '1798',3401,60200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
+'1803',3401,75100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
 '2919',3401,82400,,'',0,13500,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2964',3401,75100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
diff --git a/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 2097fcb0..3d816761 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 @@
 '1798',3301,60200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,6800,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7600,,'',0,3500,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
+'1803',3301,82700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
 '2919',3301,92200,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0
-'2964',3301,82700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
diff --git a/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 90c706ed..7bf0b091 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 @@
 '1798',3301,60300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3600,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
+'1803',3301,82800,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
 '2919',3301,92300,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
-'2964',3301,82800,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
diff --git a/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 57508627..5ddd04a2 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 @@
 '1798',3301,60300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,6800,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7600,,'',0,3600,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
+'1803',3301,82800,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
 '2919',3301,92300,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0
-'2964',3301,82800,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
diff --git a/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 4989d20e..23b9ba06 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 @@
 '1798',3301,60400,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,6800,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7600,,'',0,3600,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
+'1803',3301,82900,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
 '2919',3301,92400,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0
-'2964',3301,82900,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
diff --git a/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 1663730b..c8eff4b5 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 @@
 '1798',3300,60600,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,6800,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7600,,'',0,3600,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
+'1803',3300,83100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
 '2919',3300,92600,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0
-'2964',3300,83100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
diff --git a/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 989ad147..ecf20a40 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 @@
 '1798',3300,60700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,6800,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7600,,'',0,3600,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,7300,,'',0,3700,,'',0,7900,,'',0,3900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
+'1803',3300,83200,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,10400,,'',0,10500,,'',0
 '2919',3300,92700,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,9900,,'',0
-'2964',3300,83200,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,10400,,'',0,10500,,'',0
diff --git a/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 c59d3c33..04e8d620 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 @@
 '1798',3300,60700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,6700,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7600,,'',0,3700,,'',0,8000,,'',0,7800,,'',0,3100,,'',0,8200,,'',0,7300,,'',0,3700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
+'1803',3300,83200,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
 '2919',3300,92700,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0
-'2964',3300,83200,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
diff --git a/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 3ef1158f..9d2e7765 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 @@
 '1798',3300,60800,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,6700,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7700,,'',0,3600,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,7200,,'',0,3700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
+'1803',3300,83300,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
 '2919',3300,92800,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
-'2964',3300,83300,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
diff --git a/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 47689ded..a89899ac 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 @@
 '1798',3300,60900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,6700,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7600,,'',0,3700,,'',0,8000,,'',0,7800,,'',0,3100,,'',0,8200,,'',0,7300,,'',0,3700,,'',0,7900,,'',0,3900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
+'1803',3300,83400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,10400,,'',0,10500,,'',0
 '2919',3300,92900,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14600,,'',0,10000,,'',0,5900,,'',0
-'2964',3300,83400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,10400,,'',0,10500,,'',0
diff --git a/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 d68e54a8..dcd5dbbd 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 @@
 '1798',3300,60900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,6700,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7700,,'',0,3600,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,7200,,'',0,3700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
+'1803',3300,83400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
 '2919',3300,92900,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0
-'2964',3300,83400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
diff --git a/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 8b152d36..6de88b10 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 @@
 '1798',3300,61000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,6700,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7700,,'',0,3600,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,7200,,'',0,3700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
+'1803',3300,83500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
 '2919',3300,93000,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0
-'2964',3300,83500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
diff --git a/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 5ac9e3b4..517ebdff 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 @@
 '1798',3300,61100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3100,,'',0,6600,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7700,,'',0,7700,,'',0,4000,,'',0,7800,,'',0,3100,,'',0,8200,,'',0,7200,,'',0,3700,,'',0,7900,,'',0,3900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
+'1803',3300,83600,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,10400,,'',0,10500,,'',0
 '2919',3300,93100,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,9900,,'',0
-'2964',3300,83600,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,10400,,'',0,10500,,'',0
diff --git a/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 69df07bb..4ef384db 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 @@
 '1798',3900,93000,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,12400,,'',0
+'1803',3900,92900,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,11800,,'',0
 '2919',3900,92300,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
-'2964',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-current/raw/current_gtfs_schedule_stop_107818 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107818
index fc5808cc..9931ccea 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107818
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107818
@@ -1,3 +1,3 @@
 '1798',3900,93300,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,12400,,'',0
+'1803',3900,93200,,'',0,10000,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,16800,,'',0,9900,,'',0,11800,,'',0
 '2919',3900,92600,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
-'2964',3900,93200,,'',0,10000,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,16800,,'',0,9900,,'',0,11800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107819 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107819
index 646f37ec..f385cd5a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107819
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107819
@@ -1,8 +1,8 @@
 '1798',3301,55500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,4000,,'',0,7100,,'',0,8100,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0
+'1803',3301,81900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,10500,,'',0,10500,,'',0
 '2919',3301,91400,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
-'2964',3301,81900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,10500,,'',0,10500,,'',0
 '1798',3400,95300,4,'',0,10500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7700,4,'',0,11500,4,'',0
 '1798',3401,55500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,3900,,'',0,7800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,4000,,'',0,9700,,'',0,9700,,'',0
+'1803',3400,80600,4,'',0,3200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0
+'1803',3401,74500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
 '2919',3401,81800,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2964',3400,80600,4,'',0,3200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0
-'2964',3401,74500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
diff --git a/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 78d7f6b3..7f0ccd9a 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 @@
 '1798',3401,55600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,3900,,'',0,7800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,4000,,'',0,9700,,'',0,9700,,'',0
+'1803',3401,74600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
 '2919',3401,81900,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2964',3401,74600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
diff --git a/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 8ed48af2..fc034c8f 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 @@
 '1798',3401,55700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
+'1803',3401,74700,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
 '2919',3401,82000,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2964',3401,74700,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
diff --git a/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 82b6f2cb..d5642719 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 @@
 '1798',3401,55700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
+'1803',3401,74700,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
 '2919',3401,82000,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2964',3401,74700,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
diff --git a/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 847e3fde..87fd2cc5 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 @@
 '1798',3401,55800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9800,,'',0,9700,,'',0
+'1803',3401,74800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
 '2919',3401,82100,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2964',3401,74800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
diff --git a/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 19323a25..acc25d90 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 @@
 '1798',3401,55800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
+'1803',3401,74800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
 '2919',3401,82100,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2964',3401,74800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
diff --git a/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 d76207dc..af0e8bf6 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 @@
 '1798',3401,55900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
+'1803',3401,74900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
 '2919',3401,82200,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2964',3401,74900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
diff --git a/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 0f200ca7..a53d80ae 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 @@
 '1798',3401,60000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
+'1803',3401,75000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
 '2919',3401,82300,,'',0,13400,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2964',3401,75000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
diff --git a/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 079e7af6..923ef832 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 @@
 '1798',3401,60000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
+'1803',3401,75000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
 '2919',3401,82300,,'',0,13400,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2964',3401,75000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
diff --git a/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 cdbb4d07..47dcdf5c 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 @@
 '1798',3401,60100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
+'1803',3401,75000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
 '2919',3401,82300,,'',0,13500,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2964',3401,75000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
diff --git a/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 0f8edb82..21dc21ec 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 @@
 '1798',3401,60200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
+'1803',3401,75200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
 '2919',3401,82500,,'',0,13400,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2964',3401,75200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
diff --git a/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 c93d50de..50c06704 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 @@
 '1798',3401,60300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
+'1803',3401,75200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
 '2919',3401,82500,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
-'2964',3401,75200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
diff --git a/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 7b3f644f..588e2321 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 @@
 '1798',3401,60400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
+'1803',3401,75300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
 '2919',3401,82600,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
-'2964',3401,75300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/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 0bc387e7..c797cf99 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 @@
 '1798',3401,60500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,8000,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
+'1803',3401,75400,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
 '2919',3401,82700,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
-'2964',3401,75400,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
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 d964c073..263900ef 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 @@
 '1798',3400,60600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
+'1803',3400,75500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
 '2919',3400,82800,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
-'2964',3400,75500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/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 345e8675..e1dcbc33 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 @@
 '1798',3400,60700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
+'1803',3400,75600,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
 '2919',3400,82900,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
-'2964',3400,75600,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/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 e4d42ed9..430710ee 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 @@
 '1798',3400,60900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8100,,'',0,3300,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
+'1803',3400,75800,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
 '2919',3400,83100,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
-'2964',3400,75800,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/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 f440b93f..159cddfd 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 @@
 '1798',3400,60900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
+'1803',3400,75800,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
 '2919',3400,83100,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
-'2964',3400,75800,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/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 cdefce55..3f6271b8 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 @@
 '1798',3400,61000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8100,,'',0,3300,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
+'1803',3400,75900,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
 '2919',3400,83200,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
-'2964',3400,75900,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/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 4bafc324..dd2124a0 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 @@
 '1798',3400,61000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3300,,'',0,7700,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
+'1803',3400,75900,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
 '2919',3400,83200,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
-'2964',3400,75900,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/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 0d978021..ba36cc5b 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 @@
 '1798',3400,61100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3300,,'',0,7700,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
+'1803',3400,80000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
 '2919',3400,83300,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
-'2964',3400,80000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/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 dffa97fa..9545231d 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 @@
 '1798',3400,61200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3300,,'',0,7700,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,7900,,'',0,5700,,'',0,9700,,'',0
+'1803',3400,80100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
 '2919',3400,83400,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
-'2964',3400,80100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/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 8d0c5dc6..3bada6fd 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 @@
 '1798',3400,61200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3400,,'',0,7600,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,7900,,'',0,5700,,'',0,9700,,'',0
+'1803',3400,80100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
 '2919',3400,83400,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
-'2964',3400,80100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/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 a5e42209..e1aa0d75 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 @@
 '1798',3400,61300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3300,,'',0,7700,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,7900,,'',0,5700,,'',0,9700,,'',0
+'1803',3400,80200,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
 '2919',3400,83500,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
-'2964',3400,80200,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/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 a5e42209..e1aa0d75 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 @@
 '1798',3400,61300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3300,,'',0,7700,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,7900,,'',0,5700,,'',0,9700,,'',0
+'1803',3400,80200,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
 '2919',3400,83500,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
-'2964',3400,80200,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/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 4e1bb88a..0daf98f5 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 @@
 '1798',3400,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3300,,'',0,7700,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,7900,,'',0,9700,,'',0,5700,,'',0
+'1803',3400,80400,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
 '2919',3400,83700,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
-'2964',3400,80400,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/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 91aebdc9..a7c520f6 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 @@
 '1798',3900,92500,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'1803',3900,92400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
 '2919',3900,91800,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
-'2964',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-current/raw/current_gtfs_schedule_stop_107850 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107850
index 86495b2d..49b92540 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 @@
 '1798',3900,91900,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'1803',3900,91800,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
 '2919',3900,91300,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
-'2964',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-current/raw/current_gtfs_schedule_stop_107851 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107851
index bef69085..a746ac08 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 @@
 '1798',3900,92100,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'1803',3900,92000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
 '2919',3900,91400,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
-'2964',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-current/raw/current_gtfs_schedule_stop_107855 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107855
index ce82940c..2c3f217b 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 @@
 '1798',3500,73200,,'',0,2500,,'',0,7500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
 '1798',3501,73200,4,'',0,2500,4,'',0,7500,4,'',0,32000,4,'',0,37000,4,'',0,23000,4,'',0
+'1803',3500,83000,,'',0,67200,,'',0,22000,,'',0
+'1803',3501,83000,4,'',0,67200,4,'',0,22000,4,'',0
 '2919',3500,93900,,'',0,30300,,'',0,59700,,'',0
 '2919',3501,93900,4,'',0,30300,4,'',0,59700,4,'',0
-'2964',3500,83000,,'',0,67200,,'',0,22000,,'',0
-'2964',3501,83000,4,'',0,67200,4,'',0,22000,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 8e4cfb90..0552f765 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 @@
 '1798',3500,73600,,'',0,6500,,'',0,3500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
+'1803',3500,83400,,'',0,67200,,'',0,22000,,'',0
 '2919',3500,94300,,'',0,30300,,'',0,59700,,'',0
-'2964',3500,83400,,'',0,67200,,'',0,22000,,'',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 5254ce76..eca466bc 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 @@
 '1798',3500,73800,,'',0,6500,,'',0,3500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
+'1803',3500,83600,,'',0,67200,,'',0,22000,,'',0
 '2919',3500,94500,,'',0,30300,,'',0,59700,,'',0
-'2964',3500,83600,,'',0,67200,,'',0,22000,,'',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 b643c80c..9b8e77b6 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 @@
 '1798',3900,93200,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,12400,,'',0
+'1803',3900,93100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,11800,,'',0
 '2919',3900,92500,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
-'2964',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-current/raw/current_gtfs_schedule_stop_107870 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107870
index 67f63cc1..29743c11 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,6 +1,6 @@
 '1798',3200,61300,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,3400,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,7900,,'',0,2700,,'',0,9200,,'',0,10800,,'',0
+'1803',3200,80400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2919',3200,90300,,'',0,5600,,'',0,14200,,'',0,10700,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10300,,'',0,10000,,'',0
-'2964',3200,80400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '1798',3900,90900,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'1803',3900,90800,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11800,,'',0
 '2919',3900,90300,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
-'2964',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-current/raw/current_gtfs_schedule_stop_107871 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107871
index 87c486ec..e04c305c 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,6 +1,6 @@
 '1798',3200,61400,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,3400,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,8000,,'',0,2700,,'',0,9200,,'',0,10700,,'',0
+'1803',3200,80500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,13000,,'',0
 '2919',3200,90400,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2964',3200,80500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,13000,,'',0
 '1798',3900,90900,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'1803',3900,90800,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11800,,'',0
 '2919',3900,90300,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
-'2964',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-current/raw/current_gtfs_schedule_stop_107877 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107877
index 828316c3..774f9ee9 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 @@
 '1798',3900,93100,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,12400,,'',0
+'1803',3900,93000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,11800,,'',0
 '2919',3900,92400,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
-'2964',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-current/raw/current_gtfs_schedule_stop_107880 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107880
index cb5c4ffc..69f0e5c6 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,6 +1,6 @@
 '1798',3201,60100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,7700,,'',0,3500,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
+'1803',3201,75200,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2919',3201,85100,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2964',3201,75200,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '1798',3900,91500,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'1803',3900,91400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
 '2919',3900,90900,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
-'2964',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-current/raw/current_gtfs_schedule_stop_107883 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107883
index dc934f59..4958b192 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 @@
 '1798',3301,55700,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3400,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
+'1803',3301,82200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,10500,,'',0,10500,,'',0
 '2919',3301,91700,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
-'2964',3301,82200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,10500,,'',0,10500,,'',0
 '1798',3400,61500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8200,,'',0,3300,,'',0,7600,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,7900,,'',0,9800,,'',0,5700,,'',0
+'1803',3400,80300,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
 '2919',3400,83600,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
-'2964',3400,80300,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/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 3b8ebcdc..74563af0 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 @@
 '1798',3401,55700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,3900,,'',0,7800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9800,,'',0,9700,,'',0
+'1803',3401,74700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
 '2919',3401,82000,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2964',3401,74700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
diff --git a/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 07772b3f..efc27d0d 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,21 +1,21 @@
 '1798',100,54100,,'',0,8200,,'',0,3000,,'',0,7200,,'',0,2200,,'',0,6100,,'',0,800,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6300,,'',0,2000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2500,,'',0,2600,,'',0,6200,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6600,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,7000,,'',0,2900,,'',0
+'1803',100,62400,,'',0,3100,,'',0,7900,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3100,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,2600,,'',0
 '2919',100,62100,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,4700,,'',0,8600,,'',0,8900,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
-'2964',100,62400,,'',0,3100,,'',0,7900,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3100,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,2600,,'',0
 '1798',200,55600,,'',0,6300,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2200,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,6900,,'',0
+'1803',200,62100,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,2600,,'',0,7200,,'',0
 '2919',200,63900,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
-'2964',200,62100,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,2600,,'',0,7200,,'',0
 '1798',300,55300,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3800,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'1803',300,55700,,'',0,10000,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '2919',300,64000,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2964',300,55700,,'',0,10000,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'1803',401,60000,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',401,64200,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2964',401,60000,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '1798',501,60200,,'',0,2800,,'',0,2800,,'',0,6600,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,3400,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'1803',501,63600,,'',0,9600,,'',0,7000,,'',0,2700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9500,,'',0
 '2919',501,61900,,'',0,9600,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,4900,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2964',501,63600,,'',0,9600,,'',0,7000,,'',0,2700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9500,,'',0
+'1803',700,70000,,'',0,14500,,'',0,25500,,'',0,21000,,'',0,21000,,'',0,21000,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
 '2919',700,60000,,'',0,20000,,'',0,15000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,16500,,'',0
-'2964',700,70000,,'',0,14500,,'',0,25500,,'',0,21000,,'',0,21000,,'',0,21000,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
+'1803',900,64000,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,14500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '2919',900,63000,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2964',900,64000,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,14500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '1798',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
+'1803',1000700,60000,,'',0,15500,,'',0,20000,,'',0,24800,,'',0,21200,,'',0,21000,,'',0,20500,,'',0
 '2919',1000700,70000,,'',0,15500,,'',0,19500,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
-'2964',1000700,60000,,'',0,15500,,'',0,20000,,'',0,24800,,'',0,21200,,'',0,21000,,'',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 00a015c2..5f43be68 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 @@
 '1798',100,52400,,'',0,8000,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,2000,,'',0,800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2700,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
 '1798',101,60200,4,'',0,3000,4,'',0,7100,4,'',0,2100,4,'',0,2800,4,'',0,5900,4,'',0,1900,4,'',0,1900,4,'',0,5900,4,'',0,1900,4,'',0,1900,4,'',0,5800,4,'',0,2000,4,'',0,2200,4,'',0,6000,4,'',0,2500,4,'',0,2400,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2100,4,'',0,6000,4,'',0,2100,4,'',0,2100,4,'',0,6000,4,'',0,2000,4,'',0,1900,4,'',0,5900,4,'',0,1900,4,'',0,1900,4,'',0,6000,4,'',0,2000,4,'',0,2600,4,'',0,6900,4,'',0,3000,4,'',0,6600,4,'',0,3000,4,'',0,6800,4,'',0,2900,4,'',0,7000,4,'',0,3000,4,'',0
+'1803',100,60700,,'',0,3000,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6700,,'',0
+'1803',101,63500,4,'',0,7800,4,'',0,8700,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7200,4,'',0,3100,4,'',0,7300,4,'',0,3300,4,'',0,7400,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7300,4,'',0,7500,4,'',0,3400,4,'',0,7200,4,'',0,3300,4,'',0,7200,4,'',0,3000,4,'',0,7000,4,'',0,2900,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,2700,4,'',0,6700,4,'',0,4700,4,'',0
 '2919',100,60500,,'',0,3600,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9000,,'',0,9900,,'',0
 '2919',101,63900,4,'',0,8100,4,'',0,8100,4,'',0,4600,4,'',0,8500,4,'',0,8600,4,'',0,8700,4,'',0,5000,4,'',0,9100,4,'',0,9100,4,'',0,9000,4,'',0,9000,4,'',0,9000,4,'',0,5000,4,'',0,8800,4,'',0,9000,4,'',0,8400,4,'',0,8300,4,'',0
-'2964',100,60700,,'',0,3000,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6700,,'',0
-'2964',101,63500,4,'',0,7800,4,'',0,8700,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7200,4,'',0,3100,4,'',0,7300,4,'',0,3300,4,'',0,7400,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7300,4,'',0,7500,4,'',0,3400,4,'',0,7200,4,'',0,3300,4,'',0,7200,4,'',0,3000,4,'',0,7000,4,'',0,2900,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,2700,4,'',0,6700,4,'',0,4700,4,'',0
 '1798',200,53500,,'',0,2200,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2100,,'',0,5800,,'',0,2000,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7000,,'',0,1800,,'',0,1800,,'',0,1900,,'',0,5500,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
 '1798',201,55300,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,2100,4,'',0,5800,4,'',0,2000,4,'',0,1800,4,'',0,6200,4,'',0,1900,4,'',0,2000,4,'',0,6000,4,'',0,1800,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2700,4,'',0,7000,4,'',0,1800,4,'',0,1800,4,'',0,1900,4,'',0,5500,4,'',0,2000,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,3000,4,'',0,6800,4,'',0,3000,4,'',0,7000,4,'',0,2900,4,'',0,3000,4,'',0
+'1803',200,60000,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0
+'1803',201,64300,4,'',0,7500,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7300,4,'',0,3300,4,'',0,7300,4,'',0,7400,4,'',0,3500,4,'',0,7400,4,'',0,3500,4,'',0,7500,4,'',0,3300,4,'',0,7500,4,'',0,3100,4,'',0,7300,4,'',0,7400,4,'',0,3100,4,'',0,7100,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,7000,4,'',0,2600,4,'',0,7300,4,'',0,4700,4,'',0
 '2919',200,61700,,'',0,8300,,'',0,4200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4300,,'',0
 '2919',201,65800,4,'',0,8200,4,'',0,8500,4,'',0,8500,4,'',0,4600,4,'',0,8500,4,'',0,9200,4,'',0,9100,4,'',0,9100,4,'',0,9100,4,'',0,5100,4,'',0,9100,4,'',0,8900,4,'',0,9000,4,'',0,8700,4,'',0,8900,4,'',0,4300,4,'',0,8500,4,'',0
-'2964',200,60000,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0
-'2964',201,64300,4,'',0,7500,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7300,4,'',0,3300,4,'',0,7300,4,'',0,7400,4,'',0,3500,4,'',0,7400,4,'',0,3500,4,'',0,7500,4,'',0,3300,4,'',0,7500,4,'',0,3100,4,'',0,7300,4,'',0,7400,4,'',0,3100,4,'',0,7100,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,7000,4,'',0,2600,4,'',0,7300,4,'',0,4700,4,'',0
diff --git a/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 745aede0..ec14a8c6 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,2 +1,2 @@
 '1798',1501,62100,,'',0,8300,,'',0,11900,,'',0,68300,,'',0,20300,,'',0,5000,,'',0
-'2964',1501,90500,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'1803',1501,90500,,'',0,14500,,'',0,47000,,'',0,18500,,'',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 3fe2aeb5..ee8f7522 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,11 +1,11 @@
 '1798',3101,62800,,'',0,8500,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,8600,,'',0,10500,,'',0,11100,,'',0,11000,,'',0,15000,,'',0,11300,,'',0,3400,,'',0,5200,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7100,,'',0,1700,,'',0,38500,,'',0
-'2964',3101,81800,,'',0,10000,,'',0,10200,,'',0,10800,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,14900,,'',0,11000,,'',0,11000,,'',0
+'1803',3101,81800,,'',0,10000,,'',0,10200,,'',0,10800,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,14900,,'',0,11000,,'',0,11000,,'',0
 '1798',3201,55800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,7700,,'',0,3500,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
+'1803',3201,74900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2919',3201,84800,,'',0,9600,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2964',3201,74900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '1798',3900,90300,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
+'1803',3900,90200,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11900,,'',0
 '2919',3900,85700,,'',0,18600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16500,,'',0
-'2964',3900,90200,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11900,,'',0
 '1798',1003101,65800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,10100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,9200,,'',0,8700,,'',0,3100,,'',0,7300,,'',0,2900,,'',0,14500,,'',0,4500,,'',0,16200,,'',0
+'1803',1003101,84800,,'',0,10000,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,10500,,'',0,10500,,'',0
 '2919',1003101,104500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2964',1003101,84800,,'',0,10000,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,10500,,'',0,10500,,'',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 ead7f440..42efdb32 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,3 +1,3 @@
 '1798',3100,73900,,'',0,7100,,'',0,3000,,'',0,10400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,9200,,'',0,4200,,'',0,5500,,'',0,3200,,'',0,7100,,'',0,1300,,'',0,7500,,'',0
-'2964',3100,92900,,'',0,10400,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11100,,'',0
+'1803',3100,92900,,'',0,10400,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11100,,'',0
 '1798',24003100,61000,,'',0,3100,,'',0,7000,,'',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 7878f89b..4b90d1e6 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,5 +1,5 @@
 '1798',3101,63800,,'',0,8500,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,8600,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,11400,,'',0,7400,,'',0,1200,,'',0,3100,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,1800,,'',0,38400,,'',0
-'2964',3101,82700,,'',0,10000,,'',0,10400,,'',0,10800,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,10900,,'',0
+'1803',3101,82700,,'',0,10000,,'',0,10400,,'',0,10800,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,10900,,'',0
 '1798',1003101,70800,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7400,,'',0,10100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,11100,,'',0,9300,,'',0,8700,,'',0,7100,,'',0,3200,,'',0,6800,,'',0,10400,,'',0,4500,,'',0,16300,,'',0
+'1803',1003101,85800,,'',0,10100,,'',0,14500,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10900,,'',0,10500,,'',0,10500,,'',0
 '2919',1003101,105600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2964',1003101,85800,,'',0,10100,,'',0,14500,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10900,,'',0,10500,,'',0,10500,,'',0
diff --git a/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 d1519f6a..1d556050 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,2 +1,2 @@
 '1798',1500,64400,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2964',1500,92700,,'',0,18600,,'',0,43000,,'',0,18400,,'',0
+'1803',1500,92700,,'',0,18600,,'',0,43000,,'',0,18400,,'',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 915ac163..d284b54d 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 @@
 '1798',701,64600,0,'Montrose Exch',0,21200,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,24500,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,20700,0,'Montrose Exch',0
+'1803',701,73100,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,24800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
 '2919',701,63000,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',701,73100,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,24800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
 '1798',1000701,80400,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,24100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,17900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
+'1803',1000701,63200,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,24800,,'',0,20400,,'',0
 '2919',1000701,73300,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
-'2964',1000701,63200,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,24800,,'',0,20400,,'',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 7b232360..fd96e9f8 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,9 +1,9 @@
 '1798',200,54800,,'',0,6300,,'',0,3100,,'',0,7100,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7000,,'',0
+'1803',200,61400,,'',0,4500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
 '2919',200,63100,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,4500,,'',0,9300,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4800,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,8200,,'',0
-'2964',200,61400,,'',0,4500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
 '1798',301,60600,,'',0,5300,,'',0,7200,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,9900,,'',0
+'1803',301,70000,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
 '2919',301,63600,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2964',301,70000,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
 '1798',601,61300,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,4000,,'',0,16000,,'',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
+'1803',601,62100,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10100,,'',0,11000,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2919',601,61700,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11800,,'',0
-'2964',601,62100,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10100,,'',0,11000,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
diff --git a/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 258a1a0e..1415ce1d 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 @@
 '1798',101,53400,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2400,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'1803',101,60800,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
 '2919',101,61300,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
-'2964',101,60800,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
 '1798',1200,73300,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,11700,,'',0,15600,,'',0,11700,,'',0,17800,,'',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 e775ef9a..24211bc7 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 @@
 '1798',1501,62600,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2964',1501,91100,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'1803',1501,91100,,'',0,14500,,'',0,47000,,'',0,18500,,'',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 e775ef9a..24211bc7 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 @@
 '1798',1501,62600,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2964',1501,91100,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'1803',1501,91100,,'',0,14500,,'',0,47000,,'',0,18500,,'',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 72206e8d..c77c0cec 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 @@
 '1798',1500,63800,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2964',1500,92200,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'1803',1500,92200,,'',0,18500,,'',0,43000,,'',0,18500,,'',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 985fc460..c103432d 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 @@
 '1798',3900,85000,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
+'1803',3900,85000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,10000,,'',0,11900,,'',0
 '2919',3900,84500,,'',0,18500,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,17000,,'',0,12500,,'',0
-'2964',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-current/raw/current_gtfs_schedule_stop_120033 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120033
index 0588508f..8ea4d1b3 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 @@
 '1798',201,54800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5500,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
+'1803',201,63900,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0,4800,,'',0
 '2919',201,65300,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
-'2964',201,63900,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0,4800,,'',0
diff --git a/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 7f08b7a5..e96f5efc 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 @@
 '1798',201,54900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5500,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
+'1803',201,64000,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0,4800,,'',0
 '2919',201,65400,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
-'2964',201,64000,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0,4800,,'',0
diff --git a/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 85d4102a..6c58c853 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 @@
 '1798',201,55100,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5500,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,3000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
+'1803',201,64100,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0,4700,,'',0
 '2919',201,65600,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4400,,'',0,8500,,'',0
-'2964',201,64100,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0,4700,,'',0
diff --git a/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 a939a856..2e9ba622 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 @@
 '1798',201,54300,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2100,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
+'1803',201,63400,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2919',201,64800,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
-'2964',201,63400,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
diff --git a/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 dd2a0280..8880e320 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 @@
 '1798',200,54200,,'',0,6200,,'',0,3000,,'',0,7100,,'',0,2800,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6500,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
+'1803',200,60700,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0
 '2919',200,62400,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4200,,'',0
-'2964',200,60700,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',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 34c7bcd6..3d5a4d30 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 @@
 '1798',200,54200,,'',0,6300,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3100,,'',0,6600,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2900,,'',0,7000,,'',0
+'1803',200,60800,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
 '2919',200,62500,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4200,,'',0
-'2964',200,60800,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',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 deb9185b..c5e0e144 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 @@
 '1798',200,54300,,'',0,6300,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3100,,'',0,6600,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2900,,'',0,7000,,'',0
+'1803',200,60900,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
 '2919',200,62600,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4200,,'',0
-'2964',200,60900,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',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 51bb133a..d3ba15af 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 @@
 '1798',201,54000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2000,,'',0,1700,,'',0,5900,,'',0,2000,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
+'1803',201,63100,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2919',201,64500,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
-'2964',201,63100,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
diff --git a/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 be3acc7b..f8fe0c01 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 @@
 '1798',200,54100,,'',0,6200,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3100,,'',0,6600,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
+'1803',200,60600,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0
 '2919',200,62300,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4200,,'',0
-'2964',200,60600,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',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 bf55429d..519122fb 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 @@
 '1798',200,60700,4,'',0,2300,4,'',0,7100,4,'',0,3400,4,'',0,6800,4,'',0,2200,4,'',0,2100,4,'',0,5700,4,'',0,1800,4,'',0,2100,4,'',0,5900,4,'',0,2000,4,'',0,2200,4,'',0,5800,4,'',0,2500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6700,4,'',0,2700,4,'',0,7200,4,'',0,2300,4,'',0,5800,4,'',0,1800,4,'',0,2000,4,'',0,1500,4,'',0,6000,4,'',0,1800,4,'',0,1800,4,'',0,5900,4,'',0,1900,4,'',0,1900,4,'',0,5900,4,'',0,1900,4,'',0,2100,4,'',0,6300,4,'',0,3000,4,'',0,6900,4,'',0,2800,4,'',0,6800,4,'',0,2900,4,'',0
 '1798',201,51300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5800,,'',0,1600,,'',0,1500,,'',0,2000,,'',0,6600,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2400,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,1600,,'',0,2300,,'',0,5700,,'',0,1700,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6200,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'1803',200,63200,4,'',0,8500,4,'',0,3600,4,'',0,7100,4,'',0,3100,4,'',0,7000,4,'',0,3100,4,'',0,7100,4,'',0,3100,4,'',0,7100,4,'',0,7300,4,'',0,3400,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,3300,4,'',0,7500,4,'',0,7400,4,'',0,3300,4,'',0,7400,4,'',0,3000,4,'',0,7200,4,'',0,3300,4,'',0,7100,4,'',0,3100,4,'',0,7000,4,'',0,2700,4,'',0,7000,4,'',0,3000,4,'',0,6600,4,'',0,3200,4,'',0
+'1803',201,60500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
 '2919',200,65000,4,'',0,8300,4,'',0,8200,4,'',0,8700,4,'',0,4600,4,'',0,8700,4,'',0,8600,4,'',0,9300,4,'',0,9100,4,'',0,5200,4,'',0,9100,4,'',0,9100,4,'',0,9000,4,'',0,8700,4,'',0,9000,4,'',0,4600,4,'',0,8900,4,'',0,8100,4,'',0
 '2919',201,61900,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'2964',200,63200,4,'',0,8500,4,'',0,3600,4,'',0,7100,4,'',0,3100,4,'',0,7000,4,'',0,3100,4,'',0,7100,4,'',0,3100,4,'',0,7100,4,'',0,7300,4,'',0,3400,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,3300,4,'',0,7500,4,'',0,7400,4,'',0,3300,4,'',0,7400,4,'',0,3000,4,'',0,7200,4,'',0,3300,4,'',0,7100,4,'',0,3100,4,'',0,7000,4,'',0,2700,4,'',0,7000,4,'',0,3000,4,'',0,6600,4,'',0,3200,4,'',0
-'2964',201,60500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
diff --git a/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 7af204f8..b7023644 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 @@
 '1798',201,54500,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5500,,'',0,2000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
+'1803',201,63600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2919',201,65000,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
-'2964',201,63600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
diff --git a/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 a145f204..7c5b2f61 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 @@
 '1798',200,54100,,'',0,6300,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3100,,'',0,6600,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2900,,'',0,7000,,'',0
+'1803',200,60700,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
 '2919',200,62400,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4200,,'',0
-'2964',200,60700,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',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 9b08f8d8..4d531ffd 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 @@
 '1798',101,60100,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
+'1803',101,63400,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6700,,'',0,4700,,'',0
 '2919',101,63800,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9000,,'',0,8400,,'',0,8300,,'',0
-'2964',101,63400,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6700,,'',0,4700,,'',0
 '1798',201,55200,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2100,,'',0,5800,,'',0,2000,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5500,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,3000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
+'1803',201,64300,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0,4800,,'',0
 '2919',201,65700,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4300,,'',0,8500,,'',0
-'2964',201,64300,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0,4800,,'',0
diff --git a/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 64049f61..5f43389f 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 @@
 '1798',100,53000,,'',0,8100,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,2000,,'',0,4800,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2700,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
+'1803',100,61300,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6600,,'',0
 '2919',100,61100,,'',0,3700,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
-'2964',100,61300,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6600,,'',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 a88a0fd6..6e477369 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 @@
 '1798',101,55900,,'',0,7000,,'',0,7100,,'',0,2000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
+'1803',101,63200,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
 '2919',101,63600,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
-'2964',101,63200,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
diff --git a/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 486389e4..873eb8ec 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,3 +1,3 @@
 '1798',200,54000,,'',0,6200,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3100,,'',0,6600,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
+'1803',200,60500,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0
 '2919',200,62200,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4200,,'',0
-'2964',200,60500,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',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 4d688ec9..deec1c9d 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 @@
 '1798',3300,60500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,6800,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7600,,'',0,3600,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
 '1798',3301,60500,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7100,4,'',0,3100,4,'',0,6800,4,'',0,3500,4,'',0,7200,4,'',0,3300,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7600,4,'',0,3400,4,'',0,7600,4,'',0,3600,4,'',0,8000,4,'',0,7900,4,'',0,3100,4,'',0,8200,4,'',0,3300,4,'',0,7700,4,'',0,7900,4,'',0,4000,4,'',0,6700,4,'',0,2900,4,'',0,7000,4,'',0
+'1803',3300,83000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
+'1803',3301,83000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3200,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3400,4,'',0,10400,4,'',0,10500,4,'',0
 '2919',3300,92500,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0
 '2919',3301,92500,4,'',0,10000,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10600,4,'',0,10000,4,'',0,10000,4,'',0
-'2964',3300,83000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
-'2964',3301,83000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3200,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3400,4,'',0,10400,4,'',0,10500,4,'',0
diff --git a/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 19323a25..acc25d90 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 @@
 '1798',3401,55800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
+'1803',3401,74800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
 '2919',3401,82100,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2964',3401,74800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
diff --git a/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 46b8fcf6..9ae6afba 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 @@
 '1798',3900,91300,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'1803',3900,91200,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
 '2919',3900,90700,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
-'2964',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-current/raw/current_gtfs_schedule_stop_120057 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120057
index 5848b663..34b58ab7 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 @@
 '1798',3900,92800,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'1803',3900,92700,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
 '2919',3900,92100,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
-'2964',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-current/raw/current_gtfs_schedule_stop_120058 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120058
index 23cf756d..cdb1584c 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 @@
 '1798',3400,60800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8100,,'',0,3300,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
+'1803',3400,75700,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
 '2919',3400,83000,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
-'2964',3400,75700,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/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 b73bbe72..2c4d96a4 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 @@
 '1798',3501,73100,,'',0,2500,,'',0,7500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
+'1803',3501,82900,,'',0,67200,,'',0,22000,,'',0
 '2919',3501,93800,,'',0,30300,,'',0,59700,,'',0
-'2964',3501,82900,,'',0,67200,,'',0,22000,,'',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 810df278..37cff9f8 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 @@
 '1798',1000700,74900,4,'',0,6000,4,'',0,13500,4,'',0,20000,4,'',0,20100,4,'',0,20600,4,'',0,6500,4,'',0,13900,4,'',0,19900,4,'',0,19900,4,'',0
 '1798',1000701,74900,0,'Montrose Exch',0,6000,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
+'1803',1000700,61900,4,'',0,19700,4,'',0,20100,4,'',0,20800,4,'',0,21200,4,'',0,20900,4,'',0,20400,4,'',0
+'1803',1000701,61900,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
 '2919',1000700,72000,4,'',0,19600,4,'',0,19600,4,'',0,20000,4,'',0,20000,4,'',0,19900,4,'',0
 '2919',1000701,72000,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
-'2964',1000700,61900,4,'',0,19700,4,'',0,20100,4,'',0,20800,4,'',0,21200,4,'',0,20900,4,'',0,20400,4,'',0
-'2964',1000701,61900,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',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 7023bd16..f51945b9 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 @@
 '1798',3900,85500,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
+'1803',3900,85400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,11900,,'',0
 '2919',3900,84900,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,16000,,'',0,12900,,'',0,12500,,'',0
-'2964',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-current/raw/current_gtfs_schedule_stop_120063 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120063
index e199b716..e8cda5ab 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120063
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120063
@@ -1,28 +1,28 @@
 '1798',3100,95700,4,'',0,15000,4,'',0,11000,4,'',0,11000,4,'',0
-'2964',3100,94200,4,'',0,10500,4,'',0,11000,4,'',0,15000,4,'',0,11000,4,'',0,11000,4,'',0,11000,4,'',0,11000,4,'',0
+'1803',3100,94200,4,'',0,10500,4,'',0,11000,4,'',0,15000,4,'',0,11000,4,'',0,11000,4,'',0,11000,4,'',0,11000,4,'',0
 '1798',3200,95900,4,'',0,7000,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7600,4,'',0,3700,4,'',0,11400,4,'',0,48500,4,'',0
+'1803',3200,81300,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,7000,4,'',0,3200,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3400,4,'',0,7400,4,'',0,3500,4,'',0,7500,4,'',0,3400,4,'',0
 '2919',3200,91200,4,'',0,9600,4,'',0,10200,4,'',0,10700,4,'',0,10500,4,'',0,10600,4,'',0,10400,4,'',0,10500,4,'',0,10300,4,'',0,10000,4,'',0
-'2964',3200,81300,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,7000,4,'',0,3200,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3400,4,'',0,7400,4,'',0,3500,4,'',0,7500,4,'',0,3400,4,'',0
 '1798',3300,61900,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7300,4,'',0,3100,4,'',0,6600,4,'',0,51300,4,'',0,7700,4,'',0,4000,4,'',0,7800,4,'',0,3100,4,'',0,8200,4,'',0,7200,4,'',0,3700,4,'',0,7800,4,'',0,10600,4,'',0,9900,4,'',0
 '1798',3301,55500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,7100,,'',0,7900,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'1803',3300,195900,4,'',0,14500,4,'',0
+'1803',3301,81900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,10500,,'',0,10500,,'',0
 '2919',3300,190900,4,'',0
 '2919',3301,91400,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
-'2964',3300,195900,4,'',0,14500,4,'',0
-'2964',3301,81900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,10500,,'',0,10500,,'',0
 '1798',3400,62000,4,'',0,3000,4,'',0,7000,4,'',0,2600,4,'',0,7400,4,'',0,3100,4,'',0,7100,4,'',0,3000,4,'',0,10500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7700,4,'',0,8500,4,'',0,3000,4,'',0,7600,4,'',0,3800,4,'',0,7600,4,'',0,7800,4,'',0,3400,4,'',0,7900,4,'',0,7900,4,'',0,10100,4,'',0
 '1798',3401,55500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,3900,,'',0,7800,,'',0,7300,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,4000,,'',0,10000,,'',0,9700,,'',0
+'1803',3400,80500,4,'',0,3200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,11000,4,'',0,10900,4,'',0
+'1803',3401,74500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
 '2919',3400,83800,4,'',0,17500,4,'',0,12300,4,'',0,18000,4,'',0,12500,4,'',0,16300,4,'',0,13000,4,'',0,17900,4,'',0
 '2919',3401,81800,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2964',3400,80500,4,'',0,3200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,11000,4,'',0,10900,4,'',0
-'2964',3401,74500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
 '1798',3500,74400,4,'',0,6500,4,'',0,3600,4,'',0,35900,4,'',0,33200,4,'',0,26800,4,'',0
 '1798',3501,72500,,'',0,2500,,'',0,7500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
+'1803',3500,84300,4,'',0,67200,4,'',0,22000,4,'',0
+'1803',3501,82400,,'',0,63100,,'',0,26000,,'',0
 '2919',3500,95200,4,'',0,30300,4,'',0,59700,4,'',0
 '2919',3501,93200,,'',0,30300,,'',0,59800,,'',0
-'2964',3500,84300,4,'',0,67200,4,'',0,22000,4,'',0
-'2964',3501,82400,,'',0,63100,,'',0,26000,,'',0
 '1798',3900,84500,,'',0,9100,4,'',0,900,,'',0,9200,4,'',0,800,,'',0,9200,4,'',0,7800,,'',0,9200,4,'',0,800,,'',0,9200,4,'',0,800,,'',0,9200,4,'',0,3300,,'',0,9200,4,'',0,800,,'',0,9200,4,'',0,7300,,'',0,5100,4,'',0
+'1803',3900,84500,,'',0,9000,4,'',0,1000,,'',0,9000,4,'',0,1000,,'',0,9100,4,'',0,900,,'',0,9300,4,'',0,700,,'',0,9300,4,'',0,700,,'',0,9400,4,'',0,7600,,'',0,9200,4,'',0,800,,'',0,9100,4,'',0,2900,,'',0,8900,4,'',0
 '2919',3900,84000,,'',0,8900,4,'',0,9600,,'',0,9000,4,'',0,3000,,'',0,9000,4,'',0,9500,,'',0,9000,4,'',0,3000,,'',0,9000,4,'',0,8000,,'',0,8900,4,'',0,3600,,'',0,8800,4,'',0
-'2964',3900,84500,,'',0,9000,4,'',0,1000,,'',0,9000,4,'',0,1000,,'',0,9100,4,'',0,900,,'',0,9300,4,'',0,700,,'',0,9300,4,'',0,700,,'',0,9400,4,'',0,7600,,'',0,9200,4,'',0,800,,'',0,9100,4,'',0,2900,,'',0,8900,4,'',0
 '1798',1003100,103200,4,'',0,11000,4,'',0,11000,4,'',0,15000,4,'',0
-'2964',1003100,91200,4,'',0,10200,4,'',0,10800,4,'',0,11000,4,'',0,11000,4,'',0,11000,4,'',0,15000,4,'',0,11000,4,'',0
+'1803',1003100,91200,4,'',0,10200,4,'',0,10800,4,'',0,11000,4,'',0,11000,4,'',0,11000,4,'',0,15000,4,'',0,11000,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120064 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120064
index bf45d981..f16f21b0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120064
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120064
@@ -1,20 +1,20 @@
 '1798',3100,75100,4,'',0,7100,4,'',0,3000,4,'',0,58300,4,'',0,9300,4,'',0,8200,4,'',0,1500,4,'',0,3200,4,'',0,7000,4,'',0,1300,4,'',0,7500,4,'',0
 '1798',3101,62500,,'',0,8500,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,8700,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11300,,'',0,3400,,'',0,5200,,'',0,3100,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,2000,,'',0,38500,,'',0
-'2964',3101,81500,,'',0,10000,,'',0,10200,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0
+'1803',3101,81500,,'',0,10000,,'',0,10200,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0
 '1798',3200,62000,4,'',0,3100,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7000,4,'',0,58800,4,'',0,11600,4,'',0,7400,4,'',0,3900,4,'',0,7400,4,'',0,3700,4,'',0,7800,4,'',0,7900,4,'',0,11900,4,'',0,10700,4,'',0
 '1798',3201,55500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3700,,'',0,7500,,'',0,7800,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,7000,,'',0,9000,,'',0,11000,,'',0
+'1803',3200,192700,4,'',0,7500,4,'',0,3000,4,'',0,7500,4,'',0,13000,4,'',0
+'1803',3201,74500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2919',3201,84400,,'',0,9600,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2964',3200,192700,4,'',0,7500,4,'',0,3000,4,'',0,7500,4,'',0,13000,4,'',0
-'2964',3201,74500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '1798',3300,95400,4,'',0,7200,4,'',0,3300,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,3400,4,'',0,65200,4,'',0,9600,4,'',0
+'1803',3300,84300,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,3200,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3300,4,'',0
 '2919',3300,93800,4,'',0,10100,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,14500,4,'',0,10500,4,'',0,10000,4,'',0
-'2964',3300,84300,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,3200,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3300,4,'',0
 '1798',3400,95400,4,'',0,7100,4,'',0,3400,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7700,4,'',0,11500,4,'',0,65500,4,'',0
-'2964',3400,80700,4,'',0,3200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0
+'1803',3400,80700,4,'',0,3200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0
 '1798',1003100,70800,4,'',0,3000,4,'',0,7100,4,'',0,3100,4,'',0,8500,4,'',0,58600,4,'',0,3700,4,'',0,9400,4,'',0,7000,4,'',0,4600,4,'',0,9900,4,'',0,7600,4,'',0,11400,4,'',0,15400,4,'',0,10900,4,'',0
 '1798',1003101,65500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,14200,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,9200,,'',0,8700,,'',0,3100,,'',0,7300,,'',0,3000,,'',0,10200,,'',0,8500,,'',0,16500,,'',0
+'1803',1003100,182200,4,'',0,3500,4,'',0,14500,4,'',0,10400,4,'',0,10000,4,'',0
+'1803',1003101,84500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,10500,,'',0,10500,,'',0
 '2919',1003100,103900,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,14500,4,'',0,10500,4,'',0,10000,4,'',0
 '2919',1003101,104200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2964',1003100,182200,4,'',0,3500,4,'',0,14500,4,'',0,10400,4,'',0,10000,4,'',0
-'2964',1003101,84500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,10500,,'',0,10500,,'',0
 '1798',24003100,61900,4,'',0,3100,4,'',0,7100,4,'',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 c2ae74a2..c1b8cb57 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 @@
 '1798',3900,90700,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12500,,'',0
+'1803',3900,90600,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11900,,'',0
 '2919',3900,90100,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16500,,'',0
-'2964',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-current/raw/current_gtfs_schedule_stop_120068 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120068
index fddd20ce..a99cb048 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,3 +1,3 @@
 '1798',500,61400,,'',0,9300,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,7100,,'',0,3500,,'',0,7700,,'',0,3600,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
+'1803',500,70800,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,2800,,'',0,9700,,'',0
 '2919',500,64400,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
-'2964',500,70800,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,2800,,'',0,9700,,'',0
diff --git a/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 33071fa2..c62d0c53 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,3 +1,3 @@
 '1798',501,60800,,'',0,2800,,'',0,6800,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'1803',501,64100,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '2919',501,62400,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2964',501,64100,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/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 db5169a4..4bd48546 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 @@
 '1798',700,62400,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20500,,'',0,20400,,'',0,20000,,'',0,20900,,'',0
+'1803',700,71100,,'',0,14600,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
 '2919',700,61100,,'',0,20100,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',700,71100,,'',0,14600,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
 '1798',1000700,74000,,'',0,6000,,'',0,13500,,'',0,20000,,'',0,20100,,'',0,20500,,'',0,6500,,'',0,14000,,'',0,19900,,'',0,20000,,'',0
+'1803',1000700,61100,,'',0,19600,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
 '2919',1000700,71100,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
-'2964',1000700,61100,,'',0,19600,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',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 a4c72b1d..3517cb8e 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 @@
 '1798',400,61700,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
 '1798',401,61700,4,'',0,9600,4,'',0,2000,4,'',0,7300,4,'',0,11300,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10100,4,'',0,10100,4,'',0,10000,4,'',0,10600,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0
+'1803',400,61700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'1803',401,61700,4,'',0,9200,4,'',0,9800,4,'',0,10100,4,'',0,10000,4,'',0,10500,4,'',0,10500,4,'',0,10000,4,'',0,10500,4,'',0,10700,4,'',0,9300,4,'',0,11500,4,'',0,10500,4,'',0,10100,4,'',0,10300,4,'',0,10000,4,'',0
 '2919',400,65900,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
 '2919',401,65900,4,'',0,24400,4,'',0,12500,4,'',0,13000,4,'',0,17000,4,'',0,13000,4,'',0,17000,4,'',0,12000,4,'',0,17500,4,'',0
-'2964',400,61700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2964',401,61700,4,'',0,9200,4,'',0,9800,4,'',0,10100,4,'',0,10000,4,'',0,10500,4,'',0,10500,4,'',0,10000,4,'',0,10500,4,'',0,10700,4,'',0,9300,4,'',0,11500,4,'',0,10500,4,'',0,10100,4,'',0,10300,4,'',0,10000,4,'',0
diff --git a/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 293cd275..304260a7 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,27 +1,27 @@
 '1798',101,53900,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'1803',101,61300,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8800,,'',0
 '2919',101,61700,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
-'2964',101,61300,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8800,,'',0
 '1798',200,60100,,'',0,2300,,'',0,3100,,'',0,7300,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2700,,'',0,7200,,'',0,2300,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,2800,,'',0,6900,,'',0
+'1803',200,62600,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3200,,'',0
 '2919',200,64400,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
-'2964',200,62600,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3200,,'',0
 '1798',301,54900,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8300,,'',0,10000,,'',0,8900,4,'',0
+'1803',301,64400,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0,8700,4,'',0
 '2919',301,62000,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,4,'',0
-'2964',301,64400,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0,8700,4,'',0
 '1798',400,63700,4,'',0,9600,4,'',0,2000,4,'',0,18600,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10100,4,'',0,10100,4,'',0,10000,4,'',0,10600,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9800,4,'',0
 '1798',401,60500,,'',0,9500,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1803',401,60500,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',401,64700,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2964',401,60500,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '1798',700,61900,,'',0,21100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20500,,'',0,20500,,'',0,20000,,'',0,20900,,'',0
 '1798',701,65200,4,'',0,25200,4,'',0,20000,4,'',0,20100,4,'',0,20000,4,'',0,20500,4,'',0,20300,4,'',0,19900,4,'',0
+'1803',700,70600,,'',0,14500,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20900,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
 '2919',700,60600,,'',0,20000,,'',0,15100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,16500,,'',0
-'2964',700,70600,,'',0,14500,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20900,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
 '1798',900,54500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '1798',901,61700,4,'',0,10100,4,'',0,10400,4,'',0,9800,4,'',0,9600,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10200,4,'',0,10100,4,'',0,10100,4,'',0,10500,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0
+'1803',900,64500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '2919',900,63500,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2964',900,64500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '1798',1500,73700,4,'',0,12000,4,'',0,68300,4,'',0
 '1798',1600,73700,,'',0,12000,,'',0,68300,,'',0,8500,,'',0
 '1798',1000700,73500,,'',0,2000,,'',0,17500,,'',0,20000,,'',0,20000,,'',0,20500,,'',0,6500,,'',0,14000,,'',0,20000,,'',0,20000,,'',0
 '1798',1000701,83000,4,'',0,17500,4,'',0,20000,4,'',0,20100,4,'',0,20600,4,'',0,20300,4,'',0,19900,4,'',0,19800,4,'',0
+'1803',1000700,60600,,'',0,19500,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20500,,'',0
 '2919',1000700,70600,,'',0,19500,,'',0,15600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
-'2964',1000700,60600,,'',0,19500,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20500,,'',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 54b82c67..47c63ef4 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,26 +1,26 @@
 '1798',100,54800,,'',0,8200,,'',0,7000,,'',0,3200,,'',0,2200,,'',0,6100,,'',0,800,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6300,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2500,,'',0,6700,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,7000,,'',0,2900,,'',0
+'1803',100,63100,,'',0,7100,,'',0,3900,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2600,,'',0
 '2919',100,62800,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,8700,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,9900,,'',0
-'2964',100,63100,,'',0,7100,,'',0,3900,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2600,,'',0
 '1798',201,52200,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1700,,'',0,1600,,'',0,6000,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2300,,'',0,7000,,'',0,7200,,'',0,2900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'1803',201,61400,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
 '2919',201,62800,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'2964',201,61400,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
 '1798',300,60300,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,2700,,'',0,7600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3800,,'',0,6900,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
+'1803',300,60700,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '2919',300,65000,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2964',300,60700,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '1798',400,82400,4,'',0
+'1803',400,63400,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,14400,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',400,71600,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2964',400,63400,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,14400,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '1798',701,65000,0,'Montrose Exch',0,25200,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20500,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,20500,4,'',0
+'1803',701,73400,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,24800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
 '2919',701,63300,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',701,73400,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,24800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
 '1798',901,222200,4,'',0
+'1803',901,71500,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2919',901,70500,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17400,,'',0
-'2964',901,71500,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '1798',1500,65200,4,'',0,108900,4,'',0,9000,4,'',0
 '1798',1501,61400,,'',0,4300,,'',0,15800,,'',0,64300,,'',0,24200,,'',0,5100,,'',0
-'2964',1500,93500,4,'',0,18600,4,'',0,43000,4,'',0,18400,4,'',0
-'2964',1501,85700,,'',0,18500,,'',0,47000,,'',0,14500,,'',0
+'1803',1500,93500,4,'',0,18600,4,'',0,43000,4,'',0,18400,4,'',0
+'1803',1501,85700,,'',0,18500,,'',0,47000,,'',0,14500,,'',0
 '1798',1601,80800,4,'',0,11900,4,'',0,68500,4,'',0,4600,4,'',0
 '1798',1000701,80700,4,'',0,2100,0,'Montrose Exch',0,17500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,2300,4,'',0,18000,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
+'1803',1000701,63500,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,24800,,'',0,20400,,'',0
 '2919',1000701,73600,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
-'2964',1000701,63500,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,24800,,'',0,20400,,'',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 09c8f535..7c46c545 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,3 +1,3 @@
 '1798',400,62000,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'1803',400,61900,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2919',400,70100,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2964',400,61900,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
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 bfe34ef7..b64c32ec 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,3 +1,3 @@
 '1798',301,54600,,'',0,9200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,8900,0,'Montrose Exch Only',0
+'1803',301,64000,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,7000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
 '2919',301,61600,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
-'2964',301,64000,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,7000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
diff --git a/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 a341e813..53a4a7f1 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 @@
 '1798',3300,61300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3100,,'',0,6600,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7700,,'',0,7700,,'',0,4000,,'',0,7800,,'',0,3100,,'',0,8200,,'',0,7200,,'',0,3700,,'',0,7900,,'',0,7900,,'',0,2700,,'',0,2900,,'',0,7000,,'',0
+'1803',3300,83800,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,10400,,'',0,10500,,'',0
 '2919',3300,93300,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,9900,,'',0
-'2964',3300,83800,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,10400,,'',0,10500,,'',0
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 983b5b25..50118be0 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,6 +1,6 @@
 '1798',301,60400,,'',0,5300,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3700,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,9900,,'',0
+'1803',301,65800,,'',0,10100,,'',0,14100,,'',0,3000,,'',0,2900,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
 '2919',301,63400,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2964',301,65800,,'',0,10100,,'',0,14100,,'',0,3000,,'',0,2900,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
 '1798',601,61200,,'',0,4700,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,4000,,'',0,16000,,'',0,11600,,'',0,11500,,'',0,8600,,'',0,8600,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,4000,,'',0,15500,,'',0,5800,,'',0,15500,,'',0,11000,,'',0
+'1803',601,62000,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,14100,,'',0,11000,,'',0,9800,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2919',601,61600,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15800,,'',0
-'2964',601,62000,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,14100,,'',0,11000,,'',0,9800,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',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 968e5f71..5ada779b 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 @@
 '1798',3400,60500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
 '1798',3401,60500,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,3000,4,'',0,7000,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,4000,4,'',0,7400,4,'',0,7800,4,'',0,3800,4,'',0,7600,4,'',0,7800,4,'',0,3400,4,'',0,7900,4,'',0,3900,4,'',0,9700,4,'',0,9700,4,'',0
+'1803',3400,75400,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
+'1803',3401,75400,4,'',0,7200,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,11000,4,'',0,10900,4,'',0
 '2919',3400,82700,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
 '2919',3401,82700,4,'',0,17500,4,'',0,12300,4,'',0,18000,4,'',0,12500,4,'',0,12300,4,'',0,17000,4,'',0,17900,4,'',0
-'2964',3400,75400,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
-'2964',3401,75400,4,'',0,7200,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,11000,4,'',0,10900,4,'',0
diff --git a/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 b04237f6..81d4b5bb 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 @@
 '1798',3900,92200,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'1803',3900,92100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
 '2919',3900,91500,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
-'2964',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-current/raw/current_gtfs_schedule_stop_120081 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120081
index f62a3631..8dc74c4c 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 @@
 '1798',701,64100,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20500,0,'Montrose Exch',0,24300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,20900,0,'Montrose Exch',0
+'1803',701,72700,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,24500,,'',0,10000,,'',0,12900,,'',0
 '2919',701,62600,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2964',701,72700,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,24500,,'',0,10000,,'',0,12900,,'',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 5848b663..34b58ab7 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 @@
 '1798',3900,92800,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'1803',3900,92700,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
 '2919',3900,92100,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
-'2964',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-current/values/current_gtfs_rts_values_gen.xml b/app-android/src/main/res-current/values/current_gtfs_rts_values_gen.xml
index c009ae3f..6c62ba1a 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 @@
     <string name="current_gtfs_rts_area_max_lat">49.1583</string>
     <string name="current_gtfs_rts_area_min_lng">-122.47064</string>
     <string name="current_gtfs_rts_area_max_lng">-122.21454</string>
-    <integer name="current_gtfs_rts_first_departure_in_sec">1719752400</integer><!-- 2024/06/30 06:00:00 PDT -->
+    <integer name="current_gtfs_rts_first_departure_in_sec">1720357200</integer><!-- 2024/07/07 06:00:00 PDT -->
     <integer name="current_gtfs_rts_last_departure_in_sec">1725334260</integer><!-- 2024/09/02 20:31:00 PDT -->
 </resources>
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 90e1215b..b005491d 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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-    <integer name="gtfs_rts_db_version">20240702</integer>
+    <integer name="gtfs_rts_db_version">20240709</integer>
     <string name="gtfs_rts_authority">org.mtransit.android.ca_central_fraser_valley_transit_system_bus.gtfs</string>
     <string name="gtfs_status_for_poi_authority">@string/gtfs_rts_authority</string>
     <string name="gtfs_rts_contact_us">https://www.bctransit.com/contact</string>