From 2f5cadbe9bacc894754ed0a9a46d4e3e669c2ffd Mon Sep 17 00:00:00 2001
From: MonTransit Bot <84137772+montransit@users.noreply.github.com>
Date: Tue, 12 Sep 2023 13:02:10 +0000
Subject: [PATCH] CI: September 12 update

---
 src/main/play/release-notes/en-US/default.txt |   2 +-
 .../raw/current_gtfs_schedule_service_dates   | 234 +++++++++---------
 .../raw/current_gtfs_schedule_stop_1          |  28 +--
 .../raw/current_gtfs_schedule_stop_10         |  14 +-
 .../raw/current_gtfs_schedule_stop_100        |  14 +-
 .../raw/current_gtfs_schedule_stop_100196     |  50 ++--
 .../raw/current_gtfs_schedule_stop_101        |  14 +-
 .../raw/current_gtfs_schedule_stop_102        |  28 +--
 .../raw/current_gtfs_schedule_stop_103        |  28 +--
 .../raw/current_gtfs_schedule_stop_104        |  28 +--
 .../raw/current_gtfs_schedule_stop_105        |  14 +-
 .../raw/current_gtfs_schedule_stop_106        |  14 +-
 .../raw/current_gtfs_schedule_stop_107        |  14 +-
 .../raw/current_gtfs_schedule_stop_108        |  14 +-
 .../raw/current_gtfs_schedule_stop_109        |  14 +-
 .../raw/current_gtfs_schedule_stop_11         |  14 +-
 .../raw/current_gtfs_schedule_stop_110        |  14 +-
 .../raw/current_gtfs_schedule_stop_111        |  14 +-
 .../raw/current_gtfs_schedule_stop_112        |  28 +--
 .../raw/current_gtfs_schedule_stop_113        |  28 +--
 .../raw/current_gtfs_schedule_stop_114        |  14 +-
 .../raw/current_gtfs_schedule_stop_115        |  28 +--
 .../raw/current_gtfs_schedule_stop_116        |  28 +--
 .../raw/current_gtfs_schedule_stop_117        |  28 +--
 .../raw/current_gtfs_schedule_stop_118        |  14 +-
 .../raw/current_gtfs_schedule_stop_119        |  28 +--
 .../raw/current_gtfs_schedule_stop_12         |  14 +-
 .../raw/current_gtfs_schedule_stop_120        |  28 +--
 .../raw/current_gtfs_schedule_stop_121        |  28 +--
 .../raw/current_gtfs_schedule_stop_122        |  14 +-
 .../raw/current_gtfs_schedule_stop_123        |  28 +--
 .../raw/current_gtfs_schedule_stop_124        |  14 +-
 .../raw/current_gtfs_schedule_stop_125        |  14 +-
 .../raw/current_gtfs_schedule_stop_126        |  14 +-
 .../raw/current_gtfs_schedule_stop_127        |  28 +--
 .../raw/current_gtfs_schedule_stop_128        |  28 +--
 .../raw/current_gtfs_schedule_stop_129        |  14 +-
 .../raw/current_gtfs_schedule_stop_13         |  28 +--
 .../raw/current_gtfs_schedule_stop_130        |  14 +-
 .../raw/current_gtfs_schedule_stop_131        |  14 +-
 .../raw/current_gtfs_schedule_stop_132        |  14 +-
 .../raw/current_gtfs_schedule_stop_133        |  14 +-
 .../raw/current_gtfs_schedule_stop_134        |  14 +-
 .../raw/current_gtfs_schedule_stop_135        |  28 +--
 .../raw/current_gtfs_schedule_stop_136        |  28 +--
 .../raw/current_gtfs_schedule_stop_13610      |  10 +-
 .../raw/current_gtfs_schedule_stop_13611      |  10 +-
 .../raw/current_gtfs_schedule_stop_13612      |  10 +-
 .../raw/current_gtfs_schedule_stop_137        |  14 +-
 .../raw/current_gtfs_schedule_stop_138        |  14 +-
 .../raw/current_gtfs_schedule_stop_139        |  14 +-
 .../raw/current_gtfs_schedule_stop_14         |  28 +--
 .../raw/current_gtfs_schedule_stop_140        |  28 +--
 .../raw/current_gtfs_schedule_stop_141        |  28 +--
 .../raw/current_gtfs_schedule_stop_142        |  14 +-
 .../raw/current_gtfs_schedule_stop_143        |  14 +-
 .../raw/current_gtfs_schedule_stop_144        |  14 +-
 .../raw/current_gtfs_schedule_stop_145        |  28 +--
 .../raw/current_gtfs_schedule_stop_146        |  28 +--
 .../raw/current_gtfs_schedule_stop_147        |  54 ++--
 .../raw/current_gtfs_schedule_stop_148        |  14 +-
 .../raw/current_gtfs_schedule_stop_149        |  52 ++--
 .../raw/current_gtfs_schedule_stop_15         |  14 +-
 .../raw/current_gtfs_schedule_stop_150        |  14 +-
 .../raw/current_gtfs_schedule_stop_151        |  28 +--
 .../raw/current_gtfs_schedule_stop_152        |  56 ++---
 .../raw/current_gtfs_schedule_stop_153        |  14 +-
 .../raw/current_gtfs_schedule_stop_154        |  14 +-
 .../raw/current_gtfs_schedule_stop_155        |  14 +-
 .../raw/current_gtfs_schedule_stop_156        |  10 +-
 .../raw/current_gtfs_schedule_stop_157        |  28 +--
 .../raw/current_gtfs_schedule_stop_158        |  28 +--
 .../raw/current_gtfs_schedule_stop_159        |  58 ++---
 .../raw/current_gtfs_schedule_stop_16         |  14 +-
 .../raw/current_gtfs_schedule_stop_160        |  28 +--
 .../raw/current_gtfs_schedule_stop_161        |  42 ++--
 .../raw/current_gtfs_schedule_stop_162        |  14 +-
 .../raw/current_gtfs_schedule_stop_163        |  28 +--
 .../raw/current_gtfs_schedule_stop_164        |  10 +-
 .../raw/current_gtfs_schedule_stop_165        |  10 +-
 .../raw/current_gtfs_schedule_stop_166        |  20 +-
 .../raw/current_gtfs_schedule_stop_167        |  56 ++---
 .../raw/current_gtfs_schedule_stop_168        |  20 +-
 .../raw/current_gtfs_schedule_stop_169        |  10 +-
 .../raw/current_gtfs_schedule_stop_17         |  14 +-
 .../raw/current_gtfs_schedule_stop_170        |  14 +-
 .../raw/current_gtfs_schedule_stop_171        |  10 +-
 .../raw/current_gtfs_schedule_stop_172        |  28 +--
 .../raw/current_gtfs_schedule_stop_173        |  10 +-
 .../raw/current_gtfs_schedule_stop_174        |  42 ++--
 .../raw/current_gtfs_schedule_stop_175        |  14 +-
 .../raw/current_gtfs_schedule_stop_176        |  28 +--
 .../raw/current_gtfs_schedule_stop_177        |  56 ++---
 .../raw/current_gtfs_schedule_stop_178        |  14 +-
 .../raw/current_gtfs_schedule_stop_179        |  14 +-
 .../raw/current_gtfs_schedule_stop_18         |  42 ++--
 .../raw/current_gtfs_schedule_stop_180        |  30 +--
 .../raw/current_gtfs_schedule_stop_182        |  42 ++--
 .../raw/current_gtfs_schedule_stop_183        |  42 ++--
 .../raw/current_gtfs_schedule_stop_184        |  28 +--
 .../raw/current_gtfs_schedule_stop_185        |  20 +-
 .../raw/current_gtfs_schedule_stop_186        |  28 +--
 .../raw/current_gtfs_schedule_stop_187        |  14 +-
 .../raw/current_gtfs_schedule_stop_188        |  14 +-
 .../raw/current_gtfs_schedule_stop_189        |  10 +-
 .../raw/current_gtfs_schedule_stop_19         |  42 ++--
 .../raw/current_gtfs_schedule_stop_190        |  14 +-
 .../raw/current_gtfs_schedule_stop_191        |  10 +-
 .../raw/current_gtfs_schedule_stop_192        |  14 +-
 .../raw/current_gtfs_schedule_stop_193        |  42 ++--
 .../raw/current_gtfs_schedule_stop_194        |  14 +-
 .../raw/current_gtfs_schedule_stop_195        |  14 +-
 .../raw/current_gtfs_schedule_stop_196        |  28 +--
 .../raw/current_gtfs_schedule_stop_197        |  14 +-
 .../raw/current_gtfs_schedule_stop_198        |  14 +-
 .../raw/current_gtfs_schedule_stop_199        |  28 +--
 .../raw/current_gtfs_schedule_stop_2          |  14 +-
 .../raw/current_gtfs_schedule_stop_20         |  14 +-
 .../raw/current_gtfs_schedule_stop_200        |  34 +--
 .../raw/current_gtfs_schedule_stop_201        |  20 +-
 .../raw/current_gtfs_schedule_stop_202        |  42 ++--
 .../raw/current_gtfs_schedule_stop_203        |  42 ++--
 .../raw/current_gtfs_schedule_stop_204        |  18 +-
 .../raw/current_gtfs_schedule_stop_205        |  14 +-
 .../raw/current_gtfs_schedule_stop_206        |  14 +-
 .../raw/current_gtfs_schedule_stop_207        |  20 +-
 .../raw/current_gtfs_schedule_stop_208        |  24 +-
 .../raw/current_gtfs_schedule_stop_209        |  42 ++--
 .../raw/current_gtfs_schedule_stop_210        |  20 +-
 .../raw/current_gtfs_schedule_stop_211        |  14 +-
 .../raw/current_gtfs_schedule_stop_212        |  14 +-
 .../raw/current_gtfs_schedule_stop_213        |  14 +-
 .../raw/current_gtfs_schedule_stop_214        |  28 +--
 .../raw/current_gtfs_schedule_stop_215        |  14 +-
 .../raw/current_gtfs_schedule_stop_216        |  10 +-
 .../raw/current_gtfs_schedule_stop_217        |  14 +-
 .../raw/current_gtfs_schedule_stop_218        |  14 +-
 .../raw/current_gtfs_schedule_stop_219        |  38 +--
 .../raw/current_gtfs_schedule_stop_22         |  42 ++--
 .../raw/current_gtfs_schedule_stop_220        |  14 +-
 .../raw/current_gtfs_schedule_stop_221        |  14 +-
 .../raw/current_gtfs_schedule_stop_222        |  14 +-
 .../raw/current_gtfs_schedule_stop_223        |  14 +-
 .../raw/current_gtfs_schedule_stop_224        |  42 ++--
 .../raw/current_gtfs_schedule_stop_225        |  42 ++--
 .../raw/current_gtfs_schedule_stop_226        |  14 +-
 .../raw/current_gtfs_schedule_stop_227        |  42 ++--
 .../raw/current_gtfs_schedule_stop_228        |  14 +-
 .../raw/current_gtfs_schedule_stop_229        |  10 +-
 .../raw/current_gtfs_schedule_stop_23         |  28 +--
 .../raw/current_gtfs_schedule_stop_230        |  14 +-
 .../raw/current_gtfs_schedule_stop_231        |  14 +-
 .../raw/current_gtfs_schedule_stop_232        |  14 +-
 .../raw/current_gtfs_schedule_stop_233        |  10 +-
 .../raw/current_gtfs_schedule_stop_234        |  14 +-
 .../raw/current_gtfs_schedule_stop_235        |  14 +-
 .../raw/current_gtfs_schedule_stop_236        |  14 +-
 .../raw/current_gtfs_schedule_stop_237        |  14 +-
 .../raw/current_gtfs_schedule_stop_238        |  14 +-
 .../raw/current_gtfs_schedule_stop_239        |  14 +-
 .../raw/current_gtfs_schedule_stop_24         |  14 +-
 .../raw/current_gtfs_schedule_stop_240        |  14 +-
 .../raw/current_gtfs_schedule_stop_241        |  14 +-
 .../raw/current_gtfs_schedule_stop_242        |  24 +-
 .../raw/current_gtfs_schedule_stop_243        |  24 +-
 .../raw/current_gtfs_schedule_stop_244        |  14 +-
 .../raw/current_gtfs_schedule_stop_245        |  14 +-
 .../raw/current_gtfs_schedule_stop_246        |  24 +-
 .../raw/current_gtfs_schedule_stop_247        |  42 ++--
 .../raw/current_gtfs_schedule_stop_248        |  14 +-
 .../raw/current_gtfs_schedule_stop_249        |  14 +-
 .../raw/current_gtfs_schedule_stop_25         |  14 +-
 .../raw/current_gtfs_schedule_stop_250        |  14 +-
 .../raw/current_gtfs_schedule_stop_251        |  14 +-
 .../raw/current_gtfs_schedule_stop_252        |  28 +--
 .../raw/current_gtfs_schedule_stop_253        |  24 +-
 .../raw/current_gtfs_schedule_stop_254        |  14 +-
 .../raw/current_gtfs_schedule_stop_255        |  14 +-
 .../raw/current_gtfs_schedule_stop_256        |  24 +-
 .../raw/current_gtfs_schedule_stop_257        |  14 +-
 .../raw/current_gtfs_schedule_stop_258        |  14 +-
 .../raw/current_gtfs_schedule_stop_259        |  14 +-
 .../raw/current_gtfs_schedule_stop_25960      |  24 +-
 .../raw/current_gtfs_schedule_stop_25961      |  24 +-
 .../raw/current_gtfs_schedule_stop_26         |  14 +-
 .../raw/current_gtfs_schedule_stop_260        |  14 +-
 .../raw/current_gtfs_schedule_stop_261        |  14 +-
 .../raw/current_gtfs_schedule_stop_262        |  14 +-
 .../raw/current_gtfs_schedule_stop_263        |  14 +-
 .../raw/current_gtfs_schedule_stop_264        |  14 +-
 .../raw/current_gtfs_schedule_stop_265        |  14 +-
 .../raw/current_gtfs_schedule_stop_266        |  14 +-
 .../raw/current_gtfs_schedule_stop_267        |  14 +-
 .../raw/current_gtfs_schedule_stop_268        |  42 ++--
 .../raw/current_gtfs_schedule_stop_26870      |  14 +-
 .../raw/current_gtfs_schedule_stop_27         |  14 +-
 .../raw/current_gtfs_schedule_stop_270        |  24 +-
 .../raw/current_gtfs_schedule_stop_272        |  28 +--
 .../raw/current_gtfs_schedule_stop_273        |  14 +-
 .../raw/current_gtfs_schedule_stop_274        |  10 +-
 .../raw/current_gtfs_schedule_stop_275        |  20 +-
 .../raw/current_gtfs_schedule_stop_276        |  14 +-
 .../raw/current_gtfs_schedule_stop_277        |  14 +-
 .../raw/current_gtfs_schedule_stop_278        |  14 +-
 .../raw/current_gtfs_schedule_stop_279        |  14 +-
 .../raw/current_gtfs_schedule_stop_28         |  14 +-
 .../raw/current_gtfs_schedule_stop_280        |  14 +-
 .../raw/current_gtfs_schedule_stop_281        |  14 +-
 .../raw/current_gtfs_schedule_stop_282        |  14 +-
 .../raw/current_gtfs_schedule_stop_283        |  14 +-
 .../raw/current_gtfs_schedule_stop_284        |  14 +-
 .../raw/current_gtfs_schedule_stop_285        |  14 +-
 .../raw/current_gtfs_schedule_stop_286        |  10 +-
 .../raw/current_gtfs_schedule_stop_287        |  14 +-
 .../raw/current_gtfs_schedule_stop_289        |  14 +-
 .../raw/current_gtfs_schedule_stop_29         |  14 +-
 .../raw/current_gtfs_schedule_stop_290        |  14 +-
 .../raw/current_gtfs_schedule_stop_291        |  10 +-
 .../raw/current_gtfs_schedule_stop_292        |  14 +-
 .../raw/current_gtfs_schedule_stop_293        |  14 +-
 .../raw/current_gtfs_schedule_stop_294        |  14 +-
 .../raw/current_gtfs_schedule_stop_295        |  14 +-
 .../raw/current_gtfs_schedule_stop_296        |  34 +--
 .../raw/current_gtfs_schedule_stop_297        |  14 +-
 .../raw/current_gtfs_schedule_stop_298        |  14 +-
 .../raw/current_gtfs_schedule_stop_299        |  14 +-
 .../raw/current_gtfs_schedule_stop_3          |  28 +--
 .../raw/current_gtfs_schedule_stop_30         |  14 +-
 .../raw/current_gtfs_schedule_stop_300        |  14 +-
 .../raw/current_gtfs_schedule_stop_301        |  14 +-
 .../raw/current_gtfs_schedule_stop_302        |  24 +-
 .../raw/current_gtfs_schedule_stop_303        |  24 +-
 .../raw/current_gtfs_schedule_stop_304        |  14 +-
 .../raw/current_gtfs_schedule_stop_305        |  14 +-
 .../raw/current_gtfs_schedule_stop_306        |  24 +-
 .../raw/current_gtfs_schedule_stop_307        |  14 +-
 .../raw/current_gtfs_schedule_stop_308        |  14 +-
 .../raw/current_gtfs_schedule_stop_309        |  14 +-
 .../raw/current_gtfs_schedule_stop_31         |  14 +-
 .../raw/current_gtfs_schedule_stop_310        |  14 +-
 .../raw/current_gtfs_schedule_stop_311        |  24 +-
 .../raw/current_gtfs_schedule_stop_312        |  14 +-
 .../raw/current_gtfs_schedule_stop_313        |  14 +-
 .../raw/current_gtfs_schedule_stop_314        |  24 +-
 .../raw/current_gtfs_schedule_stop_315        |  14 +-
 .../raw/current_gtfs_schedule_stop_317        |  14 +-
 .../raw/current_gtfs_schedule_stop_318        |  10 +-
 .../raw/current_gtfs_schedule_stop_319        |  14 +-
 .../raw/current_gtfs_schedule_stop_32         |  14 +-
 .../raw/current_gtfs_schedule_stop_320        |  14 +-
 .../raw/current_gtfs_schedule_stop_321        |  14 +-
 .../raw/current_gtfs_schedule_stop_322        |  24 +-
 .../raw/current_gtfs_schedule_stop_323        |  28 +--
 .../raw/current_gtfs_schedule_stop_324        |  28 +--
 .../raw/current_gtfs_schedule_stop_325        |  14 +-
 .../raw/current_gtfs_schedule_stop_327        |  14 +-
 .../raw/current_gtfs_schedule_stop_328        |  24 +-
 .../raw/current_gtfs_schedule_stop_329        |  10 +-
 .../raw/current_gtfs_schedule_stop_33         |  14 +-
 .../raw/current_gtfs_schedule_stop_330        |  14 +-
 .../raw/current_gtfs_schedule_stop_331        |  14 +-
 .../raw/current_gtfs_schedule_stop_332        |  14 +-
 .../raw/current_gtfs_schedule_stop_333        |  24 +-
 .../raw/current_gtfs_schedule_stop_334        |  24 +-
 .../raw/current_gtfs_schedule_stop_335        |  14 +-
 .../raw/current_gtfs_schedule_stop_336        |  14 +-
 .../raw/current_gtfs_schedule_stop_337        |  28 +--
 .../raw/current_gtfs_schedule_stop_338        |  14 +-
 .../raw/current_gtfs_schedule_stop_339        |  14 +-
 .../raw/current_gtfs_schedule_stop_34         |  14 +-
 .../raw/current_gtfs_schedule_stop_340        |  28 +--
 .../raw/current_gtfs_schedule_stop_341        |  24 +-
 .../raw/current_gtfs_schedule_stop_342        |  14 +-
 .../raw/current_gtfs_schedule_stop_343        |  24 +-
 .../raw/current_gtfs_schedule_stop_344        |  24 +-
 .../raw/current_gtfs_schedule_stop_345        |  10 +-
 .../raw/current_gtfs_schedule_stop_346        |  24 +-
 .../raw/current_gtfs_schedule_stop_347        |  24 +-
 .../raw/current_gtfs_schedule_stop_348        |  14 +-
 .../raw/current_gtfs_schedule_stop_35         |  14 +-
 .../raw/current_gtfs_schedule_stop_350        |  14 +-
 .../raw/current_gtfs_schedule_stop_351        |  28 +--
 .../raw/current_gtfs_schedule_stop_352        |  10 +-
 .../raw/current_gtfs_schedule_stop_354        |  28 +--
 .../raw/current_gtfs_schedule_stop_355        |  14 +-
 .../raw/current_gtfs_schedule_stop_356        |  10 +-
 .../raw/current_gtfs_schedule_stop_357        |  14 +-
 .../raw/current_gtfs_schedule_stop_358        |  28 +--
 .../raw/current_gtfs_schedule_stop_359        |  62 ++---
 .../raw/current_gtfs_schedule_stop_36         |  28 +--
 .../raw/current_gtfs_schedule_stop_360        |  14 +-
 .../raw/current_gtfs_schedule_stop_361        |  14 +-
 .../raw/current_gtfs_schedule_stop_362        |  24 +-
 .../raw/current_gtfs_schedule_stop_363        |  14 +-
 .../raw/current_gtfs_schedule_stop_364        |  28 +--
 .../raw/current_gtfs_schedule_stop_365        |  24 +-
 .../raw/current_gtfs_schedule_stop_366        |  28 +--
 .../raw/current_gtfs_schedule_stop_367        |  62 ++---
 .../raw/current_gtfs_schedule_stop_368        |  14 +-
 .../raw/current_gtfs_schedule_stop_369        |  18 +-
 .../raw/current_gtfs_schedule_stop_37         |  28 +--
 .../raw/current_gtfs_schedule_stop_370        |  14 +-
 .../raw/current_gtfs_schedule_stop_371        |  14 +-
 .../raw/current_gtfs_schedule_stop_372        |  14 +-
 .../raw/current_gtfs_schedule_stop_373        |  14 +-
 .../raw/current_gtfs_schedule_stop_374        |  24 +-
 .../raw/current_gtfs_schedule_stop_375        |  14 +-
 .../raw/current_gtfs_schedule_stop_376        |  24 +-
 .../raw/current_gtfs_schedule_stop_377        |  14 +-
 .../raw/current_gtfs_schedule_stop_378        |  14 +-
 .../raw/current_gtfs_schedule_stop_379        |  14 +-
 .../raw/current_gtfs_schedule_stop_38         |  14 +-
 .../raw/current_gtfs_schedule_stop_380        |  14 +-
 .../raw/current_gtfs_schedule_stop_381        |  28 +--
 .../raw/current_gtfs_schedule_stop_382        |  28 +--
 .../raw/current_gtfs_schedule_stop_383        |  14 +-
 .../raw/current_gtfs_schedule_stop_384        |  14 +-
 .../raw/current_gtfs_schedule_stop_385        |  18 +-
 .../raw/current_gtfs_schedule_stop_386        |  62 ++---
 .../raw/current_gtfs_schedule_stop_387        |  14 +-
 .../raw/current_gtfs_schedule_stop_388        |  24 +-
 .../raw/current_gtfs_schedule_stop_389        |  24 +-
 .../raw/current_gtfs_schedule_stop_39         |  14 +-
 .../raw/current_gtfs_schedule_stop_390        |  28 +--
 .../raw/current_gtfs_schedule_stop_391        |  14 +-
 .../raw/current_gtfs_schedule_stop_392        |  24 +-
 .../raw/current_gtfs_schedule_stop_393        |  24 +-
 .../raw/current_gtfs_schedule_stop_394        |  24 +-
 .../raw/current_gtfs_schedule_stop_395        |  24 +-
 .../raw/current_gtfs_schedule_stop_39506      |  14 +-
 .../raw/current_gtfs_schedule_stop_39507      |  14 +-
 .../raw/current_gtfs_schedule_stop_39508      |  28 +--
 .../raw/current_gtfs_schedule_stop_396        |  28 +--
 .../raw/current_gtfs_schedule_stop_397        |  24 +-
 .../raw/current_gtfs_schedule_stop_398        |  14 +-
 .../raw/current_gtfs_schedule_stop_399        |  14 +-
 .../raw/current_gtfs_schedule_stop_4          |  28 +--
 .../raw/current_gtfs_schedule_stop_40         |  14 +-
 .../raw/current_gtfs_schedule_stop_400        |  14 +-
 .../raw/current_gtfs_schedule_stop_401        |  28 +--
 .../raw/current_gtfs_schedule_stop_402        |  14 +-
 .../raw/current_gtfs_schedule_stop_403        |  14 +-
 .../raw/current_gtfs_schedule_stop_404        |  14 +-
 .../raw/current_gtfs_schedule_stop_405        |  14 +-
 .../raw/current_gtfs_schedule_stop_406        |  20 +-
 .../raw/current_gtfs_schedule_stop_407        |  28 +--
 .../raw/current_gtfs_schedule_stop_408        |  28 +--
 .../raw/current_gtfs_schedule_stop_409        |  28 +--
 .../raw/current_gtfs_schedule_stop_41         |  28 +--
 .../raw/current_gtfs_schedule_stop_410        |  24 +-
 .../raw/current_gtfs_schedule_stop_411        |  20 +-
 .../raw/current_gtfs_schedule_stop_412        |  14 +-
 .../raw/current_gtfs_schedule_stop_413        |  14 +-
 .../raw/current_gtfs_schedule_stop_414        |  14 +-
 .../raw/current_gtfs_schedule_stop_415        |  14 +-
 .../raw/current_gtfs_schedule_stop_416        |  14 +-
 .../raw/current_gtfs_schedule_stop_417        |  24 +-
 .../raw/current_gtfs_schedule_stop_418        |  14 +-
 .../raw/current_gtfs_schedule_stop_419        |  14 +-
 .../raw/current_gtfs_schedule_stop_42         |  14 +-
 .../raw/current_gtfs_schedule_stop_420        |  14 +-
 .../raw/current_gtfs_schedule_stop_421        |  14 +-
 .../raw/current_gtfs_schedule_stop_422        |  14 +-
 .../raw/current_gtfs_schedule_stop_423        |  14 +-
 .../raw/current_gtfs_schedule_stop_424        |  24 +-
 .../raw/current_gtfs_schedule_stop_425        |  14 +-
 .../raw/current_gtfs_schedule_stop_426        |  14 +-
 .../raw/current_gtfs_schedule_stop_427        |  24 +-
 .../raw/current_gtfs_schedule_stop_428        |  10 +-
 .../raw/current_gtfs_schedule_stop_429        |  24 +-
 .../raw/current_gtfs_schedule_stop_43         |  28 +--
 .../raw/current_gtfs_schedule_stop_430        |  24 +-
 .../raw/current_gtfs_schedule_stop_431        |  62 ++---
 .../raw/current_gtfs_schedule_stop_432        |  24 +-
 .../raw/current_gtfs_schedule_stop_433        |  24 +-
 .../raw/current_gtfs_schedule_stop_43309      |  14 +-
 .../raw/current_gtfs_schedule_stop_43313      |  20 +-
 .../raw/current_gtfs_schedule_stop_43314      |  10 +-
 .../raw/current_gtfs_schedule_stop_43315      |  10 +-
 .../raw/current_gtfs_schedule_stop_43316      |  14 +-
 .../raw/current_gtfs_schedule_stop_43317      |  10 +-
 .../raw/current_gtfs_schedule_stop_43318      |  14 +-
 .../raw/current_gtfs_schedule_stop_43319      |  10 +-
 .../raw/current_gtfs_schedule_stop_43320      |  10 +-
 .../raw/current_gtfs_schedule_stop_43321      |  10 +-
 .../raw/current_gtfs_schedule_stop_43322      |  10 +-
 .../raw/current_gtfs_schedule_stop_43323      |  10 +-
 .../raw/current_gtfs_schedule_stop_43324      |  10 +-
 .../raw/current_gtfs_schedule_stop_43325      |  14 +-
 .../raw/current_gtfs_schedule_stop_43326      |  10 +-
 .../raw/current_gtfs_schedule_stop_43327      |  14 +-
 .../raw/current_gtfs_schedule_stop_43328      |  10 +-
 .../raw/current_gtfs_schedule_stop_43329      |  14 +-
 .../raw/current_gtfs_schedule_stop_43330      |  14 +-
 .../raw/current_gtfs_schedule_stop_43331      |  10 +-
 .../raw/current_gtfs_schedule_stop_43332      |  10 +-
 .../raw/current_gtfs_schedule_stop_43333      |  10 +-
 .../raw/current_gtfs_schedule_stop_43334      |  10 +-
 .../raw/current_gtfs_schedule_stop_43335      |  10 +-
 .../raw/current_gtfs_schedule_stop_43336      |  10 +-
 .../raw/current_gtfs_schedule_stop_43337      |  10 +-
 .../raw/current_gtfs_schedule_stop_43338      |  10 +-
 .../raw/current_gtfs_schedule_stop_43339      |  10 +-
 .../raw/current_gtfs_schedule_stop_43340      |  10 +-
 .../raw/current_gtfs_schedule_stop_43341      |  14 +-
 .../raw/current_gtfs_schedule_stop_43342      |  14 +-
 .../raw/current_gtfs_schedule_stop_43343      |  14 +-
 .../raw/current_gtfs_schedule_stop_43344      |  10 +-
 .../raw/current_gtfs_schedule_stop_43345      |  10 +-
 .../raw/current_gtfs_schedule_stop_43346      |  14 +-
 .../raw/current_gtfs_schedule_stop_43347      |  14 +-
 .../raw/current_gtfs_schedule_stop_43348      |  14 +-
 .../raw/current_gtfs_schedule_stop_43349      |  10 +-
 .../raw/current_gtfs_schedule_stop_43350      |  14 +-
 .../raw/current_gtfs_schedule_stop_43351      |  14 +-
 .../raw/current_gtfs_schedule_stop_43352      |  10 +-
 .../raw/current_gtfs_schedule_stop_43353      |  10 +-
 .../raw/current_gtfs_schedule_stop_43354      |  10 +-
 .../raw/current_gtfs_schedule_stop_43355      |  14 +-
 .../raw/current_gtfs_schedule_stop_43356      |  14 +-
 .../raw/current_gtfs_schedule_stop_43357      |  14 +-
 .../raw/current_gtfs_schedule_stop_43358      |  10 +-
 .../raw/current_gtfs_schedule_stop_434        |  14 +-
 .../raw/current_gtfs_schedule_stop_435        |  24 +-
 .../raw/current_gtfs_schedule_stop_436        |  12 +-
 .../raw/current_gtfs_schedule_stop_437        |  24 +-
 .../raw/current_gtfs_schedule_stop_4371       |  10 +-
 .../raw/current_gtfs_schedule_stop_438        |  28 +--
 .../raw/current_gtfs_schedule_stop_439        |  10 +-
 .../raw/current_gtfs_schedule_stop_44         |  14 +-
 .../raw/current_gtfs_schedule_stop_440        |  20 +-
 .../raw/current_gtfs_schedule_stop_441        |  28 +--
 .../raw/current_gtfs_schedule_stop_442        |  42 ++--
 .../raw/current_gtfs_schedule_stop_443        |  18 +-
 .../raw/current_gtfs_schedule_stop_4435       |  14 +-
 .../raw/current_gtfs_schedule_stop_444        |  28 +--
 .../raw/current_gtfs_schedule_stop_445        |  42 ++--
 .../raw/current_gtfs_schedule_stop_446        |  28 +--
 .../raw/current_gtfs_schedule_stop_447        |  42 ++--
 .../raw/current_gtfs_schedule_stop_448        |  14 +-
 .../raw/current_gtfs_schedule_stop_449        |  14 +-
 .../raw/current_gtfs_schedule_stop_45         |  14 +-
 .../raw/current_gtfs_schedule_stop_450        |  28 +--
 .../raw/current_gtfs_schedule_stop_451        |  14 +-
 .../raw/current_gtfs_schedule_stop_452        |  14 +-
 .../raw/current_gtfs_schedule_stop_453        |  14 +-
 .../raw/current_gtfs_schedule_stop_454        |  28 +--
 .../raw/current_gtfs_schedule_stop_455        |  14 +-
 .../raw/current_gtfs_schedule_stop_456        |  14 +-
 .../raw/current_gtfs_schedule_stop_457        |  18 +-
 .../raw/current_gtfs_schedule_stop_458        |  14 +-
 .../raw/current_gtfs_schedule_stop_459        |  14 +-
 .../raw/current_gtfs_schedule_stop_46         |  28 +--
 .../raw/current_gtfs_schedule_stop_460        |  14 +-
 .../raw/current_gtfs_schedule_stop_461        |  14 +-
 .../raw/current_gtfs_schedule_stop_462        |  14 +-
 .../raw/current_gtfs_schedule_stop_463        |  14 +-
 .../raw/current_gtfs_schedule_stop_464        |  14 +-
 .../raw/current_gtfs_schedule_stop_465        |  14 +-
 .../raw/current_gtfs_schedule_stop_466        |  14 +-
 .../raw/current_gtfs_schedule_stop_467        |  14 +-
 .../raw/current_gtfs_schedule_stop_468        |  14 +-
 .../raw/current_gtfs_schedule_stop_469        |  18 +-
 .../raw/current_gtfs_schedule_stop_47         |  28 +--
 .../raw/current_gtfs_schedule_stop_470        |  14 +-
 .../raw/current_gtfs_schedule_stop_471        |  14 +-
 .../raw/current_gtfs_schedule_stop_472        |  14 +-
 .../raw/current_gtfs_schedule_stop_473        |  14 +-
 .../raw/current_gtfs_schedule_stop_474        |  14 +-
 .../raw/current_gtfs_schedule_stop_475        |  14 +-
 .../raw/current_gtfs_schedule_stop_476        |  14 +-
 .../raw/current_gtfs_schedule_stop_477        |  14 +-
 .../raw/current_gtfs_schedule_stop_478        |  14 +-
 .../raw/current_gtfs_schedule_stop_479        |  14 +-
 .../raw/current_gtfs_schedule_stop_48         |  14 +-
 .../raw/current_gtfs_schedule_stop_480        |  14 +-
 .../raw/current_gtfs_schedule_stop_481        |  14 +-
 .../raw/current_gtfs_schedule_stop_482        |  32 +--
 .../raw/current_gtfs_schedule_stop_483        |  14 +-
 .../raw/current_gtfs_schedule_stop_484        |  14 +-
 .../raw/current_gtfs_schedule_stop_485        |  14 +-
 .../raw/current_gtfs_schedule_stop_486        |  14 +-
 .../raw/current_gtfs_schedule_stop_487        |  14 +-
 .../raw/current_gtfs_schedule_stop_488        |  14 +-
 .../raw/current_gtfs_schedule_stop_489        |  14 +-
 .../raw/current_gtfs_schedule_stop_49         |  14 +-
 .../raw/current_gtfs_schedule_stop_490        |  14 +-
 .../raw/current_gtfs_schedule_stop_491        |  14 +-
 .../raw/current_gtfs_schedule_stop_49153      |  20 +-
 .../raw/current_gtfs_schedule_stop_49154      |  14 +-
 .../raw/current_gtfs_schedule_stop_492        |  14 +-
 .../raw/current_gtfs_schedule_stop_4925       |  24 +-
 .../raw/current_gtfs_schedule_stop_493        |  14 +-
 .../raw/current_gtfs_schedule_stop_494        |  14 +-
 .../raw/current_gtfs_schedule_stop_495        |  14 +-
 .../raw/current_gtfs_schedule_stop_496        |  14 +-
 .../raw/current_gtfs_schedule_stop_497        |  14 +-
 .../raw/current_gtfs_schedule_stop_498        |  14 +-
 .../raw/current_gtfs_schedule_stop_499        |  20 +-
 .../raw/current_gtfs_schedule_stop_5          |  42 ++--
 .../raw/current_gtfs_schedule_stop_50         |  28 +--
 .../raw/current_gtfs_schedule_stop_500        |  14 +-
 .../raw/current_gtfs_schedule_stop_501        |  14 +-
 .../raw/current_gtfs_schedule_stop_502        |  14 +-
 .../raw/current_gtfs_schedule_stop_503        |  14 +-
 .../raw/current_gtfs_schedule_stop_504        |  14 +-
 .../raw/current_gtfs_schedule_stop_505        |  14 +-
 .../raw/current_gtfs_schedule_stop_506        |  14 +-
 .../raw/current_gtfs_schedule_stop_507        |  14 +-
 .../raw/current_gtfs_schedule_stop_508        |  14 +-
 .../raw/current_gtfs_schedule_stop_509        |  14 +-
 .../raw/current_gtfs_schedule_stop_51         |  28 +--
 .../raw/current_gtfs_schedule_stop_510        |  14 +-
 .../raw/current_gtfs_schedule_stop_511        |  14 +-
 .../raw/current_gtfs_schedule_stop_512        |  24 +-
 .../raw/current_gtfs_schedule_stop_513        |  14 +-
 .../raw/current_gtfs_schedule_stop_514        |  14 +-
 .../raw/current_gtfs_schedule_stop_516        |  14 +-
 .../raw/current_gtfs_schedule_stop_517        |  12 +-
 .../raw/current_gtfs_schedule_stop_518        |  12 +-
 .../raw/current_gtfs_schedule_stop_519        |  14 +-
 .../raw/current_gtfs_schedule_stop_52         |  14 +-
 .../raw/current_gtfs_schedule_stop_520        |  14 +-
 .../raw/current_gtfs_schedule_stop_521        |  14 +-
 .../raw/current_gtfs_schedule_stop_522        |  14 +-
 .../raw/current_gtfs_schedule_stop_523        |  14 +-
 .../raw/current_gtfs_schedule_stop_524        |  14 +-
 .../raw/current_gtfs_schedule_stop_525        |  28 +--
 .../raw/current_gtfs_schedule_stop_526        |  14 +-
 .../raw/current_gtfs_schedule_stop_527        |  14 +-
 .../raw/current_gtfs_schedule_stop_528        |  14 +-
 .../raw/current_gtfs_schedule_stop_529        |  14 +-
 .../raw/current_gtfs_schedule_stop_53         |  14 +-
 .../raw/current_gtfs_schedule_stop_530        |  14 +-
 .../raw/current_gtfs_schedule_stop_531        |  14 +-
 .../raw/current_gtfs_schedule_stop_532        |  14 +-
 .../raw/current_gtfs_schedule_stop_533        |  14 +-
 .../raw/current_gtfs_schedule_stop_534        |  14 +-
 .../raw/current_gtfs_schedule_stop_535        |  12 +-
 .../raw/current_gtfs_schedule_stop_536        |  14 +-
 .../raw/current_gtfs_schedule_stop_537        |  12 +-
 .../raw/current_gtfs_schedule_stop_538        |  10 +-
 .../raw/current_gtfs_schedule_stop_539        |  14 +-
 .../raw/current_gtfs_schedule_stop_54         |  14 +-
 .../raw/current_gtfs_schedule_stop_540        |  14 +-
 .../raw/current_gtfs_schedule_stop_541        |  14 +-
 .../raw/current_gtfs_schedule_stop_542        |  14 +-
 .../raw/current_gtfs_schedule_stop_543        |  10 +-
 .../raw/current_gtfs_schedule_stop_544        |  14 +-
 .../raw/current_gtfs_schedule_stop_545        |  14 +-
 .../raw/current_gtfs_schedule_stop_546        |  14 +-
 .../raw/current_gtfs_schedule_stop_547        |  14 +-
 .../raw/current_gtfs_schedule_stop_548        |  14 +-
 .../raw/current_gtfs_schedule_stop_549        |  14 +-
 .../raw/current_gtfs_schedule_stop_55         |  14 +-
 .../raw/current_gtfs_schedule_stop_550        |  14 +-
 .../raw/current_gtfs_schedule_stop_551        |  14 +-
 .../raw/current_gtfs_schedule_stop_552        |  14 +-
 .../raw/current_gtfs_schedule_stop_553        |  14 +-
 .../raw/current_gtfs_schedule_stop_554        |  14 +-
 .../raw/current_gtfs_schedule_stop_555        |  14 +-
 .../raw/current_gtfs_schedule_stop_556        |  14 +-
 .../raw/current_gtfs_schedule_stop_557        |  14 +-
 .../raw/current_gtfs_schedule_stop_558        |  14 +-
 .../raw/current_gtfs_schedule_stop_559        |  14 +-
 .../raw/current_gtfs_schedule_stop_56         |  28 +--
 .../raw/current_gtfs_schedule_stop_560        |  14 +-
 .../raw/current_gtfs_schedule_stop_561        |  14 +-
 .../raw/current_gtfs_schedule_stop_562        |  14 +-
 .../raw/current_gtfs_schedule_stop_563        |  14 +-
 .../raw/current_gtfs_schedule_stop_564        |  14 +-
 .../raw/current_gtfs_schedule_stop_565        |  14 +-
 .../raw/current_gtfs_schedule_stop_566        |  14 +-
 .../raw/current_gtfs_schedule_stop_567        |  28 +--
 .../raw/current_gtfs_schedule_stop_568        |  28 +--
 .../raw/current_gtfs_schedule_stop_569        |  12 +-
 .../raw/current_gtfs_schedule_stop_57         |  14 +-
 .../raw/current_gtfs_schedule_stop_570        |  12 +-
 .../raw/current_gtfs_schedule_stop_571        |  14 +-
 .../raw/current_gtfs_schedule_stop_572        |  28 +--
 .../raw/current_gtfs_schedule_stop_573        |  28 +--
 .../raw/current_gtfs_schedule_stop_574        |  14 +-
 .../raw/current_gtfs_schedule_stop_575        |  14 +-
 .../raw/current_gtfs_schedule_stop_576        |  28 +--
 .../raw/current_gtfs_schedule_stop_577        |  28 +--
 .../raw/current_gtfs_schedule_stop_578        |  12 +-
 .../raw/current_gtfs_schedule_stop_579        |  14 +-
 .../raw/current_gtfs_schedule_stop_58         |  14 +-
 .../raw/current_gtfs_schedule_stop_580        |  28 +--
 .../raw/current_gtfs_schedule_stop_581        |  12 +-
 .../raw/current_gtfs_schedule_stop_582        |  42 ++--
 .../raw/current_gtfs_schedule_stop_583        |  14 +-
 .../raw/current_gtfs_schedule_stop_584        |  12 +-
 .../raw/current_gtfs_schedule_stop_585        |  10 +-
 .../raw/current_gtfs_schedule_stop_586        |  12 +-
 .../raw/current_gtfs_schedule_stop_587        |  42 ++--
 .../raw/current_gtfs_schedule_stop_588        |  12 +-
 .../raw/current_gtfs_schedule_stop_589        |  12 +-
 .../raw/current_gtfs_schedule_stop_59         |  14 +-
 .../raw/current_gtfs_schedule_stop_590        |  14 +-
 .../raw/current_gtfs_schedule_stop_591        |  14 +-
 .../raw/current_gtfs_schedule_stop_592        |  14 +-
 .../raw/current_gtfs_schedule_stop_593        |  14 +-
 .../raw/current_gtfs_schedule_stop_594        |  42 ++--
 .../raw/current_gtfs_schedule_stop_595        |  10 +-
 .../raw/current_gtfs_schedule_stop_596        |  14 +-
 .../raw/current_gtfs_schedule_stop_598        |  10 +-
 .../raw/current_gtfs_schedule_stop_599        |  14 +-
 .../raw/current_gtfs_schedule_stop_6          |  14 +-
 .../raw/current_gtfs_schedule_stop_60         |  14 +-
 .../raw/current_gtfs_schedule_stop_600        |  42 ++--
 .../raw/current_gtfs_schedule_stop_601        |  10 +-
 .../raw/current_gtfs_schedule_stop_602        |  42 ++--
 .../raw/current_gtfs_schedule_stop_603        |  14 +-
 .../raw/current_gtfs_schedule_stop_604        |  56 ++---
 .../raw/current_gtfs_schedule_stop_605        |  10 +-
 .../raw/current_gtfs_schedule_stop_606        |  12 +-
 .../raw/current_gtfs_schedule_stop_6061       |  14 +-
 .../raw/current_gtfs_schedule_stop_607        |  12 +-
 .../raw/current_gtfs_schedule_stop_608        |  10 +-
 .../raw/current_gtfs_schedule_stop_609        |  12 +-
 .../raw/current_gtfs_schedule_stop_61         |  14 +-
 .../raw/current_gtfs_schedule_stop_610        |  12 +-
 .../raw/current_gtfs_schedule_stop_611        |  14 +-
 .../raw/current_gtfs_schedule_stop_612        |  12 +-
 .../raw/current_gtfs_schedule_stop_613        |  12 +-
 .../raw/current_gtfs_schedule_stop_614        |  12 +-
 .../raw/current_gtfs_schedule_stop_615        |  14 +-
 .../raw/current_gtfs_schedule_stop_616        |  14 +-
 .../raw/current_gtfs_schedule_stop_617        |  14 +-
 .../raw/current_gtfs_schedule_stop_618        |  14 +-
 .../raw/current_gtfs_schedule_stop_619        |  14 +-
 .../raw/current_gtfs_schedule_stop_62         |  14 +-
 .../raw/current_gtfs_schedule_stop_620        |  12 +-
 .../raw/current_gtfs_schedule_stop_621        |  12 +-
 .../raw/current_gtfs_schedule_stop_622        |  14 +-
 .../raw/current_gtfs_schedule_stop_623        |  14 +-
 .../raw/current_gtfs_schedule_stop_624        |  14 +-
 .../raw/current_gtfs_schedule_stop_625        |  14 +-
 .../raw/current_gtfs_schedule_stop_626        |  14 +-
 .../raw/current_gtfs_schedule_stop_6260       |  14 +-
 .../raw/current_gtfs_schedule_stop_627        |  14 +-
 .../raw/current_gtfs_schedule_stop_6273       |  14 +-
 .../raw/current_gtfs_schedule_stop_628        |  14 +-
 .../raw/current_gtfs_schedule_stop_629        |  14 +-
 .../raw/current_gtfs_schedule_stop_63         |  14 +-
 .../raw/current_gtfs_schedule_stop_630        |  14 +-
 .../raw/current_gtfs_schedule_stop_631        |  14 +-
 .../raw/current_gtfs_schedule_stop_632        |  14 +-
 .../raw/current_gtfs_schedule_stop_6324       |  14 +-
 .../raw/current_gtfs_schedule_stop_6325       |  14 +-
 .../raw/current_gtfs_schedule_stop_633        |  14 +-
 .../raw/current_gtfs_schedule_stop_634        |  14 +-
 .../raw/current_gtfs_schedule_stop_63466      |  14 +-
 .../raw/current_gtfs_schedule_stop_63467      |  14 +-
 .../raw/current_gtfs_schedule_stop_635        |  14 +-
 .../raw/current_gtfs_schedule_stop_637        |  14 +-
 .../raw/current_gtfs_schedule_stop_638        |  14 +-
 .../raw/current_gtfs_schedule_stop_639        |  14 +-
 .../raw/current_gtfs_schedule_stop_64         |  14 +-
 .../raw/current_gtfs_schedule_stop_640        |  14 +-
 .../raw/current_gtfs_schedule_stop_641        |  14 +-
 .../raw/current_gtfs_schedule_stop_642        |  14 +-
 .../raw/current_gtfs_schedule_stop_643        |  14 +-
 .../raw/current_gtfs_schedule_stop_644        |  14 +-
 .../raw/current_gtfs_schedule_stop_645        |  14 +-
 .../raw/current_gtfs_schedule_stop_646        |  14 +-
 .../raw/current_gtfs_schedule_stop_647        |  14 +-
 .../raw/current_gtfs_schedule_stop_648        |  14 +-
 .../raw/current_gtfs_schedule_stop_649        |  14 +-
 .../raw/current_gtfs_schedule_stop_65         |  14 +-
 .../raw/current_gtfs_schedule_stop_650        |  14 +-
 .../raw/current_gtfs_schedule_stop_651        |  14 +-
 .../raw/current_gtfs_schedule_stop_652        |  14 +-
 .../raw/current_gtfs_schedule_stop_653        |  14 +-
 .../raw/current_gtfs_schedule_stop_654        |  14 +-
 .../raw/current_gtfs_schedule_stop_655        |  14 +-
 .../raw/current_gtfs_schedule_stop_656        |  12 +-
 .../raw/current_gtfs_schedule_stop_657        |  14 +-
 .../raw/current_gtfs_schedule_stop_658        |  24 +-
 .../raw/current_gtfs_schedule_stop_659        |  14 +-
 .../raw/current_gtfs_schedule_stop_66         |  14 +-
 .../raw/current_gtfs_schedule_stop_660        |  28 +--
 .../raw/current_gtfs_schedule_stop_661        |  24 +-
 .../raw/current_gtfs_schedule_stop_662        |  14 +-
 .../raw/current_gtfs_schedule_stop_663        |  14 +-
 .../raw/current_gtfs_schedule_stop_664        |  14 +-
 .../raw/current_gtfs_schedule_stop_665        |  14 +-
 .../raw/current_gtfs_schedule_stop_666        |  14 +-
 .../raw/current_gtfs_schedule_stop_667        |  14 +-
 .../raw/current_gtfs_schedule_stop_668        |  14 +-
 .../raw/current_gtfs_schedule_stop_669        |  14 +-
 .../raw/current_gtfs_schedule_stop_67         |  14 +-
 .../raw/current_gtfs_schedule_stop_670        |  14 +-
 .../raw/current_gtfs_schedule_stop_671        |  14 +-
 .../raw/current_gtfs_schedule_stop_672        |  14 +-
 .../raw/current_gtfs_schedule_stop_67265      |  10 +-
 .../raw/current_gtfs_schedule_stop_673        |  14 +-
 .../raw/current_gtfs_schedule_stop_674        |  14 +-
 .../raw/current_gtfs_schedule_stop_675        |  14 +-
 .../raw/current_gtfs_schedule_stop_676        |  14 +-
 .../raw/current_gtfs_schedule_stop_677        |  14 +-
 .../raw/current_gtfs_schedule_stop_678        |  14 +-
 .../raw/current_gtfs_schedule_stop_679        |  24 +-
 .../raw/current_gtfs_schedule_stop_68         |  14 +-
 .../raw/current_gtfs_schedule_stop_680        |  12 +-
 .../raw/current_gtfs_schedule_stop_681        |  14 +-
 .../raw/current_gtfs_schedule_stop_682        |  14 +-
 .../raw/current_gtfs_schedule_stop_683        |  14 +-
 .../raw/current_gtfs_schedule_stop_684        |  14 +-
 .../raw/current_gtfs_schedule_stop_685        |  24 +-
 .../raw/current_gtfs_schedule_stop_686        |  28 +--
 .../raw/current_gtfs_schedule_stop_687        |  14 +-
 .../raw/current_gtfs_schedule_stop_688        |  14 +-
 .../raw/current_gtfs_schedule_stop_689        |  14 +-
 .../raw/current_gtfs_schedule_stop_69         |  14 +-
 .../raw/current_gtfs_schedule_stop_690        |  14 +-
 .../raw/current_gtfs_schedule_stop_691        |  14 +-
 .../raw/current_gtfs_schedule_stop_69166      |  14 +-
 .../raw/current_gtfs_schedule_stop_692        |  14 +-
 .../raw/current_gtfs_schedule_stop_693        |  14 +-
 .../raw/current_gtfs_schedule_stop_694        |  14 +-
 .../raw/current_gtfs_schedule_stop_699        |  14 +-
 .../raw/current_gtfs_schedule_stop_7          |  42 ++--
 .../raw/current_gtfs_schedule_stop_70         |  28 +--
 .../raw/current_gtfs_schedule_stop_700        |  14 +-
 .../raw/current_gtfs_schedule_stop_701        |  14 +-
 .../raw/current_gtfs_schedule_stop_702        |  14 +-
 .../raw/current_gtfs_schedule_stop_703        |  14 +-
 .../raw/current_gtfs_schedule_stop_704        |  14 +-
 .../raw/current_gtfs_schedule_stop_705        |  14 +-
 .../raw/current_gtfs_schedule_stop_706        |  14 +-
 .../raw/current_gtfs_schedule_stop_707        |  14 +-
 .../raw/current_gtfs_schedule_stop_708        |  14 +-
 .../raw/current_gtfs_schedule_stop_709        |  14 +-
 .../raw/current_gtfs_schedule_stop_71         |  14 +-
 .../raw/current_gtfs_schedule_stop_710        |  14 +-
 .../raw/current_gtfs_schedule_stop_711        |  14 +-
 .../raw/current_gtfs_schedule_stop_712        |  14 +-
 .../raw/current_gtfs_schedule_stop_713        |  14 +-
 .../raw/current_gtfs_schedule_stop_714        |  14 +-
 .../raw/current_gtfs_schedule_stop_715        |  14 +-
 .../raw/current_gtfs_schedule_stop_716        |  14 +-
 .../raw/current_gtfs_schedule_stop_717        |  14 +-
 .../raw/current_gtfs_schedule_stop_718        |  14 +-
 .../raw/current_gtfs_schedule_stop_719        |  14 +-
 .../raw/current_gtfs_schedule_stop_72         |  28 +--
 .../raw/current_gtfs_schedule_stop_720        |  14 +-
 .../raw/current_gtfs_schedule_stop_721        |  14 +-
 .../raw/current_gtfs_schedule_stop_722        |  14 +-
 .../raw/current_gtfs_schedule_stop_723        |  24 +-
 .../raw/current_gtfs_schedule_stop_724        |  14 +-
 .../raw/current_gtfs_schedule_stop_725        |  28 +--
 .../raw/current_gtfs_schedule_stop_726        |  28 +--
 .../raw/current_gtfs_schedule_stop_727        |  14 +-
 .../raw/current_gtfs_schedule_stop_728        |  14 +-
 .../raw/current_gtfs_schedule_stop_729        |  14 +-
 .../raw/current_gtfs_schedule_stop_72995      |  14 +-
 .../raw/current_gtfs_schedule_stop_72996      |  14 +-
 .../raw/current_gtfs_schedule_stop_72997      |  24 +-
 .../raw/current_gtfs_schedule_stop_72998      |  24 +-
 .../raw/current_gtfs_schedule_stop_72999      |  14 +-
 .../raw/current_gtfs_schedule_stop_73         |  14 +-
 .../raw/current_gtfs_schedule_stop_730        |  14 +-
 .../raw/current_gtfs_schedule_stop_73000      |  14 +-
 .../raw/current_gtfs_schedule_stop_731        |  14 +-
 .../raw/current_gtfs_schedule_stop_732        |  14 +-
 .../raw/current_gtfs_schedule_stop_733        |  14 +-
 .../raw/current_gtfs_schedule_stop_734        |  14 +-
 .../raw/current_gtfs_schedule_stop_735        |  14 +-
 .../raw/current_gtfs_schedule_stop_736        |  14 +-
 .../raw/current_gtfs_schedule_stop_737        |  14 +-
 .../raw/current_gtfs_schedule_stop_738        |  14 +-
 .../raw/current_gtfs_schedule_stop_739        |  14 +-
 .../raw/current_gtfs_schedule_stop_74         |  14 +-
 .../raw/current_gtfs_schedule_stop_740        |  28 +--
 .../raw/current_gtfs_schedule_stop_741        |  28 +--
 .../raw/current_gtfs_schedule_stop_742        |  28 +--
 .../raw/current_gtfs_schedule_stop_743        |  28 +--
 .../raw/current_gtfs_schedule_stop_744        |  14 +-
 .../raw/current_gtfs_schedule_stop_745        |  14 +-
 .../raw/current_gtfs_schedule_stop_746        |  14 +-
 .../raw/current_gtfs_schedule_stop_747        |  14 +-
 .../raw/current_gtfs_schedule_stop_748        |  14 +-
 .../raw/current_gtfs_schedule_stop_749        |  14 +-
 .../raw/current_gtfs_schedule_stop_74943      |  14 +-
 .../raw/current_gtfs_schedule_stop_750        |  14 +-
 .../raw/current_gtfs_schedule_stop_751        |  14 +-
 .../raw/current_gtfs_schedule_stop_753        |  14 +-
 .../raw/current_gtfs_schedule_stop_754        |  28 +--
 .../raw/current_gtfs_schedule_stop_755        |  10 +-
 .../raw/current_gtfs_schedule_stop_758        |  10 +-
 .../raw/current_gtfs_schedule_stop_759        |  10 +-
 .../raw/current_gtfs_schedule_stop_76         |  14 +-
 .../raw/current_gtfs_schedule_stop_760        |  10 +-
 .../raw/current_gtfs_schedule_stop_761        |  10 +-
 .../raw/current_gtfs_schedule_stop_762        |  20 +-
 .../raw/current_gtfs_schedule_stop_763        |  14 +-
 .../raw/current_gtfs_schedule_stop_764        |  14 +-
 .../raw/current_gtfs_schedule_stop_765        |  12 +-
 .../raw/current_gtfs_schedule_stop_766        |  14 +-
 .../raw/current_gtfs_schedule_stop_768        |  24 +-
 .../raw/current_gtfs_schedule_stop_769        |  14 +-
 .../raw/current_gtfs_schedule_stop_77         |  14 +-
 .../raw/current_gtfs_schedule_stop_770        |  10 +-
 .../raw/current_gtfs_schedule_stop_771        |  14 +-
 .../raw/current_gtfs_schedule_stop_772        |  14 +-
 .../raw/current_gtfs_schedule_stop_773        |  38 +--
 .../raw/current_gtfs_schedule_stop_774        | 112 ++++-----
 .../raw/current_gtfs_schedule_stop_775        |  42 ++--
 .../raw/current_gtfs_schedule_stop_776        |  14 +-
 .../raw/current_gtfs_schedule_stop_777        |  24 +-
 .../raw/current_gtfs_schedule_stop_778        |  28 +--
 .../raw/current_gtfs_schedule_stop_77831      |  48 ++--
 .../raw/current_gtfs_schedule_stop_77832      |  14 +-
 .../raw/current_gtfs_schedule_stop_77833      |  14 +-
 .../raw/current_gtfs_schedule_stop_779        |  56 ++---
 .../raw/current_gtfs_schedule_stop_78         |  14 +-
 .../raw/current_gtfs_schedule_stop_780        |  38 +--
 .../raw/current_gtfs_schedule_stop_781        |  14 +-
 .../raw/current_gtfs_schedule_stop_782        |  10 +-
 .../raw/current_gtfs_schedule_stop_783        |  10 +-
 .../raw/current_gtfs_schedule_stop_784        |  10 +-
 .../raw/current_gtfs_schedule_stop_785        |  14 +-
 .../raw/current_gtfs_schedule_stop_786        |  14 +-
 .../raw/current_gtfs_schedule_stop_787        |  14 +-
 .../raw/current_gtfs_schedule_stop_788        |  14 +-
 .../raw/current_gtfs_schedule_stop_789        |  14 +-
 .../raw/current_gtfs_schedule_stop_79         |  14 +-
 .../raw/current_gtfs_schedule_stop_790        |  14 +-
 .../raw/current_gtfs_schedule_stop_791        |  14 +-
 .../raw/current_gtfs_schedule_stop_792        |  14 +-
 .../raw/current_gtfs_schedule_stop_793        |  14 +-
 .../raw/current_gtfs_schedule_stop_794        |  14 +-
 .../raw/current_gtfs_schedule_stop_795        |  14 +-
 .../raw/current_gtfs_schedule_stop_796        |  14 +-
 .../raw/current_gtfs_schedule_stop_797        |  14 +-
 .../raw/current_gtfs_schedule_stop_798        |  14 +-
 .../raw/current_gtfs_schedule_stop_799        |  14 +-
 .../raw/current_gtfs_schedule_stop_8          |  28 +--
 .../raw/current_gtfs_schedule_stop_80         |  14 +-
 .../raw/current_gtfs_schedule_stop_800        |  14 +-
 .../raw/current_gtfs_schedule_stop_801        |  14 +-
 .../raw/current_gtfs_schedule_stop_802        |  14 +-
 .../raw/current_gtfs_schedule_stop_803        |  14 +-
 .../raw/current_gtfs_schedule_stop_804        |  14 +-
 .../raw/current_gtfs_schedule_stop_805        |  14 +-
 .../raw/current_gtfs_schedule_stop_806        |  14 +-
 .../raw/current_gtfs_schedule_stop_807        |  14 +-
 .../raw/current_gtfs_schedule_stop_808        |  14 +-
 .../raw/current_gtfs_schedule_stop_809        |  14 +-
 .../raw/current_gtfs_schedule_stop_81         |  14 +-
 .../raw/current_gtfs_schedule_stop_810        |  14 +-
 .../raw/current_gtfs_schedule_stop_811        |  14 +-
 .../raw/current_gtfs_schedule_stop_812        |  14 +-
 .../raw/current_gtfs_schedule_stop_813        |  14 +-
 .../raw/current_gtfs_schedule_stop_814        |  14 +-
 .../raw/current_gtfs_schedule_stop_815        |  14 +-
 .../raw/current_gtfs_schedule_stop_816        |  38 +--
 .../raw/current_gtfs_schedule_stop_817        |  28 +--
 .../raw/current_gtfs_schedule_stop_819        |  28 +--
 .../raw/current_gtfs_schedule_stop_82         |  14 +-
 .../raw/current_gtfs_schedule_stop_820        |  10 +-
 .../raw/current_gtfs_schedule_stop_821        |  14 +-
 .../raw/current_gtfs_schedule_stop_822        |  10 +-
 .../raw/current_gtfs_schedule_stop_823        |  10 +-
 .../raw/current_gtfs_schedule_stop_824        |  10 +-
 .../raw/current_gtfs_schedule_stop_825        |  10 +-
 .../raw/current_gtfs_schedule_stop_826        |  10 +-
 .../raw/current_gtfs_schedule_stop_827        |  10 +-
 .../raw/current_gtfs_schedule_stop_828        |  10 +-
 .../raw/current_gtfs_schedule_stop_829        |  34 +--
 .../raw/current_gtfs_schedule_stop_83         |  14 +-
 .../raw/current_gtfs_schedule_stop_830        |  14 +-
 .../raw/current_gtfs_schedule_stop_831        |  14 +-
 .../raw/current_gtfs_schedule_stop_832        |  14 +-
 .../raw/current_gtfs_schedule_stop_833        |  10 +-
 .../raw/current_gtfs_schedule_stop_835        |  14 +-
 .../raw/current_gtfs_schedule_stop_836        |  14 +-
 .../raw/current_gtfs_schedule_stop_837        |  14 +-
 .../raw/current_gtfs_schedule_stop_838        |  14 +-
 .../raw/current_gtfs_schedule_stop_839        |  10 +-
 .../raw/current_gtfs_schedule_stop_84         |  14 +-
 .../raw/current_gtfs_schedule_stop_840        |  10 +-
 .../raw/current_gtfs_schedule_stop_841        |  10 +-
 .../raw/current_gtfs_schedule_stop_842        |  10 +-
 .../raw/current_gtfs_schedule_stop_843        |  10 +-
 .../raw/current_gtfs_schedule_stop_844        |  10 +-
 .../raw/current_gtfs_schedule_stop_845        |  10 +-
 .../raw/current_gtfs_schedule_stop_846        |  10 +-
 .../raw/current_gtfs_schedule_stop_847        |  10 +-
 .../raw/current_gtfs_schedule_stop_848        |  10 +-
 .../raw/current_gtfs_schedule_stop_849        |  10 +-
 .../raw/current_gtfs_schedule_stop_85         |  14 +-
 .../raw/current_gtfs_schedule_stop_850        |  10 +-
 .../raw/current_gtfs_schedule_stop_851        |  10 +-
 .../raw/current_gtfs_schedule_stop_852        |  10 +-
 .../raw/current_gtfs_schedule_stop_853        |  10 +-
 .../raw/current_gtfs_schedule_stop_854        |  10 +-
 .../raw/current_gtfs_schedule_stop_855        |  10 +-
 .../raw/current_gtfs_schedule_stop_856        |  14 +-
 .../raw/current_gtfs_schedule_stop_857        |  14 +-
 .../raw/current_gtfs_schedule_stop_858        |  10 +-
 .../raw/current_gtfs_schedule_stop_859        |   4 +-
 .../raw/current_gtfs_schedule_stop_86         |  14 +-
 .../raw/current_gtfs_schedule_stop_860        |  24 +-
 .../raw/current_gtfs_schedule_stop_861        |  24 +-
 .../raw/current_gtfs_schedule_stop_862        |  28 +--
 .../raw/current_gtfs_schedule_stop_863        |  28 +--
 .../raw/current_gtfs_schedule_stop_864        |  26 +-
 .../raw/current_gtfs_schedule_stop_865        |  20 +-
 .../raw/current_gtfs_schedule_stop_8655       |  12 +-
 .../raw/current_gtfs_schedule_stop_866        |  26 +-
 .../raw/current_gtfs_schedule_stop_867        |  26 +-
 .../raw/current_gtfs_schedule_stop_868        |  26 +-
 .../raw/current_gtfs_schedule_stop_869        |  26 +-
 .../raw/current_gtfs_schedule_stop_87         |  14 +-
 .../raw/current_gtfs_schedule_stop_870        |  14 +-
 .../raw/current_gtfs_schedule_stop_871        |  14 +-
 .../raw/current_gtfs_schedule_stop_872        |  14 +-
 .../raw/current_gtfs_schedule_stop_873        |  14 +-
 .../raw/current_gtfs_schedule_stop_874        |  14 +-
 .../raw/current_gtfs_schedule_stop_875        |  14 +-
 .../raw/current_gtfs_schedule_stop_876        |  14 +-
 .../raw/current_gtfs_schedule_stop_877        |  70 +++---
 .../raw/current_gtfs_schedule_stop_878        |  14 +-
 .../raw/current_gtfs_schedule_stop_879        |  14 +-
 .../raw/current_gtfs_schedule_stop_88         |  14 +-
 .../raw/current_gtfs_schedule_stop_880        |  14 +-
 .../raw/current_gtfs_schedule_stop_881        |  14 +-
 .../raw/current_gtfs_schedule_stop_882        |  24 +-
 .../raw/current_gtfs_schedule_stop_883        |  14 +-
 .../raw/current_gtfs_schedule_stop_884        |  10 +-
 .../raw/current_gtfs_schedule_stop_885        |  10 +-
 .../raw/current_gtfs_schedule_stop_886        |  10 +-
 .../raw/current_gtfs_schedule_stop_887        |  10 +-
 .../raw/current_gtfs_schedule_stop_888        |  10 +-
 .../raw/current_gtfs_schedule_stop_889        |  10 +-
 .../raw/current_gtfs_schedule_stop_89         |  28 +--
 .../raw/current_gtfs_schedule_stop_890        |  10 +-
 .../raw/current_gtfs_schedule_stop_891        |  10 +-
 .../raw/current_gtfs_schedule_stop_892        |  14 +-
 .../raw/current_gtfs_schedule_stop_893        |  14 +-
 .../raw/current_gtfs_schedule_stop_89387      |  10 +-
 .../raw/current_gtfs_schedule_stop_89392      |  14 +-
 .../raw/current_gtfs_schedule_stop_89399      |  14 +-
 .../raw/current_gtfs_schedule_stop_894        |  14 +-
 .../raw/current_gtfs_schedule_stop_89400      |  24 +-
 .../raw/current_gtfs_schedule_stop_89401      |  24 +-
 .../raw/current_gtfs_schedule_stop_895        |  14 +-
 .../raw/current_gtfs_schedule_stop_896        |  28 +--
 .../raw/current_gtfs_schedule_stop_8964       |  10 +-
 .../raw/current_gtfs_schedule_stop_8965       |  10 +-
 .../raw/current_gtfs_schedule_stop_897        |  10 +-
 .../raw/current_gtfs_schedule_stop_898        |  10 +-
 .../raw/current_gtfs_schedule_stop_9          |  38 +--
 .../raw/current_gtfs_schedule_stop_90         |  14 +-
 .../raw/current_gtfs_schedule_stop_9055       |  26 +-
 .../raw/current_gtfs_schedule_stop_91         |  14 +-
 .../raw/current_gtfs_schedule_stop_92         |  14 +-
 .../raw/current_gtfs_schedule_stop_92327      |  24 +-
 .../raw/current_gtfs_schedule_stop_92328      |  24 +-
 .../raw/current_gtfs_schedule_stop_93         |  28 +--
 .../raw/current_gtfs_schedule_stop_94         |  14 +-
 .../raw/current_gtfs_schedule_stop_94267      |  14 +-
 .../raw/current_gtfs_schedule_stop_95         |  14 +-
 .../raw/current_gtfs_schedule_stop_96         |  28 +--
 .../raw/current_gtfs_schedule_stop_97         |  28 +--
 .../raw/current_gtfs_schedule_stop_974        |  14 +-
 .../raw/current_gtfs_schedule_stop_98         |  28 +--
 .../raw/current_gtfs_schedule_stop_99         |  14 +-
 .../values/current_gtfs_rts_values_gen.xml    |   2 +-
 src/main/res/values/gtfs_rts_values.xml       |   2 +-
 973 files changed, 8638 insertions(+), 8642 deletions(-)

diff --git a/src/main/play/release-notes/en-US/default.txt b/src/main/play/release-notes/en-US/default.txt
index b56f9e7ae..2d4d07417 100644
--- a/src/main/play/release-notes/en-US/default.txt
+++ b/src/main/play/release-notes/en-US/default.txt
@@ -1,3 +1,3 @@
-Schedule from September 3, 2023 to December 30, 2023.
+Schedule from September 7, 2023 to December 30, 2023.
 Real-time predictions from NextRide.
 Tweets from @BCTransit.
diff --git a/src/main/res-current/raw/current_gtfs_schedule_service_dates b/src/main/res-current/raw/current_gtfs_schedule_service_dates
index 5b0f3d981..86b5ed115 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_service_dates
+++ b/src/main/res-current/raw/current_gtfs_schedule_service_dates
@@ -1,119 +1,115 @@
-'576',20230903
-'576',20230904
-'577',20230905
-'578',20230906
-'579',20230907
-'580',20230908
-'581',20230909
-'576',20230910
-'582',20230911
-'577',20230912
-'578',20230913
-'579',20230914
-'580',20230915
-'581',20230916
-'576',20230917
-'582',20230918
-'577',20230919
-'578',20230920
-'579',20230921
-'580',20230922
-'581',20230923
-'576',20230924
-'582',20230925
-'577',20230926
-'578',20230927
-'579',20230928
-'580',20230929
-'581',20230930
-'576',20231001
-'582',20231002
-'577',20231003
-'578',20231004
-'579',20231005
-'580',20231006
-'581',20231007
-'576',20231008
-'576',20231009
-'577',20231010
-'578',20231011
-'579',20231012
-'580',20231013
-'581',20231014
-'576',20231015
-'582',20231016
-'577',20231017
-'578',20231018
-'579',20231019
-'580',20231020
-'581',20231021
-'576',20231022
-'582',20231023
-'577',20231024
-'578',20231025
-'579',20231026
-'580',20231027
-'581',20231028
-'576',20231029
-'582',20231030
-'577',20231031
-'578',20231101
-'579',20231102
-'580',20231103
-'581',20231104
-'576',20231105
-'582',20231106
-'577',20231107
-'578',20231108
-'579',20231109
-'580',20231110
-'576',20231111
-'576',20231112
-'582',20231113
-'577',20231114
-'578',20231115
-'579',20231116
-'580',20231117
-'581',20231118
-'576',20231119
-'582',20231120
-'577',20231121
-'578',20231122
-'579',20231123
-'580',20231124
-'581',20231125
-'576',20231126
-'582',20231127
-'577',20231128
-'578',20231129
-'579',20231130
-'580',20231201
-'581',20231202
-'576',20231203
-'582',20231204
-'577',20231205
-'578',20231206
-'579',20231207
-'580',20231208
-'581',20231209
-'576',20231210
-'582',20231211
-'577',20231212
-'578',20231213
-'579',20231214
-'580',20231215
-'581',20231216
-'576',20231217
-'582',20231218
-'577',20231219
-'578',20231220
-'579',20231221
-'580',20231222
-'581',20231223
-'576',20231224
-'576',20231225
-'577',20231226
-'578',20231227
-'579',20231228
-'580',20231229
-'581',20231230
+'583',20230907
+'584',20230908
+'585',20230909
+'586',20230910
+'587',20230911
+'588',20230912
+'589',20230913
+'583',20230914
+'584',20230915
+'585',20230916
+'586',20230917
+'587',20230918
+'588',20230919
+'589',20230920
+'583',20230921
+'584',20230922
+'585',20230923
+'586',20230924
+'587',20230925
+'588',20230926
+'589',20230927
+'583',20230928
+'584',20230929
+'585',20230930
+'586',20231001
+'587',20231002
+'588',20231003
+'589',20231004
+'583',20231005
+'584',20231006
+'585',20231007
+'586',20231008
+'586',20231009
+'588',20231010
+'589',20231011
+'583',20231012
+'584',20231013
+'585',20231014
+'586',20231015
+'587',20231016
+'588',20231017
+'589',20231018
+'583',20231019
+'584',20231020
+'585',20231021
+'586',20231022
+'587',20231023
+'588',20231024
+'589',20231025
+'583',20231026
+'584',20231027
+'585',20231028
+'586',20231029
+'587',20231030
+'588',20231031
+'589',20231101
+'583',20231102
+'584',20231103
+'585',20231104
+'586',20231105
+'587',20231106
+'588',20231107
+'589',20231108
+'583',20231109
+'584',20231110
+'586',20231111
+'586',20231112
+'587',20231113
+'588',20231114
+'589',20231115
+'583',20231116
+'584',20231117
+'585',20231118
+'586',20231119
+'587',20231120
+'588',20231121
+'589',20231122
+'583',20231123
+'584',20231124
+'585',20231125
+'586',20231126
+'587',20231127
+'588',20231128
+'589',20231129
+'583',20231130
+'584',20231201
+'585',20231202
+'586',20231203
+'587',20231204
+'588',20231205
+'589',20231206
+'583',20231207
+'584',20231208
+'585',20231209
+'586',20231210
+'587',20231211
+'588',20231212
+'589',20231213
+'583',20231214
+'584',20231215
+'585',20231216
+'586',20231217
+'587',20231218
+'588',20231219
+'589',20231220
+'583',20231221
+'584',20231222
+'585',20231223
+'586',20231224
+'586',20231225
+'588',20231226
+'589',20231227
+'583',20231228
+'584',20231229
+'585',20231230
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_1 b/src/main/res-current/raw/current_gtfs_schedule_stop_1
index 19f4bb3ed..d4e98b7cf 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_1
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_1
@@ -1,14 +1,14 @@
-'576',1001,84100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'577',1001,63600,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'578',1001,63600,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'579',1001,63600,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'580',1001,63600,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'581',1001,81600,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',1001,63600,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'576',1901,75400,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'577',1901,70900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'578',1901,70900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'579',1901,70900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'580',1901,70900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'581',1901,75300,,'',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,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'582',1901,70900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'583',1001,63600,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'584',1001,63600,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'585',1001,81600,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',1001,84100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'587',1001,63600,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'588',1001,63600,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'589',1001,63600,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'583',1901,70900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'584',1901,70900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'585',1901,75300,,'',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,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'586',1901,75400,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'587',1901,70900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'588',1901,70900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'589',1901,70900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_10 b/src/main/res-current/raw/current_gtfs_schedule_stop_10
index 70a88c2aa..e834bfff2 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_10
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_10
@@ -1,7 +1,7 @@
-'576',3000,72800,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,4,'',0,9100,4,'',0
-'577',3000,54500,,'',0,7300,,'',0,2100,,'',0,1100,,'',0,900,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,600,4,'',0,800,,'',0,600,4,'',0,5200,,'',0,1100,4,'',0,1300,,'',0,1400,4,'',0,1700,,'',0,5500,4,'',0,1600,,'',0,1400,4,'',0,1600,,'',0,5400,4,'',0,1600,,'',0,1400,4,'',0,1600,,'',0,5400,4,'',0,1600,,'',0,1400,4,'',0,5700,,'',0,1500,4,'',0,1800,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1500,,'',0,1000,4,'',0,900,,'',0,4900,4,'',0,900,,'',0,800,4,'',0,800,,'',0,900,4,'',0,900,,'',0,900,4,'',0,4900,,'',0,900,4,'',0,900,,'',0,900,4,'',0,900,,'',0,900,4,'',0,4900,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,4,'',0,6500,,'',0,2400,4,'',0,2600,,'',0,6300,4,'',0,2400,,'',0,6400,4,'',0,2600,,'',0,6500,4,'',0,2500,4,'',0
-'578',3000,54500,,'',0,7300,,'',0,2100,,'',0,1100,,'',0,900,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,600,4,'',0,800,,'',0,600,4,'',0,5200,,'',0,1100,4,'',0,1300,,'',0,1400,4,'',0,1700,,'',0,5500,4,'',0,1600,,'',0,1400,4,'',0,1600,,'',0,5400,4,'',0,1600,,'',0,1400,4,'',0,1600,,'',0,5400,4,'',0,1600,,'',0,1400,4,'',0,5700,,'',0,1500,4,'',0,1800,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1500,,'',0,1000,4,'',0,900,,'',0,4900,4,'',0,900,,'',0,800,4,'',0,800,,'',0,900,4,'',0,900,,'',0,900,4,'',0,4900,,'',0,900,4,'',0,900,,'',0,900,4,'',0,900,,'',0,900,4,'',0,4900,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,4,'',0,6500,,'',0,2400,4,'',0,2600,,'',0,6300,4,'',0,2400,,'',0,6400,4,'',0,2600,,'',0,6500,4,'',0,2500,4,'',0
-'579',3000,54500,,'',0,7300,,'',0,2100,,'',0,1100,,'',0,900,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,600,4,'',0,800,,'',0,600,4,'',0,5200,,'',0,1100,4,'',0,1300,,'',0,1400,4,'',0,1700,,'',0,5500,4,'',0,1600,,'',0,1400,4,'',0,1600,,'',0,5400,4,'',0,1600,,'',0,1400,4,'',0,1600,,'',0,5400,4,'',0,1600,,'',0,1400,4,'',0,5700,,'',0,1500,4,'',0,1800,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1500,,'',0,1000,4,'',0,900,,'',0,4900,4,'',0,900,,'',0,800,4,'',0,800,,'',0,900,4,'',0,900,,'',0,900,4,'',0,4900,,'',0,900,4,'',0,900,,'',0,900,4,'',0,900,,'',0,900,4,'',0,4900,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,4,'',0,6500,,'',0,2400,4,'',0,2600,,'',0,6300,4,'',0,2400,,'',0,6400,4,'',0,2600,,'',0,6500,4,'',0,2500,4,'',0
-'580',3000,54500,,'',0,7300,,'',0,2100,,'',0,1100,,'',0,900,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,600,4,'',0,800,,'',0,600,4,'',0,5200,,'',0,1100,4,'',0,1300,,'',0,1400,4,'',0,1700,,'',0,5500,4,'',0,1600,,'',0,1400,4,'',0,1600,,'',0,5400,4,'',0,1600,,'',0,1400,4,'',0,1600,,'',0,5400,4,'',0,1600,,'',0,1400,4,'',0,5700,,'',0,1500,4,'',0,1800,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1500,,'',0,1000,4,'',0,900,,'',0,4900,4,'',0,900,,'',0,800,4,'',0,800,,'',0,900,4,'',0,900,,'',0,900,4,'',0,4900,,'',0,900,4,'',0,900,,'',0,900,4,'',0,900,,'',0,900,4,'',0,4900,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,4,'',0,6500,,'',0,2400,4,'',0,2600,,'',0,6300,4,'',0,2400,,'',0,6400,4,'',0,2600,,'',0,6500,4,'',0,2500,4,'',0,8000,4,'',0,4000,4,'',0
-'581',3000,70800,,'',0,5000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,4,'',0,3000,,'',0,7000,4,'',0,3000,,'',0,7000,4,'',0,3000,,'',0,7000,4,'',0,3000,,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,1700,4,'',0
-'582',3000,54500,,'',0,7300,,'',0,2100,,'',0,1100,,'',0,900,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,600,4,'',0,800,,'',0,600,4,'',0,5200,,'',0,1100,4,'',0,1300,,'',0,1400,4,'',0,1700,,'',0,5500,4,'',0,1600,,'',0,1400,4,'',0,1600,,'',0,5400,4,'',0,1600,,'',0,1400,4,'',0,1600,,'',0,5400,4,'',0,1600,,'',0,1400,4,'',0,5700,,'',0,1500,4,'',0,1800,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1500,,'',0,1000,4,'',0,900,,'',0,4900,4,'',0,900,,'',0,800,4,'',0,800,,'',0,900,4,'',0,900,,'',0,900,4,'',0,4900,,'',0,900,4,'',0,900,,'',0,900,4,'',0,900,,'',0,900,4,'',0,4900,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,4,'',0,6500,,'',0,2400,4,'',0,2600,,'',0,6300,4,'',0,2400,,'',0,6400,4,'',0,2600,,'',0,6500,4,'',0,2500,4,'',0
+'583',3000,54500,,'',0,7300,,'',0,2100,,'',0,1100,,'',0,900,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,600,4,'',0,800,,'',0,600,4,'',0,5200,,'',0,1100,4,'',0,1300,,'',0,1400,4,'',0,1700,,'',0,5500,4,'',0,1600,,'',0,1400,4,'',0,1600,,'',0,5400,4,'',0,1600,,'',0,1400,4,'',0,1600,,'',0,5400,4,'',0,1600,,'',0,1400,4,'',0,5700,,'',0,1500,4,'',0,1800,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1500,,'',0,1000,4,'',0,900,,'',0,4900,4,'',0,900,,'',0,800,4,'',0,800,,'',0,900,4,'',0,900,,'',0,900,4,'',0,4900,,'',0,900,4,'',0,900,,'',0,900,4,'',0,900,,'',0,900,4,'',0,4900,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,4,'',0,6500,,'',0,2400,4,'',0,2600,,'',0,6300,4,'',0,2400,,'',0,6400,4,'',0,2600,,'',0,6500,4,'',0,2500,4,'',0
+'584',3000,54500,,'',0,7300,,'',0,2100,,'',0,1100,,'',0,900,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,600,4,'',0,800,,'',0,600,4,'',0,5200,,'',0,1100,4,'',0,1300,,'',0,1400,4,'',0,1700,,'',0,5500,4,'',0,1600,,'',0,1400,4,'',0,1600,,'',0,5400,4,'',0,1600,,'',0,1400,4,'',0,1600,,'',0,5400,4,'',0,1600,,'',0,1400,4,'',0,5700,,'',0,1500,4,'',0,1800,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1500,,'',0,1000,4,'',0,900,,'',0,4900,4,'',0,900,,'',0,800,4,'',0,800,,'',0,900,4,'',0,900,,'',0,900,4,'',0,4900,,'',0,900,4,'',0,900,,'',0,900,4,'',0,900,,'',0,900,4,'',0,4900,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,4,'',0,6500,,'',0,2400,4,'',0,2600,,'',0,6300,4,'',0,2400,,'',0,6400,4,'',0,2600,,'',0,6500,4,'',0,2500,4,'',0,8000,4,'',0,4000,4,'',0
+'585',3000,70800,,'',0,5000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,4,'',0,3000,,'',0,7000,4,'',0,3000,,'',0,7000,4,'',0,3000,,'',0,7000,4,'',0,3000,,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,1700,4,'',0
+'586',3000,72800,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,4,'',0,9100,4,'',0
+'587',3000,54500,,'',0,7300,,'',0,2100,,'',0,1100,,'',0,900,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,600,4,'',0,800,,'',0,600,4,'',0,5200,,'',0,1100,4,'',0,1300,,'',0,1400,4,'',0,1700,,'',0,5500,4,'',0,1600,,'',0,1400,4,'',0,1600,,'',0,5400,4,'',0,1600,,'',0,1400,4,'',0,1600,,'',0,5400,4,'',0,1600,,'',0,1400,4,'',0,5700,,'',0,1500,4,'',0,1800,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1500,,'',0,1000,4,'',0,900,,'',0,4900,4,'',0,900,,'',0,800,4,'',0,800,,'',0,900,4,'',0,900,,'',0,900,4,'',0,4900,,'',0,900,4,'',0,900,,'',0,900,4,'',0,900,,'',0,900,4,'',0,4900,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,4,'',0,6500,,'',0,2400,4,'',0,2600,,'',0,6300,4,'',0,2400,,'',0,6400,4,'',0,2600,,'',0,6500,4,'',0,2500,4,'',0
+'588',3000,54500,,'',0,7300,,'',0,2100,,'',0,1100,,'',0,900,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,600,4,'',0,800,,'',0,600,4,'',0,5200,,'',0,1100,4,'',0,1300,,'',0,1400,4,'',0,1700,,'',0,5500,4,'',0,1600,,'',0,1400,4,'',0,1600,,'',0,5400,4,'',0,1600,,'',0,1400,4,'',0,1600,,'',0,5400,4,'',0,1600,,'',0,1400,4,'',0,5700,,'',0,1500,4,'',0,1800,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1500,,'',0,1000,4,'',0,900,,'',0,4900,4,'',0,900,,'',0,800,4,'',0,800,,'',0,900,4,'',0,900,,'',0,900,4,'',0,4900,,'',0,900,4,'',0,900,,'',0,900,4,'',0,900,,'',0,900,4,'',0,4900,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,4,'',0,6500,,'',0,2400,4,'',0,2600,,'',0,6300,4,'',0,2400,,'',0,6400,4,'',0,2600,,'',0,6500,4,'',0,2500,4,'',0
+'589',3000,54500,,'',0,7300,,'',0,2100,,'',0,1100,,'',0,900,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,600,4,'',0,800,,'',0,600,4,'',0,5200,,'',0,1100,4,'',0,1300,,'',0,1400,4,'',0,1700,,'',0,5500,4,'',0,1600,,'',0,1400,4,'',0,1600,,'',0,5400,4,'',0,1600,,'',0,1400,4,'',0,1600,,'',0,5400,4,'',0,1600,,'',0,1400,4,'',0,5700,,'',0,1500,4,'',0,1800,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1500,,'',0,1000,4,'',0,900,,'',0,4900,4,'',0,900,,'',0,800,4,'',0,800,,'',0,900,4,'',0,900,,'',0,900,4,'',0,4900,,'',0,900,4,'',0,900,,'',0,900,4,'',0,900,,'',0,900,4,'',0,4900,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,4,'',0,6500,,'',0,2400,4,'',0,2600,,'',0,6300,4,'',0,2400,,'',0,6400,4,'',0,2600,,'',0,6500,4,'',0,2500,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_100 b/src/main/res-current/raw/current_gtfs_schedule_stop_100
index 1f31a1dc3..90500f6f4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_100
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_100
@@ -1,7 +1,7 @@
-'576',900,121300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',900,93000,,'',0,31200,,'',0,28800,,'',0
-'578',900,93000,,'',0,31200,,'',0,28800,,'',0
-'579',900,93000,,'',0,31200,,'',0,28800,,'',0
-'580',900,93000,,'',0,31200,,'',0,28800,,'',0
-'581',900,121300,,'',0,4500,,'',0,24500,,'',0,4500,,'',0
-'582',900,93000,,'',0,31200,,'',0,28800,,'',0
+'583',900,93000,,'',0,31200,,'',0,28800,,'',0
+'584',900,93000,,'',0,31200,,'',0,28800,,'',0
+'585',900,121300,,'',0,4500,,'',0,24500,,'',0,4500,,'',0
+'586',900,121300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',900,93000,,'',0,31200,,'',0,28800,,'',0
+'588',900,93000,,'',0,31200,,'',0,28800,,'',0
+'589',900,93000,,'',0,31200,,'',0,28800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_100196 b/src/main/res-current/raw/current_gtfs_schedule_stop_100196
index 49d057202..85c5754e0 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_100196
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_100196
@@ -1,25 +1,25 @@
-'577',801,60500,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'578',801,60500,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'579',801,60500,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'580',801,60500,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'582',801,60500,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'577',1000,55600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,5800,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'578',1000,55600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,5800,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'579',1000,55600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,5800,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'580',1000,55600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,5800,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'582',1000,55600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,5800,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'577',1100,63900,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'578',1100,63900,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'579',1100,63900,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'580',1100,63900,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'582',1100,63900,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'577',1400,121200,,'',0,73800,,'',0
-'577',1401,63800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'578',1400,121200,,'',0,73800,,'',0
-'578',1401,63800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'579',1400,121200,,'',0,73800,,'',0
-'579',1401,63800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'580',1400,121200,,'',0,73800,,'',0
-'580',1401,63800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'582',1400,121200,,'',0,73800,,'',0
-'582',1401,63800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'583',801,60500,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'584',801,60500,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'587',801,60500,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'588',801,60500,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'589',801,60500,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'583',1000,55600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,5800,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'584',1000,55600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,5800,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'587',1000,55600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,5800,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'588',1000,55600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,5800,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'589',1000,55600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,5800,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'583',1100,63900,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'584',1100,63900,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'587',1100,63900,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'588',1100,63900,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'589',1100,63900,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'583',1400,121200,,'',0,73800,,'',0
+'583',1401,63800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'584',1400,121200,,'',0,73800,,'',0
+'584',1401,63800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'587',1400,121200,,'',0,73800,,'',0
+'587',1401,63800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'588',1400,121200,,'',0,73800,,'',0
+'588',1401,63800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'589',1400,121200,,'',0,73800,,'',0
+'589',1401,63800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_101 b/src/main/res-current/raw/current_gtfs_schedule_stop_101
index da14c80e4..69fb4b1f8 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_101
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_101
@@ -1,7 +1,7 @@
-'576',1000,81900,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
-'577',1000,61800,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5600,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'578',1000,61800,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5600,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'579',1000,61800,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5600,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'580',1000,61800,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5600,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'581',1000,81700,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'582',1000,61800,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5600,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'583',1000,61800,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5600,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'584',1000,61800,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5600,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'585',1000,81700,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'586',1000,81900,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
+'587',1000,61800,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5600,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'588',1000,61800,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5600,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'589',1000,61800,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5600,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_102 b/src/main/res-current/raw/current_gtfs_schedule_stop_102
index 24523790e..f5a6814fc 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_102
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_102
@@ -1,14 +1,14 @@
-'576',700,85500,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'577',700,70600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'578',700,70600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'579',700,70600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'580',700,70600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'581',700,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',700,70600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'576',1801,82100,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'577',1801,63800,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'578',1801,63800,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'579',1801,63800,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'580',1801,63800,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'581',1801,75200,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'582',1801,63800,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'583',700,70600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'584',700,70600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'585',700,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',700,85500,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
+'587',700,70600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'588',700,70600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'589',700,70600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'583',1801,63800,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'584',1801,63800,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'585',1801,75200,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'586',1801,82100,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'587',1801,63800,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'588',1801,63800,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'589',1801,63800,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_103 b/src/main/res-current/raw/current_gtfs_schedule_stop_103
index 94f782d9e..7fbe5f789 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_103
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_103
@@ -1,14 +1,14 @@
-'576',701,80600,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'577',701,62100,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'578',701,62100,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'579',701,62100,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'580',701,62100,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'581',701,81100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',701,62100,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'576',1800,73600,,'',0,10100,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11400,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'577',1800,62100,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'578',1800,62100,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'579',1800,62100,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'580',1800,62100,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'581',1800,73600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'582',1800,62100,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'583',701,62100,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'584',701,62100,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'585',701,81100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',701,80600,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'587',701,62100,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'588',701,62100,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'589',701,62100,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'583',1800,62100,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'584',1800,62100,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'585',1800,73600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'586',1800,73600,,'',0,10100,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11400,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'587',1800,62100,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'588',1800,62100,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'589',1800,62100,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_104 b/src/main/res-current/raw/current_gtfs_schedule_stop_104
index f47bfe9b6..38c2208fd 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_104
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_104
@@ -1,14 +1,14 @@
-'576',700,85500,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'577',700,70500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'578',700,70500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'579',700,70500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'580',700,70500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'581',700,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',700,70500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'576',1801,82100,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'577',1801,63800,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'578',1801,63800,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'579',1801,63800,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'580',1801,63800,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'581',1801,75200,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'582',1801,63800,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'583',700,70500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'584',700,70500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'585',700,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',700,85500,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
+'587',700,70500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'588',700,70500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'589',700,70500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'583',1801,63800,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'584',1801,63800,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'585',1801,75200,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'586',1801,82100,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'587',1801,63800,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'588',1801,63800,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'589',1801,63800,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_105 b/src/main/res-current/raw/current_gtfs_schedule_stop_105
index 474d1bb11..74ecbdffa 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_105
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_105
@@ -1,7 +1,7 @@
-'576',900,121400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',900,93100,,'',0,31200,,'',0,28800,,'',0
-'578',900,93100,,'',0,31200,,'',0,28800,,'',0
-'579',900,93100,,'',0,31200,,'',0,28800,,'',0
-'580',900,93100,,'',0,31200,,'',0,28800,,'',0
-'581',900,121400,,'',0,4500,,'',0,24500,,'',0,4500,,'',0
-'582',900,93100,,'',0,31200,,'',0,28800,,'',0
+'583',900,93100,,'',0,31200,,'',0,28800,,'',0
+'584',900,93100,,'',0,31200,,'',0,28800,,'',0
+'585',900,121400,,'',0,4500,,'',0,24500,,'',0,4500,,'',0
+'586',900,121400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',900,93100,,'',0,31200,,'',0,28800,,'',0
+'588',900,93100,,'',0,31200,,'',0,28800,,'',0
+'589',900,93100,,'',0,31200,,'',0,28800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_106 b/src/main/res-current/raw/current_gtfs_schedule_stop_106
index 1efb5177a..f9f565bb4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_106
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_106
@@ -1,7 +1,7 @@
-'576',1101,74800,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
-'577',1101,65500,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'578',1101,65500,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'579',1101,65500,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'580',1101,65500,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'581',1101,80900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'582',1101,65500,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'583',1101,65500,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'584',1101,65500,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'585',1101,80900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'586',1101,74800,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
+'587',1101,65500,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'588',1101,65500,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'589',1101,65500,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107 b/src/main/res-current/raw/current_gtfs_schedule_stop_107
index 1750421e8..b0ebfaafb 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107
@@ -1,7 +1,7 @@
-'576',901,115400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',901,90900,,'',0,22000,,'',0,38000,,'',0
-'578',901,90900,,'',0,22000,,'',0,38000,,'',0
-'579',901,90900,,'',0,22000,,'',0,38000,,'',0
-'580',901,90900,,'',0,22000,,'',0,38000,,'',0
-'581',901,115400,,'',0,8500,,'',0,29000,,'',0,8500,,'',0
-'582',901,90900,,'',0,22000,,'',0,38000,,'',0
+'583',901,90900,,'',0,22000,,'',0,38000,,'',0
+'584',901,90900,,'',0,22000,,'',0,38000,,'',0
+'585',901,115400,,'',0,8500,,'',0,29000,,'',0,8500,,'',0
+'586',901,115400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',901,90900,,'',0,22000,,'',0,38000,,'',0
+'588',901,90900,,'',0,22000,,'',0,38000,,'',0
+'589',901,90900,,'',0,22000,,'',0,38000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_108 b/src/main/res-current/raw/current_gtfs_schedule_stop_108
index 165f705d3..a229a3b55 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_108
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_108
@@ -1,7 +1,7 @@
-'576',1100,81600,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9400,,'',0,10000,,'',0,10000,,'',0
-'577',1100,65800,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'578',1100,65800,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'579',1100,65800,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'580',1100,65800,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'581',1100,80300,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
-'582',1100,65800,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'583',1100,65800,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'584',1100,65800,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'585',1100,80300,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
+'586',1100,81600,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9400,,'',0,10000,,'',0,10000,,'',0
+'587',1100,65800,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'588',1100,65800,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'589',1100,65800,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_109 b/src/main/res-current/raw/current_gtfs_schedule_stop_109
index c8bf60359..f29d38550 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_109
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_109
@@ -1,7 +1,7 @@
-'576',801,64300,,'',0,27400,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8700,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
-'577',801,62300,,'',0,8600,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8400,,'',0
-'578',801,62300,,'',0,8600,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8400,,'',0
-'579',801,62300,,'',0,8600,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8400,,'',0
-'580',801,62300,,'',0,8600,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8400,,'',0
-'581',801,64300,,'',0,10200,,'',0,8000,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'582',801,62300,,'',0,8600,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8400,,'',0
+'583',801,62300,,'',0,8600,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8400,,'',0
+'584',801,62300,,'',0,8600,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8400,,'',0
+'585',801,64300,,'',0,10200,,'',0,8000,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
+'586',801,64300,,'',0,27400,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8700,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
+'587',801,62300,,'',0,8600,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8400,,'',0
+'588',801,62300,,'',0,8600,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8400,,'',0
+'589',801,62300,,'',0,8600,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_11 b/src/main/res-current/raw/current_gtfs_schedule_stop_11
index 0e3f9949f..349a317f7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_11
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_11
@@ -1,7 +1,7 @@
-'576',800,72300,,'',0,10600,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
-'577',800,62100,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'578',800,62100,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'579',800,62100,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'580',800,62100,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'581',800,64600,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3300,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
-'582',800,62100,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'583',800,62100,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'584',800,62100,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'585',800,64600,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3300,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
+'586',800,72300,,'',0,10600,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
+'587',800,62100,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'588',800,62100,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'589',800,62100,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110 b/src/main/res-current/raw/current_gtfs_schedule_stop_110
index 51143e904..b072d2651 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110
@@ -1,7 +1,7 @@
-'576',1001,84000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'577',1001,63500,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'578',1001,63500,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'579',1001,63500,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'580',1001,63500,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'581',1001,81400,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',1001,63500,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'583',1001,63500,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'584',1001,63500,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'585',1001,81400,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',1001,84000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'587',1001,63500,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'588',1001,63500,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'589',1001,63500,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111 b/src/main/res-current/raw/current_gtfs_schedule_stop_111
index 75950038c..b7a275514 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111
@@ -1,7 +1,7 @@
-'576',1000,81800,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
-'577',1000,61800,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'578',1000,61800,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'579',1000,61800,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'580',1000,61800,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'581',1000,81600,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'582',1000,61800,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'583',1000,61800,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'584',1000,61800,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'585',1000,81600,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'586',1000,81800,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
+'587',1000,61800,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'588',1000,61800,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'589',1000,61800,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_112 b/src/main/res-current/raw/current_gtfs_schedule_stop_112
index 6262d5fd9..be72eccf2 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_112
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_112
@@ -1,14 +1,14 @@
-'576',201,74700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',201,60600,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'578',201,60600,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'579',201,60600,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'580',201,60600,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'581',201,81200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
-'582',201,60600,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'576',801,64900,,'',0,27400,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0
-'577',801,62900,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5000,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'578',801,62900,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5000,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'579',801,62900,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5000,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'580',801,62900,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5000,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'581',801,65000,,'',0,10200,,'',0,8000,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'582',801,62900,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5000,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'583',201,60600,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'584',201,60600,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'585',201,81200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
+'586',201,74700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',201,60600,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'588',201,60600,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'589',201,60600,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'583',801,62900,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5000,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'584',801,62900,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5000,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'585',801,65000,,'',0,10200,,'',0,8000,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
+'586',801,64900,,'',0,27400,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0
+'587',801,62900,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5000,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'588',801,62900,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5000,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'589',801,62900,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5000,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_113 b/src/main/res-current/raw/current_gtfs_schedule_stop_113
index 3c8e27af6..5ee5add61 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_113
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_113
@@ -1,14 +1,14 @@
-'576',701,80700,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'577',701,62200,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'578',701,62200,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'579',701,62200,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'580',701,62200,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'581',701,81200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',701,62200,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'576',1800,73600,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'577',1800,62200,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'578',1800,62200,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'579',1800,62200,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'580',1800,62200,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'581',1800,73600,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'582',1800,62200,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'583',701,62200,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'584',701,62200,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'585',701,81200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',701,80700,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'587',701,62200,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'588',701,62200,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'589',701,62200,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'583',1800,62200,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'584',1800,62200,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'585',1800,73600,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'586',1800,73600,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'587',1800,62200,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'588',1800,62200,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'589',1800,62200,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_114 b/src/main/res-current/raw/current_gtfs_schedule_stop_114
index d01f0d027..e742f782f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_114
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_114
@@ -1,7 +1,7 @@
-'576',601,81600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'577',601,62500,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,5700,,'',0,1300,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'578',601,62500,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,5700,,'',0,1300,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'579',601,62500,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,5700,,'',0,1300,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'580',601,62500,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,5700,,'',0,1300,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'581',601,80100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'582',601,62500,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,5700,,'',0,1300,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'583',601,62500,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,5700,,'',0,1300,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'584',601,62500,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,5700,,'',0,1300,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'585',601,80100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
+'586',601,81600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'587',601,62500,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,5700,,'',0,1300,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'588',601,62500,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,5700,,'',0,1300,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'589',601,62500,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,5700,,'',0,1300,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_115 b/src/main/res-current/raw/current_gtfs_schedule_stop_115
index a4da0550d..6bd76b674 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_115
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_115
@@ -1,14 +1,14 @@
-'576',800,70500,,'',0,10200,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
-'577',800,60300,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'578',800,60300,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'579',800,60300,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'580',800,60300,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'581',800,70300,,'',0,4500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'582',800,60300,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'576',1101,74800,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
-'577',1101,65500,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'578',1101,65500,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'579',1101,65500,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'580',1101,65500,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'581',1101,80900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'582',1101,65500,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'583',800,60300,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'584',800,60300,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'585',800,70300,,'',0,4500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
+'586',800,70500,,'',0,10200,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
+'587',800,60300,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'588',800,60300,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'589',800,60300,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'583',1101,65500,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'584',1101,65500,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'585',1101,80900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'586',1101,74800,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
+'587',1101,65500,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'588',1101,65500,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'589',1101,65500,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_116 b/src/main/res-current/raw/current_gtfs_schedule_stop_116
index 4f6ba12f4..b1021fb13 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_116
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_116
@@ -1,14 +1,14 @@
-'576',201,74700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',201,60700,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'578',201,60700,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'579',201,60700,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'580',201,60700,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'581',201,81200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10200,,'',0,10000,,'',0,9600,,'',0
-'582',201,60700,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'576',801,65000,,'',0,27400,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0
-'577',801,63000,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'578',801,63000,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'579',801,63000,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'580',801,63000,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'581',801,65000,,'',0,10200,,'',0,8000,,'',0,7600,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'582',801,63000,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'583',201,60700,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'584',201,60700,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'585',201,81200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10200,,'',0,10000,,'',0,9600,,'',0
+'586',201,74700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',201,60700,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'588',201,60700,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'589',201,60700,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'583',801,63000,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'584',801,63000,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'585',801,65000,,'',0,10200,,'',0,8000,,'',0,7600,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
+'586',801,65000,,'',0,27400,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0
+'587',801,63000,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'588',801,63000,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'589',801,63000,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_117 b/src/main/res-current/raw/current_gtfs_schedule_stop_117
index 353cce104..26739f95e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_117
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_117
@@ -1,14 +1,14 @@
-'576',200,81900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
-'577',200,61400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'578',200,61400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'579',200,61400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'580',200,61400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'581',200,81800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'582',200,61400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'576',800,70000,,'',0,10200,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
-'577',800,55700,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
-'578',800,55700,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
-'579',800,55700,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
-'580',800,55700,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
-'581',800,65700,,'',0,8500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'582',800,55700,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'583',200,61400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'584',200,61400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'585',200,81800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
+'586',200,81900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
+'587',200,61400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'588',200,61400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'589',200,61400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'583',800,55700,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'584',800,55700,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'585',800,65700,,'',0,8500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
+'586',800,70000,,'',0,10200,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
+'587',800,55700,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'588',800,55700,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'589',800,55700,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_118 b/src/main/res-current/raw/current_gtfs_schedule_stop_118
index 0de659b6d..d342baf4d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_118
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_118
@@ -1,7 +1,7 @@
-'576',3001,73700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0
-'577',3001,63600,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,700,,'',0,4800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,5000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,4800,,'',0,900,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,800,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,6700,,'',0,2000,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2600,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
-'578',3001,63600,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,700,,'',0,4800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,5000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,4800,,'',0,900,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,800,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,6700,,'',0,2000,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2600,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
-'579',3001,63600,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,700,,'',0,4800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,5000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,4800,,'',0,900,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,800,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,6700,,'',0,2000,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2600,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
-'580',3001,63600,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,700,,'',0,4800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,5000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,4800,,'',0,900,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,800,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,6700,,'',0,2000,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2600,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,9000,,'',0,8000,,'',0
-'581',3001,73700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'582',3001,63600,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,700,,'',0,4800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,5000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,4800,,'',0,900,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,800,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,6700,,'',0,2000,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2600,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
+'583',3001,63600,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,700,,'',0,4800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,5000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,4800,,'',0,900,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,800,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,6700,,'',0,2000,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2600,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
+'584',3001,63600,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,700,,'',0,4800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,5000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,4800,,'',0,900,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,800,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,6700,,'',0,2000,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2600,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,9000,,'',0,8000,,'',0
+'585',3001,73700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'586',3001,73700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0
+'587',3001,63600,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,700,,'',0,4800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,5000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,4800,,'',0,900,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,800,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,6700,,'',0,2000,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2600,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
+'588',3001,63600,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,700,,'',0,4800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,5000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,4800,,'',0,900,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,800,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,6700,,'',0,2000,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2600,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
+'589',3001,63600,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,700,,'',0,4800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,5000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,4800,,'',0,900,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,800,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,6700,,'',0,2000,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2600,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_119 b/src/main/res-current/raw/current_gtfs_schedule_stop_119
index ae08025e1..0a7feffdc 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_119
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_119
@@ -1,14 +1,14 @@
-'576',801,64200,,'',0,27400,,'',0,9200,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
-'577',801,62200,,'',0,8600,,'',0,2700,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'578',801,62200,,'',0,8600,,'',0,2700,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'579',801,62200,,'',0,8600,,'',0,2700,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'580',801,62200,,'',0,8600,,'',0,2700,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'581',801,64300,,'',0,10200,,'',0,8000,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'582',801,62200,,'',0,8600,,'',0,2700,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'576',1100,81500,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9400,,'',0,10000,,'',0,10000,,'',0
-'577',1100,65700,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'578',1100,65700,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'579',1100,65700,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'580',1100,65700,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'581',1100,80200,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
-'582',1100,65700,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'583',801,62200,,'',0,8600,,'',0,2700,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'584',801,62200,,'',0,8600,,'',0,2700,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'585',801,64300,,'',0,10200,,'',0,8000,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
+'586',801,64200,,'',0,27400,,'',0,9200,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
+'587',801,62200,,'',0,8600,,'',0,2700,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'588',801,62200,,'',0,8600,,'',0,2700,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'589',801,62200,,'',0,8600,,'',0,2700,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'583',1100,65700,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'584',1100,65700,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'585',1100,80200,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
+'586',1100,81500,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9400,,'',0,10000,,'',0,10000,,'',0
+'587',1100,65700,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'588',1100,65700,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'589',1100,65700,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_12 b/src/main/res-current/raw/current_gtfs_schedule_stop_12
index 3500fd268..e94de8818 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_12
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_12
@@ -1,7 +1,7 @@
-'576',300,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
-'577',300,72900,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'578',300,72900,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'579',300,72900,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'580',300,72900,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'581',300,81600,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'582',300,72900,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'583',300,72900,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'584',300,72900,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'585',300,81600,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
+'586',300,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
+'587',300,72900,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'588',300,72900,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'589',300,72900,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120 b/src/main/res-current/raw/current_gtfs_schedule_stop_120
index 20d3c5eab..017b19263 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120
@@ -1,14 +1,14 @@
-'576',700,85400,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'577',700,70400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'578',700,70400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'579',700,70400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'580',700,70400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'581',700,81700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',700,70400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'576',1801,82000,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'577',1801,63700,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'578',1801,63700,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'579',1801,63700,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'580',1801,63700,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'581',1801,75100,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'582',1801,63700,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'583',700,70400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'584',700,70400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'585',700,81700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',700,85400,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
+'587',700,70400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'588',700,70400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'589',700,70400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'583',1801,63700,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'584',1801,63700,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'585',1801,75100,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'586',1801,82000,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'587',1801,63700,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'588',1801,63700,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'589',1801,63700,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_121 b/src/main/res-current/raw/current_gtfs_schedule_stop_121
index 9d26be9ac..e19d99648 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_121
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_121
@@ -1,14 +1,14 @@
-'576',701,80800,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'577',701,62300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'578',701,62300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'579',701,62300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'580',701,62300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'581',701,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',701,62300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'576',1800,73700,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'577',1800,62300,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'578',1800,62300,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'579',1800,62300,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'580',1800,62300,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'581',1800,73700,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'582',1800,62300,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'583',701,62300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'584',701,62300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'585',701,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',701,80800,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'587',701,62300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'588',701,62300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'589',701,62300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'583',1800,62300,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'584',1800,62300,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'585',1800,73700,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'586',1800,73700,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'587',1800,62300,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'588',1800,62300,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'589',1800,62300,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_122 b/src/main/res-current/raw/current_gtfs_schedule_stop_122
index 306a79687..4e480ec77 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_122
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_122
@@ -1,7 +1,7 @@
-'576',3000,75100,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,9200,0,'Downtown',0
-'577',3000,61200,,'',0,2000,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,5200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1500,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,4900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2300,,'',0,6500,0,'Downtown',0,2500,,'',0,2600,0,'Downtown',0,6500,0,'Downtown',0
-'578',3000,61200,,'',0,2000,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,5200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1500,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,4900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2300,,'',0,6500,0,'Downtown',0,2500,,'',0,2600,0,'Downtown',0,6500,0,'Downtown',0
-'579',3000,61200,,'',0,2000,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,5200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1500,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,4900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2300,,'',0,6500,0,'Downtown',0,2500,,'',0,2600,0,'Downtown',0,6500,0,'Downtown',0
-'580',3000,61200,,'',0,2000,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,5200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1500,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,4900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2300,,'',0,6500,0,'Downtown',0,2500,,'',0,2600,0,'Downtown',0,6500,0,'Downtown',0,8000,0,'Downtown',0,4000,0,'Downtown',0
-'581',3000,70000,,'',0,5000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7100,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,5700,0,'Downtown',0
-'582',3000,61200,,'',0,2000,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,5200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1500,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,4900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2300,,'',0,6500,0,'Downtown',0,2500,,'',0,2600,0,'Downtown',0,6500,0,'Downtown',0
+'583',3000,61200,,'',0,2000,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,5200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1500,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,4900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2300,,'',0,6500,0,'Downtown',0,2500,,'',0,2600,0,'Downtown',0,6500,0,'Downtown',0
+'584',3000,61200,,'',0,2000,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,5200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1500,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,4900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2300,,'',0,6500,0,'Downtown',0,2500,,'',0,2600,0,'Downtown',0,6500,0,'Downtown',0,8000,0,'Downtown',0,4000,0,'Downtown',0
+'585',3000,70000,,'',0,5000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7100,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,5700,0,'Downtown',0
+'586',3000,75100,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,9200,0,'Downtown',0
+'587',3000,61200,,'',0,2000,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,5200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1500,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,4900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2300,,'',0,6500,0,'Downtown',0,2500,,'',0,2600,0,'Downtown',0,6500,0,'Downtown',0
+'588',3000,61200,,'',0,2000,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,5200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1500,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,4900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2300,,'',0,6500,0,'Downtown',0,2500,,'',0,2600,0,'Downtown',0,6500,0,'Downtown',0
+'589',3000,61200,,'',0,2000,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,5200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1500,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,4900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2300,,'',0,6500,0,'Downtown',0,2500,,'',0,2600,0,'Downtown',0,6500,0,'Downtown',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_123 b/src/main/res-current/raw/current_gtfs_schedule_stop_123
index 7e82f3463..f197e605a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_123
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_123
@@ -1,14 +1,14 @@
-'576',800,70500,,'',0,10200,,'',0,5000,,'',0,9200,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,8800,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
-'577',800,60400,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'578',800,60400,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'579',800,60400,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'580',800,60400,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'581',800,70300,,'',0,4500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'582',800,60400,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'576',1101,74900,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
-'577',1101,65600,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'578',1101,65600,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'579',1101,65600,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'580',1101,65600,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'581',1101,81000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'582',1101,65600,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'583',800,60400,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'584',800,60400,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'585',800,70300,,'',0,4500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
+'586',800,70500,,'',0,10200,,'',0,5000,,'',0,9200,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,8800,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
+'587',800,60400,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'588',800,60400,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'589',800,60400,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'583',1101,65600,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'584',1101,65600,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'585',1101,81000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'586',1101,74900,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
+'587',1101,65600,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'588',1101,65600,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'589',1101,65600,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_124 b/src/main/res-current/raw/current_gtfs_schedule_stop_124
index 98a67746c..fd7e0d7d9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_124
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_124
@@ -1,7 +1,7 @@
-'576',1000,81700,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
-'577',1000,61700,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'578',1000,61700,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'579',1000,61700,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'580',1000,61700,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'581',1000,81500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'582',1000,61700,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'583',1000,61700,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'584',1000,61700,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'585',1000,81500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'586',1000,81700,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
+'587',1000,61700,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'588',1000,61700,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'589',1000,61700,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_125 b/src/main/res-current/raw/current_gtfs_schedule_stop_125
index 9867ee4cc..c7902d92c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_125
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_125
@@ -1,7 +1,7 @@
-'576',900,121100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',900,92800,,'',0,31200,,'',0,28800,,'',0
-'578',900,92800,,'',0,31200,,'',0,28800,,'',0
-'579',900,92800,,'',0,31200,,'',0,28800,,'',0
-'580',900,92800,,'',0,31200,,'',0,28800,,'',0
-'581',900,121100,,'',0,4500,,'',0,24500,,'',0,4500,,'',0
-'582',900,92800,,'',0,31200,,'',0,28800,,'',0
+'583',900,92800,,'',0,31200,,'',0,28800,,'',0
+'584',900,92800,,'',0,31200,,'',0,28800,,'',0
+'585',900,121100,,'',0,4500,,'',0,24500,,'',0,4500,,'',0
+'586',900,121100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',900,92800,,'',0,31200,,'',0,28800,,'',0
+'588',900,92800,,'',0,31200,,'',0,28800,,'',0
+'589',900,92800,,'',0,31200,,'',0,28800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_126 b/src/main/res-current/raw/current_gtfs_schedule_stop_126
index bf819097a..1950472db 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_126
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_126
@@ -1,7 +1,7 @@
-'576',901,115700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',901,91200,,'',0,22000,,'',0,38000,,'',0
-'578',901,91200,,'',0,22000,,'',0,38000,,'',0
-'579',901,91200,,'',0,22000,,'',0,38000,,'',0
-'580',901,91200,,'',0,22000,,'',0,38000,,'',0
-'581',901,115700,,'',0,8500,,'',0,29000,,'',0,8500,,'',0
-'582',901,91200,,'',0,22000,,'',0,38000,,'',0
+'583',901,91200,,'',0,22000,,'',0,38000,,'',0
+'584',901,91200,,'',0,22000,,'',0,38000,,'',0
+'585',901,115700,,'',0,8500,,'',0,29000,,'',0,8500,,'',0
+'586',901,115700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',901,91200,,'',0,22000,,'',0,38000,,'',0
+'588',901,91200,,'',0,22000,,'',0,38000,,'',0
+'589',901,91200,,'',0,22000,,'',0,38000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_127 b/src/main/res-current/raw/current_gtfs_schedule_stop_127
index e956251b2..8dc30da3a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_127
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_127
@@ -1,14 +1,14 @@
-'576',200,81800,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
-'577',200,61300,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'578',200,61300,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'579',200,61300,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'580',200,61300,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'581',200,81700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'582',200,61300,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'576',800,65900,,'',0,14200,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
-'577',800,55700,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'578',800,55700,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'579',800,55700,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'580',800,55700,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'581',800,65600,,'',0,8500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'582',800,55700,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'583',200,61300,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'584',200,61300,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'585',200,81700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
+'586',200,81800,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
+'587',200,61300,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'588',200,61300,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'589',200,61300,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'583',800,55700,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'584',800,55700,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'585',800,65600,,'',0,8500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
+'586',800,65900,,'',0,14200,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
+'587',800,55700,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'588',800,55700,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'589',800,55700,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_128 b/src/main/res-current/raw/current_gtfs_schedule_stop_128
index 8a3ad8583..b0288ebca 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_128
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_128
@@ -1,14 +1,14 @@
-'576',801,64200,,'',0,27400,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8700,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
-'577',801,62200,,'',0,8600,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'578',801,62200,,'',0,8600,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'579',801,62200,,'',0,8600,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'580',801,62200,,'',0,8600,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'581',801,64200,,'',0,10200,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'582',801,62200,,'',0,8600,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'576',1100,81500,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,10000,,'',0,10000,,'',0
-'577',1100,65700,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'578',1100,65700,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'579',1100,65700,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'580',1100,65700,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'581',1100,80200,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
-'582',1100,65700,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'583',801,62200,,'',0,8600,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'584',801,62200,,'',0,8600,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'585',801,64200,,'',0,10200,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
+'586',801,64200,,'',0,27400,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8700,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
+'587',801,62200,,'',0,8600,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'588',801,62200,,'',0,8600,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'589',801,62200,,'',0,8600,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'583',1100,65700,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'584',1100,65700,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'585',1100,80200,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
+'586',1100,81500,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,10000,,'',0,10000,,'',0
+'587',1100,65700,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'588',1100,65700,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'589',1100,65700,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_129 b/src/main/res-current/raw/current_gtfs_schedule_stop_129
index 099e12fea..52e164fbd 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_129
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_129
@@ -1,7 +1,7 @@
-'576',200,81400,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'577',200,60900,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'578',200,60900,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'579',200,60900,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'580',200,60900,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'581',200,81300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'582',200,60900,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'583',200,60900,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'584',200,60900,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'585',200,81300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
+'586',200,81400,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'587',200,60900,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'588',200,60900,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'589',200,60900,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_13 b/src/main/res-current/raw/current_gtfs_schedule_stop_13
index 28c91f9ba..00b43d737 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_13
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_13
@@ -1,14 +1,14 @@
-'576',701,80100,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'577',701,61600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
-'578',701,61600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
-'579',701,61600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
-'580',701,61600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
-'581',701,80600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',701,61600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
-'576',1800,73100,,'',0,10100,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11400,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'577',1800,61600,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
-'578',1800,61600,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
-'579',1800,61600,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
-'580',1800,61600,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
-'581',1800,73100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'582',1800,61600,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
+'583',701,61600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
+'584',701,61600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
+'585',701,80600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',701,80100,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'587',701,61600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
+'588',701,61600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
+'589',701,61600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
+'583',1800,61600,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
+'584',1800,61600,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
+'585',1800,73100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'586',1800,73100,,'',0,10100,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11400,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'587',1800,61600,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
+'588',1800,61600,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
+'589',1800,61600,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_130 b/src/main/res-current/raw/current_gtfs_schedule_stop_130
index 22d4aba1b..5f8a1138a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_130
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_130
@@ -1,7 +1,7 @@
-'576',800,72400,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
-'577',800,62200,,'',0,2600,,'',0,6300,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'578',800,62200,,'',0,2600,,'',0,6300,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'579',800,62200,,'',0,2600,,'',0,6300,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'580',800,62200,,'',0,2600,,'',0,6300,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'581',800,64700,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
-'582',800,62200,,'',0,2600,,'',0,6300,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'583',800,62200,,'',0,2600,,'',0,6300,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'584',800,62200,,'',0,2600,,'',0,6300,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'585',800,64700,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
+'586',800,72400,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
+'587',800,62200,,'',0,2600,,'',0,6300,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'588',800,62200,,'',0,2600,,'',0,6300,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'589',800,62200,,'',0,2600,,'',0,6300,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_131 b/src/main/res-current/raw/current_gtfs_schedule_stop_131
index d6d876499..7ebdbd542 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_131
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_131
@@ -1,7 +1,7 @@
-'576',201,75300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',201,61200,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'578',201,61200,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'579',201,61200,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'580',201,61200,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'581',201,81800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
-'582',201,61200,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'583',201,61200,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'584',201,61200,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'585',201,81800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
+'586',201,75300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',201,61200,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'588',201,61200,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'589',201,61200,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_132 b/src/main/res-current/raw/current_gtfs_schedule_stop_132
index e25510d81..870b43436 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_132
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_132
@@ -1,7 +1,7 @@
-'576',1901,75300,,'',0,10300,,'',0,15600,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11100,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'577',1901,70800,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'578',1901,70800,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'579',1901,70800,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'580',1901,70800,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'581',1901,75200,,'',0,7500,,'',0,7500,,'',0,3600,,'',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,3500,,'',0,7400,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'582',1901,70800,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'583',1901,70800,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'584',1901,70800,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'585',1901,75200,,'',0,7500,,'',0,7500,,'',0,3600,,'',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,3500,,'',0,7400,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'586',1901,75300,,'',0,10300,,'',0,15600,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11100,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'587',1901,70800,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'588',1901,70800,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'589',1901,70800,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_133 b/src/main/res-current/raw/current_gtfs_schedule_stop_133
index 40d4e5b2c..bfb405bc1 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_133
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_133
@@ -1,7 +1,7 @@
-'576',1001,85200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'577',1001,64800,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'578',1001,64800,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'579',1001,64800,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'580',1001,64800,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'581',1001,82800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',1001,64800,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'583',1001,64800,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'584',1001,64800,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'585',1001,82800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',1001,85200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'587',1001,64800,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'588',1001,64800,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'589',1001,64800,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_134 b/src/main/res-current/raw/current_gtfs_schedule_stop_134
index fa20a9c04..24ef502c8 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_134
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_134
@@ -1,7 +1,7 @@
-'576',1900,80300,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'577',1900,64800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'578',1900,64800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'579',1900,64800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'580',1900,64800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'581',1900,73300,,'',0,7500,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'582',1900,64800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'583',1900,64800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'584',1900,64800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'585',1900,73300,,'',0,7500,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'586',1900,80300,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'587',1900,64800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'588',1900,64800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'589',1900,64800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_135 b/src/main/res-current/raw/current_gtfs_schedule_stop_135
index ca38ab438..d09053cef 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_135
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_135
@@ -1,14 +1,14 @@
-'576',800,70600,,'',0,10200,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
-'577',800,60400,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'578',800,60400,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'579',800,60400,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'580',800,60400,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'581',800,70400,,'',0,4500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'582',800,60400,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'576',1101,75000,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
-'577',1101,65700,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'578',1101,65700,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'579',1101,65700,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'580',1101,65700,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'581',1101,81100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'582',1101,65700,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'583',800,60400,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'584',800,60400,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'585',800,70400,,'',0,4500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
+'586',800,70600,,'',0,10200,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
+'587',800,60400,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'588',800,60400,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'589',800,60400,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'583',1101,65700,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'584',1101,65700,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'585',1101,81100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'586',1101,75000,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
+'587',1101,65700,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'588',1101,65700,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'589',1101,65700,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_136 b/src/main/res-current/raw/current_gtfs_schedule_stop_136
index b7c892a8b..b8ce577d7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_136
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_136
@@ -1,14 +1,14 @@
-'576',700,85300,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'577',700,70300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'578',700,70300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'579',700,70300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'580',700,70300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'581',700,81600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',700,70300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'576',1801,81900,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'577',1801,63600,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'578',1801,63600,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'579',1801,63600,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'580',1801,63600,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'581',1801,75000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'582',1801,63600,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'583',700,70300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'584',700,70300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'585',700,81600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',700,85300,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
+'587',700,70300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'588',700,70300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'589',700,70300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'583',1801,63600,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'584',1801,63600,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'585',1801,75000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'586',1801,81900,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'587',1801,63600,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'588',1801,63600,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'589',1801,63600,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_13610 b/src/main/res-current/raw/current_gtfs_schedule_stop_13610
index 26b2e71c5..77d126225 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_13610
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_13610
@@ -1,5 +1,5 @@
-'577',2700,64500,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'578',2700,64500,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'579',2700,64500,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'580',2700,64500,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'582',2700,64500,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'583',2700,64500,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'584',2700,64500,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'587',2700,64500,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'588',2700,64500,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'589',2700,64500,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_13611 b/src/main/res-current/raw/current_gtfs_schedule_stop_13611
index 3d409bcae..49d4db566 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_13611
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_13611
@@ -1,5 +1,5 @@
-'577',2700,64900,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
-'578',2700,64900,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
-'579',2700,64900,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
-'580',2700,64900,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
-'582',2700,64900,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
+'583',2700,64900,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
+'584',2700,64900,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
+'587',2700,64900,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
+'588',2700,64900,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
+'589',2700,64900,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_13612 b/src/main/res-current/raw/current_gtfs_schedule_stop_13612
index 2d4176378..06f64749b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_13612
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_13612
@@ -1,5 +1,5 @@
-'577',2700,65000,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
-'578',2700,65000,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
-'579',2700,65000,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
-'580',2700,65000,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
-'582',2700,65000,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
+'583',2700,65000,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
+'584',2700,65000,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
+'587',2700,65000,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
+'588',2700,65000,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
+'589',2700,65000,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_137 b/src/main/res-current/raw/current_gtfs_schedule_stop_137
index fb80f936c..b900ccedb 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_137
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_137
@@ -1,7 +1,7 @@
-'576',601,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'577',601,62600,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,5700,,'',0,1300,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'578',601,62600,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,5700,,'',0,1300,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'579',601,62600,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,5700,,'',0,1300,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'580',601,62600,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,5700,,'',0,1300,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'581',601,80300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'582',601,62600,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,5700,,'',0,1300,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'583',601,62600,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,5700,,'',0,1300,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'584',601,62600,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,5700,,'',0,1300,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'585',601,80300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
+'586',601,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'587',601,62600,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,5700,,'',0,1300,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'588',601,62600,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,5700,,'',0,1300,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'589',601,62600,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,5700,,'',0,1300,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_138 b/src/main/res-current/raw/current_gtfs_schedule_stop_138
index be0e23f97..6dd0449d0 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_138
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_138
@@ -1,7 +1,7 @@
-'576',1901,75200,,'',0,10300,,'',0,15600,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11100,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'577',1901,70700,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'578',1901,70700,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'579',1901,70700,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'580',1901,70700,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'581',1901,75100,,'',0,7500,,'',0,7500,,'',0,3600,,'',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,3500,,'',0,7400,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'582',1901,70700,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'583',1901,70700,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'584',1901,70700,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'585',1901,75100,,'',0,7500,,'',0,7500,,'',0,3600,,'',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,3500,,'',0,7400,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'586',1901,75200,,'',0,10300,,'',0,15600,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11100,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'587',1901,70700,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'588',1901,70700,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'589',1901,70700,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_139 b/src/main/res-current/raw/current_gtfs_schedule_stop_139
index 66b26ab10..bd11e50d3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_139
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_139
@@ -1,7 +1,7 @@
-'576',1900,80400,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'577',1900,64900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'578',1900,64900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'579',1900,64900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'580',1900,64900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'581',1900,73400,,'',0,7500,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'582',1900,64900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'583',1900,64900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'584',1900,64900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'585',1900,73400,,'',0,7500,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'586',1900,80400,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'587',1900,64900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'588',1900,64900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'589',1900,64900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_14 b/src/main/res-current/raw/current_gtfs_schedule_stop_14
index bc2b255cf..e98a33460 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_14
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_14
@@ -1,14 +1,14 @@
-'576',700,90300,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'577',700,71500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'578',700,71500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'579',700,71500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'580',700,71500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'581',700,82600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',700,71500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'576',1801,82900,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'577',1801,64500,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
-'578',1801,64500,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
-'579',1801,64500,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
-'580',1801,64500,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
-'581',1801,75900,,'',0,14300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'582',1801,64500,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
+'583',700,71500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'584',700,71500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'585',700,82600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',700,90300,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'587',700,71500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'588',700,71500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'589',700,71500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'583',1801,64500,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
+'584',1801,64500,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
+'585',1801,75900,,'',0,14300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'586',1801,82900,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'587',1801,64500,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
+'588',1801,64500,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
+'589',1801,64500,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_140 b/src/main/res-current/raw/current_gtfs_schedule_stop_140
index bd9182308..56267c245 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_140
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_140
@@ -1,14 +1,14 @@
-'576',1001,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'577',1001,63700,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'578',1001,63700,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'579',1001,63700,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'580',1001,63700,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'581',1001,81700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',1001,63700,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'576',1901,75500,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'577',1901,71000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'578',1901,71000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'579',1901,71000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'580',1901,71000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'581',1901,75400,,'',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,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'582',1901,71000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'583',1001,63700,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'584',1001,63700,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'585',1001,81700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',1001,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'587',1001,63700,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'588',1001,63700,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'589',1001,63700,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'583',1901,71000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'584',1901,71000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'585',1901,75400,,'',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,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'586',1901,75500,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'587',1901,71000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'588',1901,71000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'589',1901,71000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_141 b/src/main/res-current/raw/current_gtfs_schedule_stop_141
index ef44d6378..0699386de 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_141
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_141
@@ -1,14 +1,14 @@
-'576',701,80800,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'577',701,62300,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'578',701,62300,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'579',701,62300,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'580',701,62300,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'581',701,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',701,62300,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'576',1800,73700,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'577',1800,62300,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'578',1800,62300,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'579',1800,62300,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'580',1800,62300,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'581',1800,73700,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'582',1800,62300,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'583',701,62300,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'584',701,62300,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'585',701,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',701,80800,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'587',701,62300,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'588',701,62300,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'589',701,62300,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'583',1800,62300,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'584',1800,62300,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'585',1800,73700,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'586',1800,73700,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'587',1800,62300,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'588',1800,62300,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'589',1800,62300,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_142 b/src/main/res-current/raw/current_gtfs_schedule_stop_142
index 37a2b995b..bdf6fbfab 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_142
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_142
@@ -1,7 +1,7 @@
-'576',901,115900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',901,91400,,'',0,22000,,'',0,38000,,'',0
-'578',901,91400,,'',0,22000,,'',0,38000,,'',0
-'579',901,91400,,'',0,22000,,'',0,38000,,'',0
-'580',901,91400,,'',0,22000,,'',0,38000,,'',0
-'581',901,115900,,'',0,8500,,'',0,29000,,'',0,8500,,'',0
-'582',901,91400,,'',0,22000,,'',0,38000,,'',0
+'583',901,91400,,'',0,22000,,'',0,38000,,'',0
+'584',901,91400,,'',0,22000,,'',0,38000,,'',0
+'585',901,115900,,'',0,8500,,'',0,29000,,'',0,8500,,'',0
+'586',901,115900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',901,91400,,'',0,22000,,'',0,38000,,'',0
+'588',901,91400,,'',0,22000,,'',0,38000,,'',0
+'589',901,91400,,'',0,22000,,'',0,38000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_143 b/src/main/res-current/raw/current_gtfs_schedule_stop_143
index 12ad43c75..40900f87a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_143
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_143
@@ -1,7 +1,7 @@
-'576',900,121000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',900,92700,,'',0,31200,,'',0,28800,,'',0
-'578',900,92700,,'',0,31200,,'',0,28800,,'',0
-'579',900,92700,,'',0,31200,,'',0,28800,,'',0
-'580',900,92700,,'',0,31200,,'',0,28800,,'',0
-'581',900,121000,,'',0,4500,,'',0,24500,,'',0,4500,,'',0
-'582',900,92700,,'',0,31200,,'',0,28800,,'',0
+'583',900,92700,,'',0,31200,,'',0,28800,,'',0
+'584',900,92700,,'',0,31200,,'',0,28800,,'',0
+'585',900,121000,,'',0,4500,,'',0,24500,,'',0,4500,,'',0
+'586',900,121000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',900,92700,,'',0,31200,,'',0,28800,,'',0
+'588',900,92700,,'',0,31200,,'',0,28800,,'',0
+'589',900,92700,,'',0,31200,,'',0,28800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_144 b/src/main/res-current/raw/current_gtfs_schedule_stop_144
index 6536f3e7e..fe181b0a1 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_144
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_144
@@ -1,7 +1,7 @@
-'576',1901,75200,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'577',1901,70700,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'578',1901,70700,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'579',1901,70700,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'580',1901,70700,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'581',1901,75100,,'',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,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'582',1901,70700,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'583',1901,70700,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'584',1901,70700,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'585',1901,75100,,'',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,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'586',1901,75200,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'587',1901,70700,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'588',1901,70700,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'589',1901,70700,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_145 b/src/main/res-current/raw/current_gtfs_schedule_stop_145
index c9ecdd4e2..ee96e8c2e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_145
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_145
@@ -1,14 +1,14 @@
-'576',801,64100,,'',0,27400,,'',0,9200,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
-'577',801,62100,,'',0,8600,,'',0,2700,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8400,,'',0
-'578',801,62100,,'',0,8600,,'',0,2700,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8400,,'',0
-'579',801,62100,,'',0,8600,,'',0,2700,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8400,,'',0
-'580',801,62100,,'',0,8600,,'',0,2700,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8400,,'',0
-'581',801,64200,,'',0,10200,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'582',801,62100,,'',0,8600,,'',0,2700,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8400,,'',0
-'576',1100,81500,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,10000,,'',0,10000,,'',0
-'577',1100,65700,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'578',1100,65700,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'579',1100,65700,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'580',1100,65700,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'581',1100,80200,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
-'582',1100,65700,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'583',801,62100,,'',0,8600,,'',0,2700,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8400,,'',0
+'584',801,62100,,'',0,8600,,'',0,2700,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8400,,'',0
+'585',801,64200,,'',0,10200,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
+'586',801,64100,,'',0,27400,,'',0,9200,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
+'587',801,62100,,'',0,8600,,'',0,2700,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8400,,'',0
+'588',801,62100,,'',0,8600,,'',0,2700,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8400,,'',0
+'589',801,62100,,'',0,8600,,'',0,2700,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8400,,'',0
+'583',1100,65700,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'584',1100,65700,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'585',1100,80200,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
+'586',1100,81500,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,10000,,'',0,10000,,'',0
+'587',1100,65700,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'588',1100,65700,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'589',1100,65700,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_146 b/src/main/res-current/raw/current_gtfs_schedule_stop_146
index cdeddd04f..7a94c4b71 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_146
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_146
@@ -1,14 +1,14 @@
-'576',1000,81500,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
-'577',1000,61500,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'578',1000,61500,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'579',1000,61500,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'580',1000,61500,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'581',1000,81200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'582',1000,61500,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'576',1900,80200,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'577',1900,64700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'578',1900,64700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'579',1900,64700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'580',1900,64700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'581',1900,73200,,'',0,7500,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'582',1900,64700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'583',1000,61500,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'584',1000,61500,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'585',1000,81200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'586',1000,81500,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
+'587',1000,61500,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'588',1000,61500,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'589',1000,61500,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'583',1900,64700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'584',1900,64700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'585',1900,73200,,'',0,7500,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'586',1900,80200,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'587',1900,64700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'588',1900,64700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'589',1900,64700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_147 b/src/main/res-current/raw/current_gtfs_schedule_stop_147
index d0e513060..05deb17c9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_147
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_147
@@ -1,27 +1,27 @@
-'576',200,81300,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'577',200,60800,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'578',200,60800,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'579',200,60800,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'580',200,60800,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'581',200,81200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'582',200,60800,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'577',500,64500,,'',0,7700,,'',0,9600,,'',0,69700,,'',0,1500,,'',0,8000,,'',0,9000,,'',0,4000,,'',0
-'577',501,63700,4,'',0,7900,4,'',0,8700,4,'',0,4500,4,'',0,75500,4,'',0,4700,4,'',0,7600,4,'',0,9000,4,'',0
-'578',500,64500,,'',0,7700,,'',0,9600,,'',0,69700,,'',0,1500,,'',0,8000,,'',0,9000,,'',0,4000,,'',0
-'578',501,63700,4,'',0,7900,4,'',0,8700,4,'',0,4500,4,'',0,75500,4,'',0,4700,4,'',0,7600,4,'',0,9000,4,'',0
-'579',500,64500,,'',0,7700,,'',0,9600,,'',0,69700,,'',0,1500,,'',0,8000,,'',0,9000,,'',0,4000,,'',0
-'579',501,63700,4,'',0,7900,4,'',0,8700,4,'',0,4500,4,'',0,75500,4,'',0,4700,4,'',0,7600,4,'',0,9000,4,'',0
-'580',500,64500,,'',0,7700,,'',0,9600,,'',0,69700,,'',0,1500,,'',0,8000,,'',0,9000,,'',0,4000,,'',0
-'580',501,63700,4,'',0,7900,4,'',0,8700,4,'',0,4500,4,'',0,75500,4,'',0,4700,4,'',0,7600,4,'',0,9000,4,'',0
-'582',500,64500,,'',0,7700,,'',0,9600,,'',0,69700,,'',0,1500,,'',0,8000,,'',0,9000,,'',0,4000,,'',0
-'582',501,63700,4,'',0,7900,4,'',0,8700,4,'',0,4500,4,'',0,75500,4,'',0,4700,4,'',0,7600,4,'',0,9000,4,'',0
-'577',1200,72700,4,'',0,8100,4,'',0,4000,4,'',0,68000,4,'',0,8400,4,'',0,4400,4,'',0,8200,4,'',0,8400,4,'',0,21600,4,'',0
-'577',1201,65500,,'',0,8100,,'',0,8000,,'',0,63400,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4600,,'',0
-'578',1200,72700,4,'',0,8100,4,'',0,4000,4,'',0,68000,4,'',0,8400,4,'',0,4400,4,'',0,8200,4,'',0,8400,4,'',0,21600,4,'',0
-'578',1201,65500,,'',0,8100,,'',0,8000,,'',0,63400,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4600,,'',0
-'579',1200,72700,4,'',0,8100,4,'',0,4000,4,'',0,68000,4,'',0,8400,4,'',0,4400,4,'',0,8200,4,'',0,8400,4,'',0,21600,4,'',0
-'579',1201,65500,,'',0,8100,,'',0,8000,,'',0,63400,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4600,,'',0
-'580',1200,72700,4,'',0,8100,4,'',0,4000,4,'',0,68000,4,'',0,8400,4,'',0,4400,4,'',0,8200,4,'',0,8400,4,'',0,21600,4,'',0
-'580',1201,65500,,'',0,8100,,'',0,8000,,'',0,63400,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4600,,'',0
-'582',1200,72700,4,'',0,8100,4,'',0,4000,4,'',0,68000,4,'',0,8400,4,'',0,4400,4,'',0,8200,4,'',0,8400,4,'',0,21600,4,'',0
-'582',1201,65500,,'',0,8100,,'',0,8000,,'',0,63400,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4600,,'',0
+'583',200,60800,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'584',200,60800,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'585',200,81200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
+'586',200,81300,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'587',200,60800,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'588',200,60800,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'589',200,60800,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'583',500,64500,,'',0,7700,,'',0,9600,,'',0,69700,,'',0,1500,,'',0,8000,,'',0,9000,,'',0,4000,,'',0
+'583',501,63700,4,'',0,7900,4,'',0,8700,4,'',0,4500,4,'',0,75500,4,'',0,4700,4,'',0,7600,4,'',0,9000,4,'',0
+'584',500,64500,,'',0,7700,,'',0,9600,,'',0,69700,,'',0,1500,,'',0,8000,,'',0,9000,,'',0,4000,,'',0
+'584',501,63700,4,'',0,7900,4,'',0,8700,4,'',0,4500,4,'',0,75500,4,'',0,4700,4,'',0,7600,4,'',0,9000,4,'',0
+'587',500,64500,,'',0,7700,,'',0,9600,,'',0,69700,,'',0,1500,,'',0,8000,,'',0,9000,,'',0,4000,,'',0
+'587',501,63700,4,'',0,7900,4,'',0,8700,4,'',0,4500,4,'',0,75500,4,'',0,4700,4,'',0,7600,4,'',0,9000,4,'',0
+'588',500,64500,,'',0,7700,,'',0,9600,,'',0,69700,,'',0,1500,,'',0,8000,,'',0,9000,,'',0,4000,,'',0
+'588',501,63700,4,'',0,7900,4,'',0,8700,4,'',0,4500,4,'',0,75500,4,'',0,4700,4,'',0,7600,4,'',0,9000,4,'',0
+'589',500,64500,,'',0,7700,,'',0,9600,,'',0,69700,,'',0,1500,,'',0,8000,,'',0,9000,,'',0,4000,,'',0
+'589',501,63700,4,'',0,7900,4,'',0,8700,4,'',0,4500,4,'',0,75500,4,'',0,4700,4,'',0,7600,4,'',0,9000,4,'',0
+'583',1200,72700,4,'',0,8100,4,'',0,4000,4,'',0,68000,4,'',0,8400,4,'',0,4400,4,'',0,8200,4,'',0,8400,4,'',0,21600,4,'',0
+'583',1201,65500,,'',0,8100,,'',0,8000,,'',0,63400,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4600,,'',0
+'584',1200,72700,4,'',0,8100,4,'',0,4000,4,'',0,68000,4,'',0,8400,4,'',0,4400,4,'',0,8200,4,'',0,8400,4,'',0,21600,4,'',0
+'584',1201,65500,,'',0,8100,,'',0,8000,,'',0,63400,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4600,,'',0
+'587',1200,72700,4,'',0,8100,4,'',0,4000,4,'',0,68000,4,'',0,8400,4,'',0,4400,4,'',0,8200,4,'',0,8400,4,'',0,21600,4,'',0
+'587',1201,65500,,'',0,8100,,'',0,8000,,'',0,63400,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4600,,'',0
+'588',1200,72700,4,'',0,8100,4,'',0,4000,4,'',0,68000,4,'',0,8400,4,'',0,4400,4,'',0,8200,4,'',0,8400,4,'',0,21600,4,'',0
+'588',1201,65500,,'',0,8100,,'',0,8000,,'',0,63400,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4600,,'',0
+'589',1200,72700,4,'',0,8100,4,'',0,4000,4,'',0,68000,4,'',0,8400,4,'',0,4400,4,'',0,8200,4,'',0,8400,4,'',0,21600,4,'',0
+'589',1201,65500,,'',0,8100,,'',0,8000,,'',0,63400,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_148 b/src/main/res-current/raw/current_gtfs_schedule_stop_148
index 37a2b995b..bdf6fbfab 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_148
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_148
@@ -1,7 +1,7 @@
-'576',901,115900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',901,91400,,'',0,22000,,'',0,38000,,'',0
-'578',901,91400,,'',0,22000,,'',0,38000,,'',0
-'579',901,91400,,'',0,22000,,'',0,38000,,'',0
-'580',901,91400,,'',0,22000,,'',0,38000,,'',0
-'581',901,115900,,'',0,8500,,'',0,29000,,'',0,8500,,'',0
-'582',901,91400,,'',0,22000,,'',0,38000,,'',0
+'583',901,91400,,'',0,22000,,'',0,38000,,'',0
+'584',901,91400,,'',0,22000,,'',0,38000,,'',0
+'585',901,115900,,'',0,8500,,'',0,29000,,'',0,8500,,'',0
+'586',901,115900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',901,91400,,'',0,22000,,'',0,38000,,'',0
+'588',901,91400,,'',0,22000,,'',0,38000,,'',0
+'589',901,91400,,'',0,22000,,'',0,38000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_149 b/src/main/res-current/raw/current_gtfs_schedule_stop_149
index abe102edf..82deb5974 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_149
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_149
@@ -1,26 +1,26 @@
-'576',200,81500,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'576',201,74900,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',200,61000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'577',201,60800,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'578',200,61000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'578',201,60800,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'579',200,61000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'579',201,60800,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'580',200,61000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'580',201,60800,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'581',200,81400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'581',201,81400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
-'582',200,61000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'582',201,60800,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'576',801,65200,,'',0,27400,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0
-'577',801,63200,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'578',801,63200,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'579',801,63200,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'580',801,63200,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'581',801,65200,,'',0,10200,,'',0,8000,,'',0,7600,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'582',801,63200,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'577',1201,65600,,'',0,8100,,'',0,8000,,'',0,63500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4600,,'',0
-'578',1201,65600,,'',0,8100,,'',0,8000,,'',0,63500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4600,,'',0
-'579',1201,65600,,'',0,8100,,'',0,8000,,'',0,63500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4600,,'',0
-'580',1201,65600,,'',0,8100,,'',0,8000,,'',0,63500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4600,,'',0
-'582',1201,65600,,'',0,8100,,'',0,8000,,'',0,63500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4600,,'',0
+'583',200,61000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'583',201,60800,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'584',200,61000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'584',201,60800,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'585',200,81400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
+'585',201,81400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
+'586',200,81500,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'586',201,74900,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',200,61000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'587',201,60800,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'588',200,61000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'588',201,60800,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'589',200,61000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'589',201,60800,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'583',801,63200,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'584',801,63200,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'585',801,65200,,'',0,10200,,'',0,8000,,'',0,7600,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
+'586',801,65200,,'',0,27400,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0
+'587',801,63200,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'588',801,63200,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'589',801,63200,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'583',1201,65600,,'',0,8100,,'',0,8000,,'',0,63500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4600,,'',0
+'584',1201,65600,,'',0,8100,,'',0,8000,,'',0,63500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4600,,'',0
+'587',1201,65600,,'',0,8100,,'',0,8000,,'',0,63500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4600,,'',0
+'588',1201,65600,,'',0,8100,,'',0,8000,,'',0,63500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4600,,'',0
+'589',1201,65600,,'',0,8100,,'',0,8000,,'',0,63500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_15 b/src/main/res-current/raw/current_gtfs_schedule_stop_15
index f8ffca1b5..78769dd63 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_15
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_15
@@ -1,7 +1,7 @@
-'576',201,74100,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',201,60100,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'578',201,60100,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'579',201,60100,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'580',201,60100,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'581',201,80600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10200,,'',0,10000,,'',0,9600,,'',0
-'582',201,60100,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'583',201,60100,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'584',201,60100,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'585',201,80600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10200,,'',0,10000,,'',0,9600,,'',0
+'586',201,74100,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',201,60100,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'588',201,60100,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'589',201,60100,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_150 b/src/main/res-current/raw/current_gtfs_schedule_stop_150
index efd9ab26a..8394973ef 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_150
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_150
@@ -1,7 +1,7 @@
-'576',1501,83000,,'',0,2200,4,'',0,17800,,'',0,2200,4,'',0,37800,,'',0,2200,4,'',0,24800,,'',0,2200,4,'',0
-'577',1501,70000,,'',0,2300,4,'',0,700,,'',0,2300,4,'',0,4700,,'',0,2300,4,'',0,700,,'',0,2300,4,'',0,67700,,'',0,2400,4,'',0,4600,,'',0,2400,4,'',0,600,,'',0,2400,4,'',0,4600,,'',0,2400,4,'',0
-'578',1501,70000,,'',0,2300,4,'',0,700,,'',0,2300,4,'',0,4700,,'',0,2300,4,'',0,700,,'',0,2300,4,'',0,67700,,'',0,2400,4,'',0,4600,,'',0,2400,4,'',0,600,,'',0,2400,4,'',0,4600,,'',0,2400,4,'',0
-'579',1501,70000,,'',0,2300,4,'',0,700,,'',0,2300,4,'',0,4700,,'',0,2300,4,'',0,700,,'',0,2300,4,'',0,67700,,'',0,2400,4,'',0,4600,,'',0,2400,4,'',0,600,,'',0,2400,4,'',0,4600,,'',0,2400,4,'',0
-'580',1501,70000,,'',0,2300,4,'',0,700,,'',0,2300,4,'',0,4700,,'',0,2300,4,'',0,700,,'',0,2300,4,'',0,67700,,'',0,2400,4,'',0,4600,,'',0,2400,4,'',0,600,,'',0,2400,4,'',0,4600,,'',0,2400,4,'',0
-'581',1501,93100,,'',0,2200,4,'',0,14800,,'',0,2200,4,'',0,17800,,'',0,2200,4,'',0,17800,,'',0,2200,4,'',0,8000,,'',0,2200,4,'',0,7800,,'',0,2200,4,'',0
-'582',1501,70000,,'',0,2300,4,'',0,700,,'',0,2300,4,'',0,4700,,'',0,2300,4,'',0,700,,'',0,2300,4,'',0,67700,,'',0,2400,4,'',0,4600,,'',0,2400,4,'',0,600,,'',0,2400,4,'',0,4600,,'',0,2400,4,'',0
+'583',1501,70000,,'',0,2300,4,'',0,700,,'',0,2300,4,'',0,4700,,'',0,2300,4,'',0,700,,'',0,2300,4,'',0,67700,,'',0,2400,4,'',0,4600,,'',0,2400,4,'',0,600,,'',0,2400,4,'',0,4600,,'',0,2400,4,'',0
+'584',1501,70000,,'',0,2300,4,'',0,700,,'',0,2300,4,'',0,4700,,'',0,2300,4,'',0,700,,'',0,2300,4,'',0,67700,,'',0,2400,4,'',0,4600,,'',0,2400,4,'',0,600,,'',0,2400,4,'',0,4600,,'',0,2400,4,'',0
+'585',1501,93100,,'',0,2200,4,'',0,14800,,'',0,2200,4,'',0,17800,,'',0,2200,4,'',0,17800,,'',0,2200,4,'',0,8000,,'',0,2200,4,'',0,7800,,'',0,2200,4,'',0
+'586',1501,83000,,'',0,2200,4,'',0,17800,,'',0,2200,4,'',0,37800,,'',0,2200,4,'',0,24800,,'',0,2200,4,'',0
+'587',1501,70000,,'',0,2300,4,'',0,700,,'',0,2300,4,'',0,4700,,'',0,2300,4,'',0,700,,'',0,2300,4,'',0,67700,,'',0,2400,4,'',0,4600,,'',0,2400,4,'',0,600,,'',0,2400,4,'',0,4600,,'',0,2400,4,'',0
+'588',1501,70000,,'',0,2300,4,'',0,700,,'',0,2300,4,'',0,4700,,'',0,2300,4,'',0,700,,'',0,2300,4,'',0,67700,,'',0,2400,4,'',0,4600,,'',0,2400,4,'',0,600,,'',0,2400,4,'',0,4600,,'',0,2400,4,'',0
+'589',1501,70000,,'',0,2300,4,'',0,700,,'',0,2300,4,'',0,4700,,'',0,2300,4,'',0,700,,'',0,2300,4,'',0,67700,,'',0,2400,4,'',0,4600,,'',0,2400,4,'',0,600,,'',0,2400,4,'',0,4600,,'',0,2400,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_151 b/src/main/res-current/raw/current_gtfs_schedule_stop_151
index c6d91b55c..1f2959036 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_151
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_151
@@ -1,14 +1,14 @@
-'576',1601,90000,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,300,,'',0,2700,4,'',0,4300,,'',0,2700,4,'',0,300,,'',0,2700,4,'',0,4300,,'',0,2700,4,'',0,300,,'',0,2700,4,'',0,4300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0
-'577',1601,60000,,'',0,2700,4,'',0,300,,'',0,2700,4,'',0,4300,,'',0,2700,4,'',0,300,,'',0,2700,4,'',0,4300,,'',0,3000,,'',0,700,4,'',0,6300,4,'',0,3000,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,8000,,'',0,6300,,'',0,700,4,'',0,2000,4,'',0,800,,'',0,6500,,'',0,200,4,'',0,2500,4,'',0,800,,'',0,6700,4,'',0,3300,,'',0,6700,4,'',0,3300,,'',0,6700,4,'',0,3300,,'',0,6700,4,'',0,2800,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0
-'578',1601,60000,,'',0,2700,4,'',0,300,,'',0,2700,4,'',0,4300,,'',0,2700,4,'',0,300,,'',0,2700,4,'',0,4300,,'',0,3000,,'',0,700,4,'',0,6300,4,'',0,3000,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,8000,,'',0,6300,,'',0,700,4,'',0,2000,4,'',0,800,,'',0,6500,,'',0,200,4,'',0,2500,4,'',0,800,,'',0,6700,4,'',0,3300,,'',0,6700,4,'',0,3300,,'',0,6700,4,'',0,3300,,'',0,6700,4,'',0,2800,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0
-'579',1601,60000,,'',0,2700,4,'',0,300,,'',0,2700,4,'',0,4300,,'',0,2700,4,'',0,300,,'',0,2700,4,'',0,4300,,'',0,3000,,'',0,700,4,'',0,6300,4,'',0,3000,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,8000,,'',0,6300,,'',0,700,4,'',0,2000,4,'',0,800,,'',0,6500,,'',0,200,4,'',0,2500,4,'',0,800,,'',0,6700,4,'',0,3300,,'',0,6700,4,'',0,3300,,'',0,6700,4,'',0,3300,,'',0,6700,4,'',0,2800,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0
-'580',1601,60000,,'',0,2700,4,'',0,300,,'',0,2700,4,'',0,4300,,'',0,2700,4,'',0,300,,'',0,2700,4,'',0,4300,,'',0,3000,,'',0,700,4,'',0,6300,4,'',0,3000,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,8000,,'',0,6300,,'',0,700,4,'',0,2000,4,'',0,800,,'',0,6500,,'',0,200,4,'',0,2500,4,'',0,800,,'',0,6700,4,'',0,3300,,'',0,6700,4,'',0,3300,,'',0,6700,4,'',0,3300,,'',0,6700,4,'',0,2800,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0
-'581',1601,80100,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,400,,'',0,2700,4,'',0,4400,,'',0,2700,4,'',0,300,,'',0,6700,4,'',0,300,,'',0,2700,4,'',0,300,,'',0,6700,4,'',0,300,,'',0,2700,4,'',0,7700,,'',0,2700,4,'',0
-'582',1601,60000,,'',0,2700,4,'',0,300,,'',0,2700,4,'',0,4300,,'',0,2700,4,'',0,300,,'',0,2700,4,'',0,4300,,'',0,3000,,'',0,700,4,'',0,6300,4,'',0,3000,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,8000,,'',0,6300,,'',0,700,4,'',0,2000,4,'',0,800,,'',0,6500,,'',0,200,4,'',0,2500,4,'',0,800,,'',0,6700,4,'',0,3300,,'',0,6700,4,'',0,3300,,'',0,6700,4,'',0,3300,,'',0,6700,4,'',0,2800,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0
-'576',1700,83000,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,18200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0
-'577',1700,60500,,'',0,1900,4,'',0,1100,,'',0,1900,4,'',0,5100,,'',0,1900,4,'',0,1100,,'',0,2200,4,'',0,4300,,'',0,2400,4,'',0,600,,'',0,800,,'',0,1700,4,'',0,4900,4,'',0,100,,'',0,2100,4,'',0,7400,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,1000,,'',0,1500,4,'',0,500,,'',0,500,4,'',0,2000,4,'',0,5500,,'',0,2100,4,'',0,400,,'',0,2000,4,'',0,5000,,'',0,2000,4,'',0,1000,,'',0,2000,4,'',0,5000,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0,7500,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0
-'578',1700,60500,,'',0,1900,4,'',0,1100,,'',0,1900,4,'',0,5100,,'',0,1900,4,'',0,1100,,'',0,2200,4,'',0,4300,,'',0,2400,4,'',0,600,,'',0,800,,'',0,1700,4,'',0,4900,4,'',0,100,,'',0,2100,4,'',0,7400,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,1000,,'',0,1500,4,'',0,500,,'',0,500,4,'',0,2000,4,'',0,5500,,'',0,2100,4,'',0,400,,'',0,2000,4,'',0,5000,,'',0,2000,4,'',0,1000,,'',0,2000,4,'',0,5000,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0,7500,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0
-'579',1700,60500,,'',0,1900,4,'',0,1100,,'',0,1900,4,'',0,5100,,'',0,1900,4,'',0,1100,,'',0,2200,4,'',0,4300,,'',0,2400,4,'',0,600,,'',0,800,,'',0,1700,4,'',0,4900,4,'',0,100,,'',0,2100,4,'',0,7400,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,1000,,'',0,1500,4,'',0,500,,'',0,500,4,'',0,2000,4,'',0,5500,,'',0,2100,4,'',0,400,,'',0,2000,4,'',0,5000,,'',0,2000,4,'',0,1000,,'',0,2000,4,'',0,5000,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0,7500,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0
-'580',1700,60500,,'',0,1900,4,'',0,1100,,'',0,1900,4,'',0,5100,,'',0,1900,4,'',0,1100,,'',0,2200,4,'',0,4300,,'',0,2400,4,'',0,600,,'',0,800,,'',0,1700,4,'',0,4900,4,'',0,100,,'',0,2100,4,'',0,7400,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,1000,,'',0,1500,4,'',0,500,,'',0,500,4,'',0,2000,4,'',0,5500,,'',0,2100,4,'',0,400,,'',0,2000,4,'',0,5000,,'',0,2000,4,'',0,1000,,'',0,2000,4,'',0,5000,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0,7500,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0
-'581',1700,83100,,'',0,1800,4,'',0,18200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8300,,'',0,1800,4,'',0,8300,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8400,,'',0,1800,4,'',0
-'582',1700,60500,,'',0,1900,4,'',0,1100,,'',0,1900,4,'',0,5100,,'',0,1900,4,'',0,1100,,'',0,2200,4,'',0,4300,,'',0,2400,4,'',0,600,,'',0,800,,'',0,1700,4,'',0,4900,4,'',0,100,,'',0,2100,4,'',0,7400,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,1000,,'',0,1500,4,'',0,500,,'',0,500,4,'',0,2000,4,'',0,5500,,'',0,2100,4,'',0,400,,'',0,2000,4,'',0,5000,,'',0,2000,4,'',0,1000,,'',0,2000,4,'',0,5000,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0,7500,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0
+'583',1601,60000,,'',0,2700,4,'',0,300,,'',0,2700,4,'',0,4300,,'',0,2700,4,'',0,300,,'',0,2700,4,'',0,4300,,'',0,3000,,'',0,700,4,'',0,6300,4,'',0,3000,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,8000,,'',0,6300,,'',0,700,4,'',0,2000,4,'',0,800,,'',0,6500,,'',0,200,4,'',0,2500,4,'',0,800,,'',0,6700,4,'',0,3300,,'',0,6700,4,'',0,3300,,'',0,6700,4,'',0,3300,,'',0,6700,4,'',0,2800,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0
+'584',1601,60000,,'',0,2700,4,'',0,300,,'',0,2700,4,'',0,4300,,'',0,2700,4,'',0,300,,'',0,2700,4,'',0,4300,,'',0,3000,,'',0,700,4,'',0,6300,4,'',0,3000,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,8000,,'',0,6300,,'',0,700,4,'',0,2000,4,'',0,800,,'',0,6500,,'',0,200,4,'',0,2500,4,'',0,800,,'',0,6700,4,'',0,3300,,'',0,6700,4,'',0,3300,,'',0,6700,4,'',0,3300,,'',0,6700,4,'',0,2800,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0
+'585',1601,80100,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,400,,'',0,2700,4,'',0,4400,,'',0,2700,4,'',0,300,,'',0,6700,4,'',0,300,,'',0,2700,4,'',0,300,,'',0,6700,4,'',0,300,,'',0,2700,4,'',0,7700,,'',0,2700,4,'',0
+'586',1601,90000,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,300,,'',0,2700,4,'',0,4300,,'',0,2700,4,'',0,300,,'',0,2700,4,'',0,4300,,'',0,2700,4,'',0,300,,'',0,2700,4,'',0,4300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0
+'587',1601,60000,,'',0,2700,4,'',0,300,,'',0,2700,4,'',0,4300,,'',0,2700,4,'',0,300,,'',0,2700,4,'',0,4300,,'',0,3000,,'',0,700,4,'',0,6300,4,'',0,3000,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,8000,,'',0,6300,,'',0,700,4,'',0,2000,4,'',0,800,,'',0,6500,,'',0,200,4,'',0,2500,4,'',0,800,,'',0,6700,4,'',0,3300,,'',0,6700,4,'',0,3300,,'',0,6700,4,'',0,3300,,'',0,6700,4,'',0,2800,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0
+'588',1601,60000,,'',0,2700,4,'',0,300,,'',0,2700,4,'',0,4300,,'',0,2700,4,'',0,300,,'',0,2700,4,'',0,4300,,'',0,3000,,'',0,700,4,'',0,6300,4,'',0,3000,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,8000,,'',0,6300,,'',0,700,4,'',0,2000,4,'',0,800,,'',0,6500,,'',0,200,4,'',0,2500,4,'',0,800,,'',0,6700,4,'',0,3300,,'',0,6700,4,'',0,3300,,'',0,6700,4,'',0,3300,,'',0,6700,4,'',0,2800,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0
+'589',1601,60000,,'',0,2700,4,'',0,300,,'',0,2700,4,'',0,4300,,'',0,2700,4,'',0,300,,'',0,2700,4,'',0,4300,,'',0,3000,,'',0,700,4,'',0,6300,4,'',0,3000,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,8000,,'',0,6300,,'',0,700,4,'',0,2000,4,'',0,800,,'',0,6500,,'',0,200,4,'',0,2500,4,'',0,800,,'',0,6700,4,'',0,3300,,'',0,6700,4,'',0,3300,,'',0,6700,4,'',0,3300,,'',0,6700,4,'',0,2800,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0
+'583',1700,60500,,'',0,1900,4,'',0,1100,,'',0,1900,4,'',0,5100,,'',0,1900,4,'',0,1100,,'',0,2200,4,'',0,4300,,'',0,2400,4,'',0,600,,'',0,800,,'',0,1700,4,'',0,4900,4,'',0,100,,'',0,2100,4,'',0,7400,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,1000,,'',0,1500,4,'',0,500,,'',0,500,4,'',0,2000,4,'',0,5500,,'',0,2100,4,'',0,400,,'',0,2000,4,'',0,5000,,'',0,2000,4,'',0,1000,,'',0,2000,4,'',0,5000,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0,7500,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0
+'584',1700,60500,,'',0,1900,4,'',0,1100,,'',0,1900,4,'',0,5100,,'',0,1900,4,'',0,1100,,'',0,2200,4,'',0,4300,,'',0,2400,4,'',0,600,,'',0,800,,'',0,1700,4,'',0,4900,4,'',0,100,,'',0,2100,4,'',0,7400,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,1000,,'',0,1500,4,'',0,500,,'',0,500,4,'',0,2000,4,'',0,5500,,'',0,2100,4,'',0,400,,'',0,2000,4,'',0,5000,,'',0,2000,4,'',0,1000,,'',0,2000,4,'',0,5000,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0,7500,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0
+'585',1700,83100,,'',0,1800,4,'',0,18200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8300,,'',0,1800,4,'',0,8300,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8400,,'',0,1800,4,'',0
+'586',1700,83000,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,18200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0
+'587',1700,60500,,'',0,1900,4,'',0,1100,,'',0,1900,4,'',0,5100,,'',0,1900,4,'',0,1100,,'',0,2200,4,'',0,4300,,'',0,2400,4,'',0,600,,'',0,800,,'',0,1700,4,'',0,4900,4,'',0,100,,'',0,2100,4,'',0,7400,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,1000,,'',0,1500,4,'',0,500,,'',0,500,4,'',0,2000,4,'',0,5500,,'',0,2100,4,'',0,400,,'',0,2000,4,'',0,5000,,'',0,2000,4,'',0,1000,,'',0,2000,4,'',0,5000,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0,7500,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0
+'588',1700,60500,,'',0,1900,4,'',0,1100,,'',0,1900,4,'',0,5100,,'',0,1900,4,'',0,1100,,'',0,2200,4,'',0,4300,,'',0,2400,4,'',0,600,,'',0,800,,'',0,1700,4,'',0,4900,4,'',0,100,,'',0,2100,4,'',0,7400,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,1000,,'',0,1500,4,'',0,500,,'',0,500,4,'',0,2000,4,'',0,5500,,'',0,2100,4,'',0,400,,'',0,2000,4,'',0,5000,,'',0,2000,4,'',0,1000,,'',0,2000,4,'',0,5000,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0,7500,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0
+'589',1700,60500,,'',0,1900,4,'',0,1100,,'',0,1900,4,'',0,5100,,'',0,1900,4,'',0,1100,,'',0,2200,4,'',0,4300,,'',0,2400,4,'',0,600,,'',0,800,,'',0,1700,4,'',0,4900,4,'',0,100,,'',0,2100,4,'',0,7400,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,1000,,'',0,1500,4,'',0,500,,'',0,500,4,'',0,2000,4,'',0,5500,,'',0,2100,4,'',0,400,,'',0,2000,4,'',0,5000,,'',0,2000,4,'',0,1000,,'',0,2000,4,'',0,5000,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0,7500,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_152 b/src/main/res-current/raw/current_gtfs_schedule_stop_152
index 5ad8032ce..85c6f53d0 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_152
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_152
@@ -1,28 +1,28 @@
-'576',200,80500,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'576',201,80300,4,'',0,5500,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0,10000,4,'',0
-'577',200,60000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',201,62000,4,'',0,3000,4,'',0,7200,4,'',0,1500,4,'',0,1500,4,'',0,5600,4,'',0,1500,4,'',0,1500,4,'',0,700,4,'',0,800,4,'',0,5500,4,'',0,1600,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1400,4,'',0,3000,4,'',0,7000,4,'',0,10000,4,'',0,9900,4,'',0,9800,4,'',0,10000,4,'',0,10000,4,'',0
-'578',200,60000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'578',201,62000,4,'',0,3000,4,'',0,7200,4,'',0,1500,4,'',0,1500,4,'',0,5600,4,'',0,1500,4,'',0,1500,4,'',0,700,4,'',0,800,4,'',0,5500,4,'',0,1600,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1400,4,'',0,3000,4,'',0,7000,4,'',0,10000,4,'',0,9900,4,'',0,9800,4,'',0,10000,4,'',0,10000,4,'',0
-'579',200,60000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'579',201,62000,4,'',0,3000,4,'',0,7200,4,'',0,1500,4,'',0,1500,4,'',0,5600,4,'',0,1500,4,'',0,1500,4,'',0,700,4,'',0,800,4,'',0,5500,4,'',0,1600,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1400,4,'',0,3000,4,'',0,7000,4,'',0,10000,4,'',0,9900,4,'',0,9800,4,'',0,10000,4,'',0,10000,4,'',0
-'580',200,60000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'580',201,62000,4,'',0,3000,4,'',0,7200,4,'',0,1500,4,'',0,1500,4,'',0,5600,4,'',0,1500,4,'',0,1500,4,'',0,700,4,'',0,800,4,'',0,5500,4,'',0,1600,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1400,4,'',0,3000,4,'',0,7000,4,'',0,10000,4,'',0,9900,4,'',0,9800,4,'',0,10000,4,'',0,10000,4,'',0
-'581',200,80400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9400,,'',0,10200,,'',0,10100,,'',0
-'581',201,82800,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,7000,4,'',0,7500,4,'',0,9800,4,'',0,10000,4,'',0,10000,4,'',0,5600,4,'',0
-'582',200,60000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',201,62000,4,'',0,3000,4,'',0,7200,4,'',0,1500,4,'',0,1500,4,'',0,5600,4,'',0,1500,4,'',0,1500,4,'',0,700,4,'',0,800,4,'',0,5500,4,'',0,1600,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1400,4,'',0,3000,4,'',0,7000,4,'',0,10000,4,'',0,9900,4,'',0,9800,4,'',0,10000,4,'',0,10000,4,'',0
-'576',600,90300,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'576',601,82700,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0,10000,4,'',0
-'577',600,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',601,63500,4,'',0,7000,4,'',0,3200,4,'',0,7100,4,'',0,1700,4,'',0,1300,4,'',0,6900,4,'',0,3000,4,'',0,7000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1600,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6800,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'578',600,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'578',601,63500,4,'',0,7000,4,'',0,3200,4,'',0,7100,4,'',0,1700,4,'',0,1300,4,'',0,6900,4,'',0,3000,4,'',0,7000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1600,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6800,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'579',600,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'579',601,63500,4,'',0,7000,4,'',0,3200,4,'',0,7100,4,'',0,1700,4,'',0,1300,4,'',0,6900,4,'',0,3000,4,'',0,7000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1600,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6800,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'580',600,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'580',601,63500,4,'',0,7000,4,'',0,3200,4,'',0,7100,4,'',0,1700,4,'',0,1300,4,'',0,6900,4,'',0,3000,4,'',0,7000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1600,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6800,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'581',600,74900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'581',601,81200,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,8900,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9800,4,'',0
-'582',600,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',601,63500,4,'',0,7000,4,'',0,3200,4,'',0,7100,4,'',0,1700,4,'',0,1300,4,'',0,6900,4,'',0,3000,4,'',0,7000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1600,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6800,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'583',200,60000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'583',201,62000,4,'',0,3000,4,'',0,7200,4,'',0,1500,4,'',0,1500,4,'',0,5600,4,'',0,1500,4,'',0,1500,4,'',0,700,4,'',0,800,4,'',0,5500,4,'',0,1600,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1400,4,'',0,3000,4,'',0,7000,4,'',0,10000,4,'',0,9900,4,'',0,9800,4,'',0,10000,4,'',0,10000,4,'',0
+'584',200,60000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'584',201,62000,4,'',0,3000,4,'',0,7200,4,'',0,1500,4,'',0,1500,4,'',0,5600,4,'',0,1500,4,'',0,1500,4,'',0,700,4,'',0,800,4,'',0,5500,4,'',0,1600,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1400,4,'',0,3000,4,'',0,7000,4,'',0,10000,4,'',0,9900,4,'',0,9800,4,'',0,10000,4,'',0,10000,4,'',0
+'585',200,80400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9400,,'',0,10200,,'',0,10100,,'',0
+'585',201,82800,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,7000,4,'',0,7500,4,'',0,9800,4,'',0,10000,4,'',0,10000,4,'',0,5600,4,'',0
+'586',200,80500,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',201,80300,4,'',0,5500,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0,10000,4,'',0
+'587',200,60000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',201,62000,4,'',0,3000,4,'',0,7200,4,'',0,1500,4,'',0,1500,4,'',0,5600,4,'',0,1500,4,'',0,1500,4,'',0,700,4,'',0,800,4,'',0,5500,4,'',0,1600,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1400,4,'',0,3000,4,'',0,7000,4,'',0,10000,4,'',0,9900,4,'',0,9800,4,'',0,10000,4,'',0,10000,4,'',0
+'588',200,60000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'588',201,62000,4,'',0,3000,4,'',0,7200,4,'',0,1500,4,'',0,1500,4,'',0,5600,4,'',0,1500,4,'',0,1500,4,'',0,700,4,'',0,800,4,'',0,5500,4,'',0,1600,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1400,4,'',0,3000,4,'',0,7000,4,'',0,10000,4,'',0,9900,4,'',0,9800,4,'',0,10000,4,'',0,10000,4,'',0
+'589',200,60000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'589',201,62000,4,'',0,3000,4,'',0,7200,4,'',0,1500,4,'',0,1500,4,'',0,5600,4,'',0,1500,4,'',0,1500,4,'',0,700,4,'',0,800,4,'',0,5500,4,'',0,1600,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1400,4,'',0,3000,4,'',0,7000,4,'',0,10000,4,'',0,9900,4,'',0,9800,4,'',0,10000,4,'',0,10000,4,'',0
+'583',600,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'583',601,63500,4,'',0,7000,4,'',0,3200,4,'',0,7100,4,'',0,1700,4,'',0,1300,4,'',0,6900,4,'',0,3000,4,'',0,7000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1600,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6800,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'584',600,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'584',601,63500,4,'',0,7000,4,'',0,3200,4,'',0,7100,4,'',0,1700,4,'',0,1300,4,'',0,6900,4,'',0,3000,4,'',0,7000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1600,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6800,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'585',600,74900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'585',601,81200,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,8900,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9800,4,'',0
+'586',600,90300,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',601,82700,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0,10000,4,'',0
+'587',600,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',601,63500,4,'',0,7000,4,'',0,3200,4,'',0,7100,4,'',0,1700,4,'',0,1300,4,'',0,6900,4,'',0,3000,4,'',0,7000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1600,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6800,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'588',600,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'588',601,63500,4,'',0,7000,4,'',0,3200,4,'',0,7100,4,'',0,1700,4,'',0,1300,4,'',0,6900,4,'',0,3000,4,'',0,7000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1600,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6800,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'589',600,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'589',601,63500,4,'',0,7000,4,'',0,3200,4,'',0,7100,4,'',0,1700,4,'',0,1300,4,'',0,6900,4,'',0,3000,4,'',0,7000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1600,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6800,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_153 b/src/main/res-current/raw/current_gtfs_schedule_stop_153
index d87a99af9..221b05644 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_153
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_153
@@ -1,7 +1,7 @@
-'576',900,120900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',900,92600,,'',0,31200,,'',0,28800,,'',0
-'578',900,92600,,'',0,31200,,'',0,28800,,'',0
-'579',900,92600,,'',0,31200,,'',0,28800,,'',0
-'580',900,92600,,'',0,31200,,'',0,28800,,'',0
-'581',900,120900,,'',0,4500,,'',0,20500,,'',0,8500,,'',0
-'582',900,92600,,'',0,31200,,'',0,28800,,'',0
+'583',900,92600,,'',0,31200,,'',0,28800,,'',0
+'584',900,92600,,'',0,31200,,'',0,28800,,'',0
+'585',900,120900,,'',0,4500,,'',0,20500,,'',0,8500,,'',0
+'586',900,120900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',900,92600,,'',0,31200,,'',0,28800,,'',0
+'588',900,92600,,'',0,31200,,'',0,28800,,'',0
+'589',900,92600,,'',0,31200,,'',0,28800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_154 b/src/main/res-current/raw/current_gtfs_schedule_stop_154
index 314c2bd1f..a6da90225 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_154
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_154
@@ -1,7 +1,7 @@
-'576',201,75400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',201,61300,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'578',201,61300,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'579',201,61300,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'580',201,61300,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'581',201,81900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
-'582',201,61300,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'583',201,61300,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'584',201,61300,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'585',201,81900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
+'586',201,75400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',201,61300,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'588',201,61300,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'589',201,61300,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_155 b/src/main/res-current/raw/current_gtfs_schedule_stop_155
index e11963e2e..a7c1015c2 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_155
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_155
@@ -1,7 +1,7 @@
-'576',1900,80500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'577',1900,65000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'578',1900,65000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'579',1900,65000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'580',1900,65000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'581',1900,73500,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'582',1900,65000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'583',1900,65000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'584',1900,65000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'585',1900,73500,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'586',1900,80500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'587',1900,65000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'588',1900,65000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'589',1900,65000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_156 b/src/main/res-current/raw/current_gtfs_schedule_stop_156
index 3bca5c16b..8fd79ee14 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_156
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_156
@@ -1,5 +1,5 @@
-'577',2700,65600,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'578',2700,65600,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'579',2700,65600,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'580',2700,65600,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'582',2700,65600,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'583',2700,65600,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'584',2700,65600,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'587',2700,65600,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'588',2700,65600,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'589',2700,65600,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_157 b/src/main/res-current/raw/current_gtfs_schedule_stop_157
index 9a0f84774..8ed1fba01 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_157
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_157
@@ -1,14 +1,14 @@
-'576',200,81600,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'576',201,75000,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',200,61100,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,800,,'',0,700,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'577',201,60900,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,4,'',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'578',200,61100,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,800,,'',0,700,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'578',201,60900,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,4,'',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'579',200,61100,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,800,,'',0,700,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'579',201,60900,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,4,'',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'580',200,61100,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,800,,'',0,700,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'580',201,60900,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,4,'',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'581',200,81500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'581',201,81500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
-'582',200,61100,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,800,,'',0,700,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'582',201,60900,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,4,'',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'583',200,61100,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,800,,'',0,700,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'583',201,60900,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,4,'',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'584',200,61100,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,800,,'',0,700,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'584',201,60900,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,4,'',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'585',200,81500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
+'585',201,81500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
+'586',200,81600,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'586',201,75000,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',200,61100,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,800,,'',0,700,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'587',201,60900,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,4,'',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'588',200,61100,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,800,,'',0,700,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'588',201,60900,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,4,'',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'589',200,61100,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,800,,'',0,700,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'589',201,60900,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,4,'',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_158 b/src/main/res-current/raw/current_gtfs_schedule_stop_158
index 04a0783d2..8fce5e5ba 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_158
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_158
@@ -1,14 +1,14 @@
-'576',701,80500,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'577',701,62000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'578',701,62000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'579',701,62000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'580',701,62000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'581',701,81000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',701,62000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'576',1800,73400,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'577',1800,62000,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'578',1800,62000,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'579',1800,62000,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'580',1800,62000,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'581',1800,73400,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'582',1800,62000,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'583',701,62000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'584',701,62000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'585',701,81000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',701,80500,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'587',701,62000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'588',701,62000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'589',701,62000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'583',1800,62000,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'584',1800,62000,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'585',1800,73400,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'586',1800,73400,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'587',1800,62000,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'588',1800,62000,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'589',1800,62000,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_159 b/src/main/res-current/raw/current_gtfs_schedule_stop_159
index 0f2aa95cc..87d65a208 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_159
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_159
@@ -1,29 +1,29 @@
-'577',501,63300,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,71500,,'',0,8700,,'',0,7600,,'',0,9000,,'',0
-'578',501,63300,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,71500,,'',0,8700,,'',0,7600,,'',0,9000,,'',0
-'579',501,63300,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,71500,,'',0,8700,,'',0,7600,,'',0,9000,,'',0
-'580',501,63300,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,71500,,'',0,8700,,'',0,7600,,'',0,9000,,'',0
-'582',501,63300,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,71500,,'',0,8700,,'',0,7600,,'',0,9000,,'',0
-'576',800,65800,,'',0,14200,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
-'576',801,65300,4,'',0,27400,4,'',0,9200,4,'',0,9100,4,'',0,9000,4,'',0,5000,4,'',0,9000,4,'',0,9000,4,'',0,7500,4,'',0,3500,4,'',0,7000,4,'',0,3500,4,'',0,7500,4,'',0,3400,4,'',0,8500,4,'',0,8500,4,'',0,9000,4,'',0,9000,4,'',0,5000,4,'',0,9000,4,'',0
-'577',800,55500,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
-'577',801,63300,4,'',0,8600,4,'',0,2800,4,'',0,6300,4,'',0,1200,4,'',0,1200,4,'',0,1300,4,'',0,1200,4,'',0,5200,4,'',0,1200,4,'',0,1300,4,'',0,1200,4,'',0,5200,4,'',0,1200,4,'',0,1200,4,'',0,1300,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5800,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1200,4,'',0,1300,4,'',0,1500,4,'',0,5300,4,'',0,1200,4,'',0,1200,4,'',0,1200,4,'',0,1200,4,'',0,5000,4,'',0,1100,4,'',0,1000,4,'',0,1200,4,'',0,1100,4,'',0,1200,4,'',0,5000,4,'',0,1000,4,'',0,1200,4,'',0,1100,4,'',0,5900,4,'',0,1800,4,'',0,1800,4,'',0,2000,4,'',0,6500,4,'',0,2400,4,'',0,6300,4,'',0,2500,4,'',0,2500,4,'',0,6400,4,'',0,8500,4,'',0,4300,4,'',0,8500,4,'',0,8400,4,'',0
-'578',800,55500,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
-'578',801,63300,4,'',0,8600,4,'',0,2800,4,'',0,6300,4,'',0,1200,4,'',0,1200,4,'',0,1300,4,'',0,1200,4,'',0,5200,4,'',0,1200,4,'',0,1300,4,'',0,1200,4,'',0,5200,4,'',0,1200,4,'',0,1200,4,'',0,1300,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5800,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1200,4,'',0,1300,4,'',0,1500,4,'',0,5300,4,'',0,1200,4,'',0,1200,4,'',0,1200,4,'',0,1200,4,'',0,5000,4,'',0,1100,4,'',0,1000,4,'',0,1200,4,'',0,1100,4,'',0,1200,4,'',0,5000,4,'',0,1000,4,'',0,1200,4,'',0,1100,4,'',0,5900,4,'',0,1800,4,'',0,1800,4,'',0,2000,4,'',0,6500,4,'',0,2400,4,'',0,6300,4,'',0,2500,4,'',0,2500,4,'',0,6400,4,'',0,8500,4,'',0,4300,4,'',0,8500,4,'',0,8400,4,'',0
-'579',800,55500,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
-'579',801,63300,4,'',0,8600,4,'',0,2800,4,'',0,6300,4,'',0,1200,4,'',0,1200,4,'',0,1300,4,'',0,1200,4,'',0,5200,4,'',0,1200,4,'',0,1300,4,'',0,1200,4,'',0,5200,4,'',0,1200,4,'',0,1200,4,'',0,1300,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5800,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1200,4,'',0,1300,4,'',0,1500,4,'',0,5300,4,'',0,1200,4,'',0,1200,4,'',0,1200,4,'',0,1200,4,'',0,5000,4,'',0,1100,4,'',0,1000,4,'',0,1200,4,'',0,1100,4,'',0,1200,4,'',0,5000,4,'',0,1000,4,'',0,1200,4,'',0,1100,4,'',0,5900,4,'',0,1800,4,'',0,1800,4,'',0,2000,4,'',0,6500,4,'',0,2400,4,'',0,6300,4,'',0,2500,4,'',0,2500,4,'',0,6400,4,'',0,8500,4,'',0,4300,4,'',0,8500,4,'',0,8400,4,'',0
-'580',800,55500,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
-'580',801,63300,4,'',0,8600,4,'',0,2800,4,'',0,6300,4,'',0,1200,4,'',0,1200,4,'',0,1300,4,'',0,1200,4,'',0,5200,4,'',0,1200,4,'',0,1300,4,'',0,1200,4,'',0,5200,4,'',0,1200,4,'',0,1200,4,'',0,1300,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5800,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1200,4,'',0,1300,4,'',0,1500,4,'',0,5300,4,'',0,1200,4,'',0,1200,4,'',0,1200,4,'',0,1200,4,'',0,5000,4,'',0,1100,4,'',0,1000,4,'',0,1200,4,'',0,1100,4,'',0,1200,4,'',0,5000,4,'',0,1000,4,'',0,1200,4,'',0,1100,4,'',0,5900,4,'',0,1800,4,'',0,1800,4,'',0,2000,4,'',0,6500,4,'',0,2400,4,'',0,6300,4,'',0,2500,4,'',0,2500,4,'',0,6400,4,'',0,8500,4,'',0,4300,4,'',0,8500,4,'',0,8400,4,'',0
-'581',800,65500,,'',0,8500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'581',801,65300,4,'',0,10200,4,'',0,8000,4,'',0,7600,4,'',0,3700,4,'',0,7500,4,'',0,3000,4,'',0,7500,4,'',0,7500,4,'',0,3000,4,'',0,7500,4,'',0,3500,4,'',0,7000,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,7000,4,'',0,3300,4,'',0,7400,4,'',0,2800,4,'',0,7500,4,'',0,3500,4,'',0,7000,4,'',0,10000,4,'',0,11000,4,'',0,11000,4,'',0
-'582',800,55500,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
-'582',801,63300,4,'',0,8600,4,'',0,2800,4,'',0,6300,4,'',0,1200,4,'',0,1200,4,'',0,1300,4,'',0,1200,4,'',0,5200,4,'',0,1200,4,'',0,1300,4,'',0,1200,4,'',0,5200,4,'',0,1200,4,'',0,1200,4,'',0,1300,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5800,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1200,4,'',0,1300,4,'',0,1500,4,'',0,5300,4,'',0,1200,4,'',0,1200,4,'',0,1200,4,'',0,1200,4,'',0,5000,4,'',0,1100,4,'',0,1000,4,'',0,1200,4,'',0,1100,4,'',0,1200,4,'',0,5000,4,'',0,1000,4,'',0,1200,4,'',0,1100,4,'',0,5900,4,'',0,1800,4,'',0,1800,4,'',0,2000,4,'',0,6500,4,'',0,2400,4,'',0,6300,4,'',0,2500,4,'',0,2500,4,'',0,6400,4,'',0,8500,4,'',0,4300,4,'',0,8500,4,'',0,8400,4,'',0
-'577',1200,72200,,'',0,8100,,'',0,4000,,'',0,67900,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8500,,'',0,21600,,'',0
-'578',1200,72200,,'',0,8100,,'',0,4000,,'',0,67900,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8500,,'',0,21600,,'',0
-'579',1200,72200,,'',0,8100,,'',0,4000,,'',0,67900,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8500,,'',0,21600,,'',0
-'580',1200,72200,,'',0,8100,,'',0,4000,,'',0,67900,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8500,,'',0,21600,,'',0
-'582',1200,72200,,'',0,8100,,'',0,4000,,'',0,67900,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8500,,'',0,21600,,'',0
-'577',2901,152600,0,'',0
-'578',2901,152600,0,'',0
-'579',2901,152600,0,'',0
-'580',2901,152600,0,'',0
-'582',2901,152600,0,'',0
+'583',501,63300,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,71500,,'',0,8700,,'',0,7600,,'',0,9000,,'',0
+'584',501,63300,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,71500,,'',0,8700,,'',0,7600,,'',0,9000,,'',0
+'587',501,63300,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,71500,,'',0,8700,,'',0,7600,,'',0,9000,,'',0
+'588',501,63300,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,71500,,'',0,8700,,'',0,7600,,'',0,9000,,'',0
+'589',501,63300,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,71500,,'',0,8700,,'',0,7600,,'',0,9000,,'',0
+'583',800,55500,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'583',801,63300,4,'',0,8600,4,'',0,2800,4,'',0,6300,4,'',0,1200,4,'',0,1200,4,'',0,1300,4,'',0,1200,4,'',0,5200,4,'',0,1200,4,'',0,1300,4,'',0,1200,4,'',0,5200,4,'',0,1200,4,'',0,1200,4,'',0,1300,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5800,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1200,4,'',0,1300,4,'',0,1500,4,'',0,5300,4,'',0,1200,4,'',0,1200,4,'',0,1200,4,'',0,1200,4,'',0,5000,4,'',0,1100,4,'',0,1000,4,'',0,1200,4,'',0,1100,4,'',0,1200,4,'',0,5000,4,'',0,1000,4,'',0,1200,4,'',0,1100,4,'',0,5900,4,'',0,1800,4,'',0,1800,4,'',0,2000,4,'',0,6500,4,'',0,2400,4,'',0,6300,4,'',0,2500,4,'',0,2500,4,'',0,6400,4,'',0,8500,4,'',0,4300,4,'',0,8500,4,'',0,8400,4,'',0
+'584',800,55500,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'584',801,63300,4,'',0,8600,4,'',0,2800,4,'',0,6300,4,'',0,1200,4,'',0,1200,4,'',0,1300,4,'',0,1200,4,'',0,5200,4,'',0,1200,4,'',0,1300,4,'',0,1200,4,'',0,5200,4,'',0,1200,4,'',0,1200,4,'',0,1300,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5800,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1200,4,'',0,1300,4,'',0,1500,4,'',0,5300,4,'',0,1200,4,'',0,1200,4,'',0,1200,4,'',0,1200,4,'',0,5000,4,'',0,1100,4,'',0,1000,4,'',0,1200,4,'',0,1100,4,'',0,1200,4,'',0,5000,4,'',0,1000,4,'',0,1200,4,'',0,1100,4,'',0,5900,4,'',0,1800,4,'',0,1800,4,'',0,2000,4,'',0,6500,4,'',0,2400,4,'',0,6300,4,'',0,2500,4,'',0,2500,4,'',0,6400,4,'',0,8500,4,'',0,4300,4,'',0,8500,4,'',0,8400,4,'',0
+'585',800,65500,,'',0,8500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
+'585',801,65300,4,'',0,10200,4,'',0,8000,4,'',0,7600,4,'',0,3700,4,'',0,7500,4,'',0,3000,4,'',0,7500,4,'',0,7500,4,'',0,3000,4,'',0,7500,4,'',0,3500,4,'',0,7000,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,7000,4,'',0,3300,4,'',0,7400,4,'',0,2800,4,'',0,7500,4,'',0,3500,4,'',0,7000,4,'',0,10000,4,'',0,11000,4,'',0,11000,4,'',0
+'586',800,65800,,'',0,14200,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
+'586',801,65300,4,'',0,27400,4,'',0,9200,4,'',0,9100,4,'',0,9000,4,'',0,5000,4,'',0,9000,4,'',0,9000,4,'',0,7500,4,'',0,3500,4,'',0,7000,4,'',0,3500,4,'',0,7500,4,'',0,3400,4,'',0,8500,4,'',0,8500,4,'',0,9000,4,'',0,9000,4,'',0,5000,4,'',0,9000,4,'',0
+'587',800,55500,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'587',801,63300,4,'',0,8600,4,'',0,2800,4,'',0,6300,4,'',0,1200,4,'',0,1200,4,'',0,1300,4,'',0,1200,4,'',0,5200,4,'',0,1200,4,'',0,1300,4,'',0,1200,4,'',0,5200,4,'',0,1200,4,'',0,1200,4,'',0,1300,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5800,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1200,4,'',0,1300,4,'',0,1500,4,'',0,5300,4,'',0,1200,4,'',0,1200,4,'',0,1200,4,'',0,1200,4,'',0,5000,4,'',0,1100,4,'',0,1000,4,'',0,1200,4,'',0,1100,4,'',0,1200,4,'',0,5000,4,'',0,1000,4,'',0,1200,4,'',0,1100,4,'',0,5900,4,'',0,1800,4,'',0,1800,4,'',0,2000,4,'',0,6500,4,'',0,2400,4,'',0,6300,4,'',0,2500,4,'',0,2500,4,'',0,6400,4,'',0,8500,4,'',0,4300,4,'',0,8500,4,'',0,8400,4,'',0
+'588',800,55500,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'588',801,63300,4,'',0,8600,4,'',0,2800,4,'',0,6300,4,'',0,1200,4,'',0,1200,4,'',0,1300,4,'',0,1200,4,'',0,5200,4,'',0,1200,4,'',0,1300,4,'',0,1200,4,'',0,5200,4,'',0,1200,4,'',0,1200,4,'',0,1300,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5800,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1200,4,'',0,1300,4,'',0,1500,4,'',0,5300,4,'',0,1200,4,'',0,1200,4,'',0,1200,4,'',0,1200,4,'',0,5000,4,'',0,1100,4,'',0,1000,4,'',0,1200,4,'',0,1100,4,'',0,1200,4,'',0,5000,4,'',0,1000,4,'',0,1200,4,'',0,1100,4,'',0,5900,4,'',0,1800,4,'',0,1800,4,'',0,2000,4,'',0,6500,4,'',0,2400,4,'',0,6300,4,'',0,2500,4,'',0,2500,4,'',0,6400,4,'',0,8500,4,'',0,4300,4,'',0,8500,4,'',0,8400,4,'',0
+'589',800,55500,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'589',801,63300,4,'',0,8600,4,'',0,2800,4,'',0,6300,4,'',0,1200,4,'',0,1200,4,'',0,1300,4,'',0,1200,4,'',0,5200,4,'',0,1200,4,'',0,1300,4,'',0,1200,4,'',0,5200,4,'',0,1200,4,'',0,1200,4,'',0,1300,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5800,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1200,4,'',0,1300,4,'',0,1500,4,'',0,5300,4,'',0,1200,4,'',0,1200,4,'',0,1200,4,'',0,1200,4,'',0,5000,4,'',0,1100,4,'',0,1000,4,'',0,1200,4,'',0,1100,4,'',0,1200,4,'',0,5000,4,'',0,1000,4,'',0,1200,4,'',0,1100,4,'',0,5900,4,'',0,1800,4,'',0,1800,4,'',0,2000,4,'',0,6500,4,'',0,2400,4,'',0,6300,4,'',0,2500,4,'',0,2500,4,'',0,6400,4,'',0,8500,4,'',0,4300,4,'',0,8500,4,'',0,8400,4,'',0
+'583',1200,72200,,'',0,8100,,'',0,4000,,'',0,67900,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8500,,'',0,21600,,'',0
+'584',1200,72200,,'',0,8100,,'',0,4000,,'',0,67900,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8500,,'',0,21600,,'',0
+'587',1200,72200,,'',0,8100,,'',0,4000,,'',0,67900,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8500,,'',0,21600,,'',0
+'588',1200,72200,,'',0,8100,,'',0,4000,,'',0,67900,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8500,,'',0,21600,,'',0
+'589',1200,72200,,'',0,8100,,'',0,4000,,'',0,67900,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8500,,'',0,21600,,'',0
+'583',2901,152600,0,'',0
+'584',2901,152600,0,'',0
+'587',2901,152600,0,'',0
+'588',2901,152600,0,'',0
+'589',2901,152600,0,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_16 b/src/main/res-current/raw/current_gtfs_schedule_stop_16
index faf55cbfb..3820a416e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_16
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_16
@@ -1,7 +1,7 @@
-'576',200,82400,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,9900,,'',0
-'577',200,61900,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'578',200,61900,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'579',200,61900,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'580',200,61900,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'581',200,82300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'582',200,61900,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'583',200,61900,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'584',200,61900,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'585',200,82300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
+'586',200,82400,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,9900,,'',0
+'587',200,61900,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'588',200,61900,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'589',200,61900,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_160 b/src/main/res-current/raw/current_gtfs_schedule_stop_160
index ae31f9105..08cdb6a83 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_160
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_160
@@ -1,14 +1,14 @@
-'576',700,85800,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'577',700,70900,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'578',700,70900,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'579',700,70900,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'580',700,70900,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'581',700,82100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',700,70900,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'576',1801,82400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'577',1801,64000,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'578',1801,64000,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'579',1801,64000,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'580',1801,64000,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'581',1801,75400,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'582',1801,64000,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'583',700,70900,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'584',700,70900,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'585',700,82100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',700,85800,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
+'587',700,70900,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'588',700,70900,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'589',700,70900,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'583',1801,64000,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'584',1801,64000,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'585',1801,75400,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'586',1801,82400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'587',1801,64000,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'588',1801,64000,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'589',1801,64000,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_161 b/src/main/res-current/raw/current_gtfs_schedule_stop_161
index 7cd645959..dabcff4ef 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_161
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_161
@@ -1,21 +1,21 @@
-'576',800,70700,,'',0,10200,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
-'577',800,60500,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
-'578',800,60500,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
-'579',800,60500,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
-'580',800,60500,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
-'581',800,70500,,'',0,4500,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'582',800,60500,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
-'576',901,120000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',901,91500,,'',0,22000,,'',0,38000,,'',0
-'578',901,91500,,'',0,22000,,'',0,38000,,'',0
-'579',901,91500,,'',0,22000,,'',0,38000,,'',0
-'580',901,91500,,'',0,22000,,'',0,38000,,'',0
-'581',901,120000,,'',0,4500,,'',0,29000,,'',0,8500,,'',0
-'582',901,91500,,'',0,22000,,'',0,38000,,'',0
-'576',1101,75000,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
-'577',1101,65700,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'578',1101,65700,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'579',1101,65700,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'580',1101,65700,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'581',1101,81100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'582',1101,65700,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'583',800,60500,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
+'584',800,60500,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
+'585',800,70500,,'',0,4500,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
+'586',800,70700,,'',0,10200,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
+'587',800,60500,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
+'588',800,60500,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
+'589',800,60500,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
+'583',901,91500,,'',0,22000,,'',0,38000,,'',0
+'584',901,91500,,'',0,22000,,'',0,38000,,'',0
+'585',901,120000,,'',0,4500,,'',0,29000,,'',0,8500,,'',0
+'586',901,120000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',901,91500,,'',0,22000,,'',0,38000,,'',0
+'588',901,91500,,'',0,22000,,'',0,38000,,'',0
+'589',901,91500,,'',0,22000,,'',0,38000,,'',0
+'583',1101,65700,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'584',1101,65700,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'585',1101,81100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'586',1101,75000,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
+'587',1101,65700,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'588',1101,65700,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'589',1101,65700,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_162 b/src/main/res-current/raw/current_gtfs_schedule_stop_162
index 116b422b0..a743c569f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_162
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_162
@@ -1,7 +1,7 @@
-'576',1901,75100,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'577',1901,70600,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'578',1901,70600,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'579',1901,70600,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'580',1901,70600,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'581',1901,75000,,'',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,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'582',1901,70600,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'583',1901,70600,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'584',1901,70600,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'585',1901,75000,,'',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,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'586',1901,75100,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'587',1901,70600,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'588',1901,70600,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'589',1901,70600,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_163 b/src/main/res-current/raw/current_gtfs_schedule_stop_163
index 97a428e28..8e3a294fe 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_163
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_163
@@ -1,14 +1,14 @@
-'576',1001,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'577',1001,63800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'578',1001,63800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'579',1001,63800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'580',1001,63800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'581',1001,81800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',1001,63800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'576',1901,75500,,'',0,10300,,'',0,15600,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11100,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'577',1901,71000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'578',1901,71000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'579',1901,71000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'580',1901,71000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'581',1901,75400,,'',0,7500,,'',0,7500,,'',0,3600,,'',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,3500,,'',0,7400,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'582',1901,71000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'583',1001,63800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'584',1001,63800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'585',1001,81800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',1001,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'587',1001,63800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'588',1001,63800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'589',1001,63800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'583',1901,71000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'584',1901,71000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'585',1901,75400,,'',0,7500,,'',0,7500,,'',0,3600,,'',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,3500,,'',0,7400,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'586',1901,75500,,'',0,10300,,'',0,15600,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11100,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'587',1901,71000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'588',1901,71000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'589',1901,71000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_164 b/src/main/res-current/raw/current_gtfs_schedule_stop_164
index a1b08aad7..f9637eee8 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_164
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_164
@@ -1,5 +1,5 @@
-'577',1201,65800,,'',0,8100,,'',0,8000,,'',0,63500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4600,,'',0
-'578',1201,65800,,'',0,8100,,'',0,8000,,'',0,63500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4600,,'',0
-'579',1201,65800,,'',0,8100,,'',0,8000,,'',0,63500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4600,,'',0
-'580',1201,65800,,'',0,8100,,'',0,8000,,'',0,63500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4600,,'',0
-'582',1201,65800,,'',0,8100,,'',0,8000,,'',0,63500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4600,,'',0
+'583',1201,65800,,'',0,8100,,'',0,8000,,'',0,63500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4600,,'',0
+'584',1201,65800,,'',0,8100,,'',0,8000,,'',0,63500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4600,,'',0
+'587',1201,65800,,'',0,8100,,'',0,8000,,'',0,63500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4600,,'',0
+'588',1201,65800,,'',0,8100,,'',0,8000,,'',0,63500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4600,,'',0
+'589',1201,65800,,'',0,8100,,'',0,8000,,'',0,63500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_165 b/src/main/res-current/raw/current_gtfs_schedule_stop_165
index b7cde2ad6..029e0e91c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_165
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_165
@@ -1,5 +1,5 @@
-'577',1200,72600,,'',0,8100,,'',0,4000,,'',0,68000,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,21600,,'',0
-'578',1200,72600,,'',0,8100,,'',0,4000,,'',0,68000,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,21600,,'',0
-'579',1200,72600,,'',0,8100,,'',0,4000,,'',0,68000,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,21600,,'',0
-'580',1200,72600,,'',0,8100,,'',0,4000,,'',0,68000,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,21600,,'',0
-'582',1200,72600,,'',0,8100,,'',0,4000,,'',0,68000,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,21600,,'',0
+'583',1200,72600,,'',0,8100,,'',0,4000,,'',0,68000,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,21600,,'',0
+'584',1200,72600,,'',0,8100,,'',0,4000,,'',0,68000,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,21600,,'',0
+'587',1200,72600,,'',0,8100,,'',0,4000,,'',0,68000,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,21600,,'',0
+'588',1200,72600,,'',0,8100,,'',0,4000,,'',0,68000,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,21600,,'',0
+'589',1200,72600,,'',0,8100,,'',0,4000,,'',0,68000,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,21600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_166 b/src/main/res-current/raw/current_gtfs_schedule_stop_166
index df75f3008..e67286f4a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_166
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_166
@@ -1,10 +1,10 @@
-'577',501,63500,,'',0,7800,,'',0,8700,,'',0,4500,,'',0,75500,,'',0,4700,,'',0,7600,,'',0,9000,,'',0
-'578',501,63500,,'',0,7800,,'',0,8700,,'',0,4500,,'',0,75500,,'',0,4700,,'',0,7600,,'',0,9000,,'',0
-'579',501,63500,,'',0,7800,,'',0,8700,,'',0,4500,,'',0,75500,,'',0,4700,,'',0,7600,,'',0,9000,,'',0
-'580',501,63500,,'',0,7800,,'',0,8700,,'',0,4500,,'',0,75500,,'',0,4700,,'',0,7600,,'',0,9000,,'',0
-'582',501,63500,,'',0,7800,,'',0,8700,,'',0,4500,,'',0,75500,,'',0,4700,,'',0,7600,,'',0,9000,,'',0
-'577',1200,72400,,'',0,8100,,'',0,4000,,'',0,68000,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,21600,,'',0
-'578',1200,72400,,'',0,8100,,'',0,4000,,'',0,68000,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,21600,,'',0
-'579',1200,72400,,'',0,8100,,'',0,4000,,'',0,68000,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,21600,,'',0
-'580',1200,72400,,'',0,8100,,'',0,4000,,'',0,68000,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,21600,,'',0
-'582',1200,72400,,'',0,8100,,'',0,4000,,'',0,68000,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,21600,,'',0
+'583',501,63500,,'',0,7800,,'',0,8700,,'',0,4500,,'',0,75500,,'',0,4700,,'',0,7600,,'',0,9000,,'',0
+'584',501,63500,,'',0,7800,,'',0,8700,,'',0,4500,,'',0,75500,,'',0,4700,,'',0,7600,,'',0,9000,,'',0
+'587',501,63500,,'',0,7800,,'',0,8700,,'',0,4500,,'',0,75500,,'',0,4700,,'',0,7600,,'',0,9000,,'',0
+'588',501,63500,,'',0,7800,,'',0,8700,,'',0,4500,,'',0,75500,,'',0,4700,,'',0,7600,,'',0,9000,,'',0
+'589',501,63500,,'',0,7800,,'',0,8700,,'',0,4500,,'',0,75500,,'',0,4700,,'',0,7600,,'',0,9000,,'',0
+'583',1200,72400,,'',0,8100,,'',0,4000,,'',0,68000,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,21600,,'',0
+'584',1200,72400,,'',0,8100,,'',0,4000,,'',0,68000,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,21600,,'',0
+'587',1200,72400,,'',0,8100,,'',0,4000,,'',0,68000,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,21600,,'',0
+'588',1200,72400,,'',0,8100,,'',0,4000,,'',0,68000,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,21600,,'',0
+'589',1200,72400,,'',0,8100,,'',0,4000,,'',0,68000,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,21600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_167 b/src/main/res-current/raw/current_gtfs_schedule_stop_167
index 4dd8a92e5..65fb4bcab 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_167
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_167
@@ -1,28 +1,28 @@
-'576',400,81100,,'',0,20000,,'',0,21500,,'',0,23000,,'',0,24500,,'',0,32000,,'',0,10000,,'',0
-'577',400,70100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
-'578',400,70100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
-'579',400,70100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
-'580',400,70100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
-'581',400,84900,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'582',400,70100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
-'576',701,80900,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'577',701,62400,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'578',701,62400,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'579',701,62400,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'580',701,62400,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'581',701,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',701,62400,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'576',1800,73800,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'577',1800,62400,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'578',1800,62400,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'579',1800,62400,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'580',1800,62400,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'581',1800,73800,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'582',1800,62400,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'576',1900,80600,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'577',1900,65100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'578',1900,65100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'579',1900,65100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'580',1900,65100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'581',1900,73600,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'582',1900,65100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'583',400,70100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'584',400,70100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'585',400,84900,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'586',400,81100,,'',0,20000,,'',0,21500,,'',0,23000,,'',0,24500,,'',0,32000,,'',0,10000,,'',0
+'587',400,70100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'588',400,70100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'589',400,70100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'583',701,62400,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'584',701,62400,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'585',701,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',701,80900,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'587',701,62400,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'588',701,62400,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'589',701,62400,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'583',1800,62400,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'584',1800,62400,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'585',1800,73800,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'586',1800,73800,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'587',1800,62400,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'588',1800,62400,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'589',1800,62400,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'583',1900,65100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'584',1900,65100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'585',1900,73600,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'586',1900,80600,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'587',1900,65100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'588',1900,65100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'589',1900,65100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_168 b/src/main/res-current/raw/current_gtfs_schedule_stop_168
index 641ae77d9..73d548ced 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_168
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_168
@@ -1,10 +1,10 @@
-'577',1200,72200,,'',0,8100,,'',0,4000,,'',0,67800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'578',1200,72200,,'',0,8100,,'',0,4000,,'',0,67800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'579',1200,72200,,'',0,8100,,'',0,4000,,'',0,67800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'580',1200,72200,,'',0,8100,,'',0,4000,,'',0,67800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'582',1200,72200,,'',0,8100,,'',0,4000,,'',0,67800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'577',2901,152200,0,'',0
-'578',2901,152200,0,'',0
-'579',2901,152200,0,'',0
-'580',2901,152200,0,'',0
-'582',2901,152200,0,'',0
+'583',1200,72200,,'',0,8100,,'',0,4000,,'',0,67800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'584',1200,72200,,'',0,8100,,'',0,4000,,'',0,67800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'587',1200,72200,,'',0,8100,,'',0,4000,,'',0,67800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'588',1200,72200,,'',0,8100,,'',0,4000,,'',0,67800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'589',1200,72200,,'',0,8100,,'',0,4000,,'',0,67800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'583',2901,152200,0,'',0
+'584',2901,152200,0,'',0
+'587',2901,152200,0,'',0
+'588',2901,152200,0,'',0
+'589',2901,152200,0,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_169 b/src/main/res-current/raw/current_gtfs_schedule_stop_169
index ffe212277..eb86876c1 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_169
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_169
@@ -1,5 +1,5 @@
-'577',2700,65300,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
-'578',2700,65300,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
-'579',2700,65300,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
-'580',2700,65300,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
-'582',2700,65300,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
+'583',2700,65300,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
+'584',2700,65300,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
+'587',2700,65300,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
+'588',2700,65300,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
+'589',2700,65300,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_17 b/src/main/res-current/raw/current_gtfs_schedule_stop_17
index 5c7e1b7ad..16e4b9da7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_17
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_17
@@ -1,7 +1,7 @@
-'576',300,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
-'577',300,73000,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'578',300,73000,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'579',300,73000,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'580',300,73000,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'581',300,81700,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'582',300,73000,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'583',300,73000,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'584',300,73000,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'585',300,81700,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
+'586',300,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
+'587',300,73000,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'588',300,73000,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'589',300,73000,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_170 b/src/main/res-current/raw/current_gtfs_schedule_stop_170
index 8c1e07415..1ce7e9dce 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_170
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_170
@@ -1,7 +1,7 @@
-'576',200,81200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'577',200,60700,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'578',200,60700,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'579',200,60700,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'580',200,60700,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'581',200,81100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'582',200,60700,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'583',200,60700,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'584',200,60700,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'585',200,81100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
+'586',200,81200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'587',200,60700,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'588',200,60700,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'589',200,60700,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_171 b/src/main/res-current/raw/current_gtfs_schedule_stop_171
index af52b96ef..171f89fa4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_171
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_171
@@ -1,5 +1,5 @@
-'577',1201,65800,,'',0,8100,,'',0,8000,,'',0,63600,,'',0,8400,,'',0,8500,,'',0,8300,,'',0,4600,,'',0
-'578',1201,65800,,'',0,8100,,'',0,8000,,'',0,63600,,'',0,8400,,'',0,8500,,'',0,8300,,'',0,4600,,'',0
-'579',1201,65800,,'',0,8100,,'',0,8000,,'',0,63600,,'',0,8400,,'',0,8500,,'',0,8300,,'',0,4600,,'',0
-'580',1201,65800,,'',0,8100,,'',0,8000,,'',0,63600,,'',0,8400,,'',0,8500,,'',0,8300,,'',0,4600,,'',0
-'582',1201,65800,,'',0,8100,,'',0,8000,,'',0,63600,,'',0,8400,,'',0,8500,,'',0,8300,,'',0,4600,,'',0
+'583',1201,65800,,'',0,8100,,'',0,8000,,'',0,63600,,'',0,8400,,'',0,8500,,'',0,8300,,'',0,4600,,'',0
+'584',1201,65800,,'',0,8100,,'',0,8000,,'',0,63600,,'',0,8400,,'',0,8500,,'',0,8300,,'',0,4600,,'',0
+'587',1201,65800,,'',0,8100,,'',0,8000,,'',0,63600,,'',0,8400,,'',0,8500,,'',0,8300,,'',0,4600,,'',0
+'588',1201,65800,,'',0,8100,,'',0,8000,,'',0,63600,,'',0,8400,,'',0,8500,,'',0,8300,,'',0,4600,,'',0
+'589',1201,65800,,'',0,8100,,'',0,8000,,'',0,63600,,'',0,8400,,'',0,8500,,'',0,8300,,'',0,4600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_172 b/src/main/res-current/raw/current_gtfs_schedule_stop_172
index d663b9af6..f931d96fe 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_172
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_172
@@ -1,14 +1,14 @@
-'576',1000,81300,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
-'577',1000,61400,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,5900,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'578',1000,61400,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,5900,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'579',1000,61400,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,5900,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'580',1000,61400,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,5900,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'581',1000,81100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'582',1000,61400,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,5900,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'576',1900,80100,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'577',1900,64600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'578',1900,64600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'579',1900,64600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'580',1900,64600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'581',1900,73100,,'',0,7500,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'582',1900,64600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'583',1000,61400,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,5900,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'584',1000,61400,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,5900,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'585',1000,81100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'586',1000,81300,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
+'587',1000,61400,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,5900,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'588',1000,61400,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,5900,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'589',1000,61400,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,5900,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'583',1900,64600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'584',1900,64600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'585',1900,73100,,'',0,7500,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'586',1900,80100,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'587',1900,64600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'588',1900,64600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'589',1900,64600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_173 b/src/main/res-current/raw/current_gtfs_schedule_stop_173
index dc5ff4ec3..8c7ad4323 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_173
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_173
@@ -1,5 +1,5 @@
-'577',2700,65500,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'578',2700,65500,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'579',2700,65500,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'580',2700,65500,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'582',2700,65500,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'583',2700,65500,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'584',2700,65500,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'587',2700,65500,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'588',2700,65500,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'589',2700,65500,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_174 b/src/main/res-current/raw/current_gtfs_schedule_stop_174
index 6e53f8241..05e048e5e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_174
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_174
@@ -1,21 +1,21 @@
-'576',700,85200,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'577',700,70200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'578',700,70200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'579',700,70200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'580',700,70200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'581',700,81500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',700,70200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'576',1801,81800,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'577',1801,63500,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'578',1801,63500,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'579',1801,63500,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'580',1801,63500,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'581',1801,74900,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'582',1801,63500,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'576',1901,75000,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'577',1901,70500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'578',1901,70500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'579',1901,70500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'580',1901,70500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'581',1901,74900,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'582',1901,70500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'583',700,70200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'584',700,70200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'585',700,81500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',700,85200,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
+'587',700,70200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'588',700,70200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'589',700,70200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'583',1801,63500,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'584',1801,63500,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'585',1801,74900,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'586',1801,81800,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'587',1801,63500,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'588',1801,63500,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'589',1801,63500,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'583',1901,70500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'584',1901,70500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'585',1901,74900,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'586',1901,75000,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'587',1901,70500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'588',1901,70500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'589',1901,70500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_175 b/src/main/res-current/raw/current_gtfs_schedule_stop_175
index 7bb892900..e14735d7b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_175
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_175
@@ -1,7 +1,7 @@
-'576',3000,74700,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,9200,0,'Downtown',0
-'577',3000,60800,,'',0,2000,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,5200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1500,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,4900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2400,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
-'578',3000,60800,,'',0,2000,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,5200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1500,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,4900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2400,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
-'579',3000,60800,,'',0,2000,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,5200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1500,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,4900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2400,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
-'580',3000,60800,,'',0,2000,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,5200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1500,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,4900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2400,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0,4000,0,'Downtown',0,8000,0,'Downtown',0
-'581',3000,74600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7100,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,5700,0,'Downtown',0
-'582',3000,60800,,'',0,2000,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,5200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1500,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,4900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2400,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
+'583',3000,60800,,'',0,2000,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,5200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1500,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,4900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2400,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
+'584',3000,60800,,'',0,2000,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,5200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1500,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,4900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2400,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0,4000,0,'Downtown',0,8000,0,'Downtown',0
+'585',3000,74600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7100,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,5700,0,'Downtown',0
+'586',3000,74700,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,9200,0,'Downtown',0
+'587',3000,60800,,'',0,2000,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,5200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1500,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,4900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2400,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
+'588',3000,60800,,'',0,2000,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,5200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1500,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,4900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2400,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
+'589',3000,60800,,'',0,2000,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,5200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1500,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,4900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2400,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_176 b/src/main/res-current/raw/current_gtfs_schedule_stop_176
index 0b40a6828..0e86f832a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_176
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_176
@@ -1,14 +1,14 @@
-'576',1001,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'577',1001,63900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'578',1001,63900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'579',1001,63900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'580',1001,63900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'581',1001,81900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',1001,63900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'576',1901,75600,,'',0,10300,,'',0,15600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,11100,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'577',1901,71100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,2300,,'',0,11500,,'',0
-'578',1901,71100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,2300,,'',0,11500,,'',0
-'579',1901,71100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,2300,,'',0,11500,,'',0
-'580',1901,71100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,2300,,'',0,11500,,'',0
-'581',1901,75500,,'',0,7500,,'',0,7500,,'',0,3600,,'',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,3500,,'',0,7400,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'582',1901,71100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,2300,,'',0,11500,,'',0
+'583',1001,63900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'584',1001,63900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'585',1001,81900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',1001,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'587',1001,63900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'588',1001,63900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'589',1001,63900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'583',1901,71100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,2300,,'',0,11500,,'',0
+'584',1901,71100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,2300,,'',0,11500,,'',0
+'585',1901,75500,,'',0,7500,,'',0,7500,,'',0,3600,,'',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,3500,,'',0,7400,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'586',1901,75600,,'',0,10300,,'',0,15600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,11100,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'587',1901,71100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,2300,,'',0,11500,,'',0
+'588',1901,71100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,2300,,'',0,11500,,'',0
+'589',1901,71100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,2300,,'',0,11500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_177 b/src/main/res-current/raw/current_gtfs_schedule_stop_177
index 4dd8a92e5..65fb4bcab 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_177
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_177
@@ -1,28 +1,28 @@
-'576',400,81100,,'',0,20000,,'',0,21500,,'',0,23000,,'',0,24500,,'',0,32000,,'',0,10000,,'',0
-'577',400,70100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
-'578',400,70100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
-'579',400,70100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
-'580',400,70100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
-'581',400,84900,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'582',400,70100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
-'576',701,80900,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'577',701,62400,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'578',701,62400,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'579',701,62400,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'580',701,62400,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'581',701,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',701,62400,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'576',1800,73800,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'577',1800,62400,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'578',1800,62400,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'579',1800,62400,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'580',1800,62400,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'581',1800,73800,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'582',1800,62400,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'576',1900,80600,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'577',1900,65100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'578',1900,65100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'579',1900,65100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'580',1900,65100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'581',1900,73600,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'582',1900,65100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'583',400,70100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'584',400,70100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'585',400,84900,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'586',400,81100,,'',0,20000,,'',0,21500,,'',0,23000,,'',0,24500,,'',0,32000,,'',0,10000,,'',0
+'587',400,70100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'588',400,70100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'589',400,70100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'583',701,62400,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'584',701,62400,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'585',701,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',701,80900,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'587',701,62400,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'588',701,62400,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'589',701,62400,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'583',1800,62400,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'584',1800,62400,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'585',1800,73800,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'586',1800,73800,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'587',1800,62400,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'588',1800,62400,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'589',1800,62400,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'583',1900,65100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'584',1900,65100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'585',1900,73600,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'586',1900,80600,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'587',1900,65100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'588',1900,65100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'589',1900,65100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_178 b/src/main/res-current/raw/current_gtfs_schedule_stop_178
index 70a1ef759..63a77eafb 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_178
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_178
@@ -1,7 +1,7 @@
-'576',400,81000,,'',0,20000,,'',0,21500,,'',0,23000,,'',0,24500,,'',0,32000,,'',0,10000,,'',0
-'577',400,70000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
-'578',400,70000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
-'579',400,70000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
-'580',400,70000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
-'581',400,84800,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'582',400,70000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'583',400,70000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'584',400,70000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'585',400,84800,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'586',400,81000,,'',0,20000,,'',0,21500,,'',0,23000,,'',0,24500,,'',0,32000,,'',0,10000,,'',0
+'587',400,70000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'588',400,70000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'589',400,70000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_179 b/src/main/res-current/raw/current_gtfs_schedule_stop_179
index 126942703..1a56957d7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_179
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_179
@@ -1,7 +1,7 @@
-'576',400,81400,,'',0,20000,,'',0,21500,,'',0,23000,,'',0,24500,,'',0,32000,,'',0,10000,,'',0
-'577',400,70400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
-'578',400,70400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
-'579',400,70400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
-'580',400,70400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
-'581',400,85200,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'582',400,70400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'583',400,70400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'584',400,70400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'585',400,85200,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'586',400,81400,,'',0,20000,,'',0,21500,,'',0,23000,,'',0,24500,,'',0,32000,,'',0,10000,,'',0
+'587',400,70400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'588',400,70400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'589',400,70400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_18 b/src/main/res-current/raw/current_gtfs_schedule_stop_18
index f160e2bca..a643fcb08 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_18
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_18
@@ -1,21 +1,21 @@
-'576',900,122200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',900,93900,,'',0,31200,,'',0,28800,,'',0
-'578',900,93900,,'',0,31200,,'',0,28800,,'',0
-'579',900,93900,,'',0,31200,,'',0,28800,,'',0
-'580',900,93900,,'',0,31200,,'',0,28800,,'',0
-'581',900,122200,,'',0,8500,,'',0,20500,,'',0,4500,,'',0
-'582',900,93900,,'',0,31200,,'',0,28800,,'',0
-'576',1000,82400,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
-'577',1000,62300,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1600,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8200,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'578',1000,62300,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1600,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8200,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'579',1000,62300,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1600,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8200,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'580',1000,62300,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1600,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8200,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'581',1000,82400,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,9800,,'',0,10000,,'',0
-'582',1000,62300,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1600,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8200,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'576',1100,82400,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9400,,'',0,10000,,'',0,10000,,'',0
-'577',1100,70600,,'',0,4900,,'',0,7400,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,6900,,'',0,1500,,'',0,1500,,'',0,6900,,'',0,2800,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'578',1100,70600,,'',0,4900,,'',0,7400,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,6900,,'',0,1500,,'',0,1500,,'',0,6900,,'',0,2800,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'579',1100,70600,,'',0,4900,,'',0,7400,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,6900,,'',0,1500,,'',0,1500,,'',0,6900,,'',0,2800,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'580',1100,70600,,'',0,4900,,'',0,7400,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,6900,,'',0,1500,,'',0,1500,,'',0,6900,,'',0,2800,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'581',1100,81100,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
-'582',1100,70600,,'',0,4900,,'',0,7400,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,6900,,'',0,1500,,'',0,1500,,'',0,6900,,'',0,2800,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'583',900,93900,,'',0,31200,,'',0,28800,,'',0
+'584',900,93900,,'',0,31200,,'',0,28800,,'',0
+'585',900,122200,,'',0,8500,,'',0,20500,,'',0,4500,,'',0
+'586',900,122200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',900,93900,,'',0,31200,,'',0,28800,,'',0
+'588',900,93900,,'',0,31200,,'',0,28800,,'',0
+'589',900,93900,,'',0,31200,,'',0,28800,,'',0
+'583',1000,62300,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1600,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8200,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'584',1000,62300,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1600,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8200,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'585',1000,82400,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,9800,,'',0,10000,,'',0
+'586',1000,82400,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
+'587',1000,62300,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1600,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8200,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'588',1000,62300,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1600,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8200,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'589',1000,62300,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1600,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8200,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'583',1100,70600,,'',0,4900,,'',0,7400,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,6900,,'',0,1500,,'',0,1500,,'',0,6900,,'',0,2800,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'584',1100,70600,,'',0,4900,,'',0,7400,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,6900,,'',0,1500,,'',0,1500,,'',0,6900,,'',0,2800,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'585',1100,81100,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
+'586',1100,82400,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9400,,'',0,10000,,'',0,10000,,'',0
+'587',1100,70600,,'',0,4900,,'',0,7400,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,6900,,'',0,1500,,'',0,1500,,'',0,6900,,'',0,2800,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'588',1100,70600,,'',0,4900,,'',0,7400,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,6900,,'',0,1500,,'',0,1500,,'',0,6900,,'',0,2800,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'589',1100,70600,,'',0,4900,,'',0,7400,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,6900,,'',0,1500,,'',0,1500,,'',0,6900,,'',0,2800,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_180 b/src/main/res-current/raw/current_gtfs_schedule_stop_180
index d786ee4a6..692b7abfe 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_180
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_180
@@ -1,15 +1,15 @@
-'577',501,63100,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,71500,,'',0,8700,,'',0,7600,,'',0,9000,,'',0
-'578',501,63100,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,71500,,'',0,8700,,'',0,7600,,'',0,9000,,'',0
-'579',501,63100,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,71500,,'',0,8700,,'',0,7600,,'',0,9000,,'',0
-'580',501,63100,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,71500,,'',0,8700,,'',0,7600,,'',0,9000,,'',0
-'582',501,63100,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,71500,,'',0,8700,,'',0,7600,,'',0,9000,,'',0
-'577',1200,72100,,'',0,8100,,'',0,4000,,'',0,67900,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8500,,'',0,21600,,'',0
-'578',1200,72100,,'',0,8100,,'',0,4000,,'',0,67900,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8500,,'',0,21600,,'',0
-'579',1200,72100,,'',0,8100,,'',0,4000,,'',0,67900,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8500,,'',0,21600,,'',0
-'580',1200,72100,,'',0,8100,,'',0,4000,,'',0,67900,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8500,,'',0,21600,,'',0
-'582',1200,72100,,'',0,8100,,'',0,4000,,'',0,67900,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8500,,'',0,21600,,'',0
-'577',2901,152000,0,'',0
-'578',2901,152000,0,'',0
-'579',2901,152000,0,'',0
-'580',2901,152000,0,'',0
-'582',2901,152000,0,'',0
+'583',501,63100,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,71500,,'',0,8700,,'',0,7600,,'',0,9000,,'',0
+'584',501,63100,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,71500,,'',0,8700,,'',0,7600,,'',0,9000,,'',0
+'587',501,63100,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,71500,,'',0,8700,,'',0,7600,,'',0,9000,,'',0
+'588',501,63100,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,71500,,'',0,8700,,'',0,7600,,'',0,9000,,'',0
+'589',501,63100,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,71500,,'',0,8700,,'',0,7600,,'',0,9000,,'',0
+'583',1200,72100,,'',0,8100,,'',0,4000,,'',0,67900,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8500,,'',0,21600,,'',0
+'584',1200,72100,,'',0,8100,,'',0,4000,,'',0,67900,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8500,,'',0,21600,,'',0
+'587',1200,72100,,'',0,8100,,'',0,4000,,'',0,67900,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8500,,'',0,21600,,'',0
+'588',1200,72100,,'',0,8100,,'',0,4000,,'',0,67900,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8500,,'',0,21600,,'',0
+'589',1200,72100,,'',0,8100,,'',0,4000,,'',0,67900,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8500,,'',0,21600,,'',0
+'583',2901,152000,0,'',0
+'584',2901,152000,0,'',0
+'587',2901,152000,0,'',0
+'588',2901,152000,0,'',0
+'589',2901,152000,0,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_182 b/src/main/res-current/raw/current_gtfs_schedule_stop_182
index ecc639798..e62f100f4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_182
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_182
@@ -1,21 +1,21 @@
-'576',800,70700,,'',0,10200,,'',0,5000,,'',0,9200,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8800,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
-'577',800,60600,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
-'578',800,60600,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
-'579',800,60600,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
-'580',800,60600,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
-'581',800,70500,,'',0,4500,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'582',800,60600,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
-'576',901,120200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',901,91700,,'',0,22000,,'',0,38000,,'',0
-'578',901,91700,,'',0,22000,,'',0,38000,,'',0
-'579',901,91700,,'',0,22000,,'',0,38000,,'',0
-'580',901,91700,,'',0,22000,,'',0,38000,,'',0
-'581',901,120200,,'',0,4500,,'',0,29000,,'',0,8500,,'',0
-'582',901,91700,,'',0,22000,,'',0,38000,,'',0
-'576',1101,75100,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
-'577',1101,65800,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'578',1101,65800,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'579',1101,65800,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'580',1101,65800,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'581',1101,81200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'582',1101,65800,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'583',800,60600,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
+'584',800,60600,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
+'585',800,70500,,'',0,4500,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
+'586',800,70700,,'',0,10200,,'',0,5000,,'',0,9200,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8800,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
+'587',800,60600,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
+'588',800,60600,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
+'589',800,60600,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
+'583',901,91700,,'',0,22000,,'',0,38000,,'',0
+'584',901,91700,,'',0,22000,,'',0,38000,,'',0
+'585',901,120200,,'',0,4500,,'',0,29000,,'',0,8500,,'',0
+'586',901,120200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',901,91700,,'',0,22000,,'',0,38000,,'',0
+'588',901,91700,,'',0,22000,,'',0,38000,,'',0
+'589',901,91700,,'',0,22000,,'',0,38000,,'',0
+'583',1101,65800,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'584',1101,65800,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'585',1101,81200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'586',1101,75100,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
+'587',1101,65800,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'588',1101,65800,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'589',1101,65800,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_183 b/src/main/res-current/raw/current_gtfs_schedule_stop_183
index 232bf9f6e..314b8a5b4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_183
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_183
@@ -1,21 +1,21 @@
-'576',801,64000,,'',0,27400,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8700,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
-'577',801,62000,,'',0,8600,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'578',801,62000,,'',0,8600,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'579',801,62000,,'',0,8600,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'580',801,62000,,'',0,8600,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'581',801,64000,,'',0,10200,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'582',801,62000,,'',0,8600,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'576',900,120800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',900,92500,,'',0,31200,,'',0,28800,,'',0
-'578',900,92500,,'',0,31200,,'',0,28800,,'',0
-'579',900,92500,,'',0,31200,,'',0,28800,,'',0
-'580',900,92500,,'',0,31200,,'',0,28800,,'',0
-'581',900,120800,,'',0,4500,,'',0,20500,,'',0,8500,,'',0
-'582',900,92500,,'',0,31200,,'',0,28800,,'',0
-'576',1100,81300,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9400,,'',0,10000,,'',0,10000,,'',0
-'577',1100,65500,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'578',1100,65500,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'579',1100,65500,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'580',1100,65500,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'581',1100,80000,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
-'582',1100,65500,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'583',801,62000,,'',0,8600,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'584',801,62000,,'',0,8600,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'585',801,64000,,'',0,10200,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
+'586',801,64000,,'',0,27400,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8700,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
+'587',801,62000,,'',0,8600,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'588',801,62000,,'',0,8600,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'589',801,62000,,'',0,8600,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'583',900,92500,,'',0,31200,,'',0,28800,,'',0
+'584',900,92500,,'',0,31200,,'',0,28800,,'',0
+'585',900,120800,,'',0,4500,,'',0,20500,,'',0,8500,,'',0
+'586',900,120800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',900,92500,,'',0,31200,,'',0,28800,,'',0
+'588',900,92500,,'',0,31200,,'',0,28800,,'',0
+'589',900,92500,,'',0,31200,,'',0,28800,,'',0
+'583',1100,65500,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'584',1100,65500,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'585',1100,80000,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
+'586',1100,81300,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9400,,'',0,10000,,'',0,10000,,'',0
+'587',1100,65500,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'588',1100,65500,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'589',1100,65500,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_184 b/src/main/res-current/raw/current_gtfs_schedule_stop_184
index 9b6c485cf..dbccfee0a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_184
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_184
@@ -1,14 +1,14 @@
-'576',1001,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'577',1001,63900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'578',1001,63900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'579',1001,63900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'580',1001,63900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'581',1001,81900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',1001,63900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'576',1901,75600,,'',0,10300,,'',0,15600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,11100,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'577',1901,71100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,2300,,'',0,11500,,'',0
-'578',1901,71100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,2300,,'',0,11500,,'',0
-'579',1901,71100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,2300,,'',0,11500,,'',0
-'580',1901,71100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,2300,,'',0,11500,,'',0
-'581',1901,75500,,'',0,7500,,'',0,7500,,'',0,3600,,'',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,3500,,'',0,7400,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'582',1901,71100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,2300,,'',0,11500,,'',0
+'583',1001,63900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'584',1001,63900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'585',1001,81900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',1001,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'587',1001,63900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'588',1001,63900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'589',1001,63900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'583',1901,71100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,2300,,'',0,11500,,'',0
+'584',1901,71100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,2300,,'',0,11500,,'',0
+'585',1901,75500,,'',0,7500,,'',0,7500,,'',0,3600,,'',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,3500,,'',0,7400,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'586',1901,75600,,'',0,10300,,'',0,15600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,11100,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'587',1901,71100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,2300,,'',0,11500,,'',0
+'588',1901,71100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,2300,,'',0,11500,,'',0
+'589',1901,71100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,2300,,'',0,11500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_185 b/src/main/res-current/raw/current_gtfs_schedule_stop_185
index cd221cd7d..b170ffdba 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_185
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_185
@@ -1,10 +1,10 @@
-'577',500,65000,,'',0,7700,,'',0,9700,,'',0,69700,,'',0,1500,,'',0,7900,,'',0,9000,,'',0,4000,,'',0
-'578',500,65000,,'',0,7700,,'',0,9700,,'',0,69700,,'',0,1500,,'',0,7900,,'',0,9000,,'',0,4000,,'',0
-'579',500,65000,,'',0,7700,,'',0,9700,,'',0,69700,,'',0,1500,,'',0,7900,,'',0,9000,,'',0,4000,,'',0
-'580',500,65000,,'',0,7700,,'',0,9700,,'',0,69700,,'',0,1500,,'',0,7900,,'',0,9000,,'',0,4000,,'',0
-'582',500,65000,,'',0,7700,,'',0,9700,,'',0,69700,,'',0,1500,,'',0,7900,,'',0,9000,,'',0,4000,,'',0
-'577',1201,65900,,'',0,8100,,'',0,8000,,'',0,63600,,'',0,8400,,'',0,8500,,'',0,8300,,'',0,4600,,'',0
-'578',1201,65900,,'',0,8100,,'',0,8000,,'',0,63600,,'',0,8400,,'',0,8500,,'',0,8300,,'',0,4600,,'',0
-'579',1201,65900,,'',0,8100,,'',0,8000,,'',0,63600,,'',0,8400,,'',0,8500,,'',0,8300,,'',0,4600,,'',0
-'580',1201,65900,,'',0,8100,,'',0,8000,,'',0,63600,,'',0,8400,,'',0,8500,,'',0,8300,,'',0,4600,,'',0
-'582',1201,65900,,'',0,8100,,'',0,8000,,'',0,63600,,'',0,8400,,'',0,8500,,'',0,8300,,'',0,4600,,'',0
+'583',500,65000,,'',0,7700,,'',0,9700,,'',0,69700,,'',0,1500,,'',0,7900,,'',0,9000,,'',0,4000,,'',0
+'584',500,65000,,'',0,7700,,'',0,9700,,'',0,69700,,'',0,1500,,'',0,7900,,'',0,9000,,'',0,4000,,'',0
+'587',500,65000,,'',0,7700,,'',0,9700,,'',0,69700,,'',0,1500,,'',0,7900,,'',0,9000,,'',0,4000,,'',0
+'588',500,65000,,'',0,7700,,'',0,9700,,'',0,69700,,'',0,1500,,'',0,7900,,'',0,9000,,'',0,4000,,'',0
+'589',500,65000,,'',0,7700,,'',0,9700,,'',0,69700,,'',0,1500,,'',0,7900,,'',0,9000,,'',0,4000,,'',0
+'583',1201,65900,,'',0,8100,,'',0,8000,,'',0,63600,,'',0,8400,,'',0,8500,,'',0,8300,,'',0,4600,,'',0
+'584',1201,65900,,'',0,8100,,'',0,8000,,'',0,63600,,'',0,8400,,'',0,8500,,'',0,8300,,'',0,4600,,'',0
+'587',1201,65900,,'',0,8100,,'',0,8000,,'',0,63600,,'',0,8400,,'',0,8500,,'',0,8300,,'',0,4600,,'',0
+'588',1201,65900,,'',0,8100,,'',0,8000,,'',0,63600,,'',0,8400,,'',0,8500,,'',0,8300,,'',0,4600,,'',0
+'589',1201,65900,,'',0,8100,,'',0,8000,,'',0,63600,,'',0,8400,,'',0,8500,,'',0,8300,,'',0,4600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_186 b/src/main/res-current/raw/current_gtfs_schedule_stop_186
index 951031c0d..52c49b90c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_186
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_186
@@ -1,14 +1,14 @@
-'576',1000,81300,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
-'577',1000,61300,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'578',1000,61300,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'579',1000,61300,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'580',1000,61300,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'581',1000,81000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'582',1000,61300,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'576',1900,80100,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'577',1900,64600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'578',1900,64600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'579',1900,64600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'580',1900,64600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'581',1900,73100,,'',0,7500,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'582',1900,64600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'583',1000,61300,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'584',1000,61300,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'585',1000,81000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'586',1000,81300,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
+'587',1000,61300,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'588',1000,61300,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'589',1000,61300,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'583',1900,64600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'584',1900,64600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'585',1900,73100,,'',0,7500,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'586',1900,80100,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'587',1900,64600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'588',1900,64600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'589',1900,64600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_187 b/src/main/res-current/raw/current_gtfs_schedule_stop_187
index 4d753b065..a94704127 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_187
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_187
@@ -1,7 +1,7 @@
-'576',3000,74900,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,9200,0,'Downtown',0
-'577',3000,61000,,'',0,2000,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,5200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1500,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,4900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2400,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
-'578',3000,61000,,'',0,2000,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,5200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1500,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,4900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2400,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
-'579',3000,61000,,'',0,2000,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,5200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1500,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,4900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2400,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
-'580',3000,61000,,'',0,2000,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,5200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1500,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,4900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2400,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0,4000,0,'Downtown',0,8000,0,'Downtown',0
-'581',3000,65800,,'',0,9000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7100,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,5700,0,'Downtown',0
-'582',3000,61000,,'',0,2000,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,5200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1500,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,4900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2400,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
+'583',3000,61000,,'',0,2000,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,5200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1500,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,4900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2400,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
+'584',3000,61000,,'',0,2000,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,5200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1500,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,4900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2400,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0,4000,0,'Downtown',0,8000,0,'Downtown',0
+'585',3000,65800,,'',0,9000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7100,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,5700,0,'Downtown',0
+'586',3000,74900,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,9200,0,'Downtown',0
+'587',3000,61000,,'',0,2000,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,5200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1500,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,4900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2400,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
+'588',3000,61000,,'',0,2000,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,5200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1500,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,4900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2400,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
+'589',3000,61000,,'',0,2000,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,5200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1500,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,4900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2400,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_188 b/src/main/res-current/raw/current_gtfs_schedule_stop_188
index 1a2e1328a..28fec119a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_188
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_188
@@ -1,7 +1,7 @@
-'576',201,75600,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',201,61400,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'578',201,61400,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'579',201,61400,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'580',201,61400,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'581',201,82100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,9600,,'',0
-'582',201,61400,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'583',201,61400,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'584',201,61400,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'585',201,82100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,9600,,'',0
+'586',201,75600,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',201,61400,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'588',201,61400,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'589',201,61400,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_189 b/src/main/res-current/raw/current_gtfs_schedule_stop_189
index 51b47cff8..5634519f4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_189
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_189
@@ -1,5 +1,5 @@
-'577',2700,65100,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
-'578',2700,65100,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
-'579',2700,65100,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
-'580',2700,65100,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
-'582',2700,65100,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
+'583',2700,65100,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
+'584',2700,65100,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
+'587',2700,65100,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
+'588',2700,65100,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
+'589',2700,65100,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_19 b/src/main/res-current/raw/current_gtfs_schedule_stop_19
index 85273e40a..1c4788caa 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_19
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_19
@@ -1,21 +1,21 @@
-'576',300,84000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11600,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
-'577',300,73800,,'',0,6300,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,50700,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,14500,,'',0
-'578',300,73800,,'',0,6300,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,50700,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,14500,,'',0
-'579',300,73800,,'',0,6300,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,50700,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,14500,,'',0
-'580',300,73800,,'',0,6300,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,50700,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,14500,,'',0
-'581',300,82500,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'582',300,73800,,'',0,6300,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,50700,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,14500,,'',0
-'576',901,114700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',901,90200,,'',0,22000,,'',0,38000,,'',0
-'578',901,90200,,'',0,22000,,'',0,38000,,'',0
-'579',901,90200,,'',0,22000,,'',0,38000,,'',0
-'580',901,90200,,'',0,22000,,'',0,38000,,'',0
-'581',901,114700,,'',0,8500,,'',0,29000,,'',0,8500,,'',0
-'582',901,90200,,'',0,22000,,'',0,38000,,'',0
-'576',1101,74100,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
-'577',1101,64700,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'578',1101,64700,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'579',1101,64700,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'580',1101,64700,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'581',1101,80200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'582',1101,64700,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'583',300,73800,,'',0,6300,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,50700,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,14500,,'',0
+'584',300,73800,,'',0,6300,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,50700,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,14500,,'',0
+'585',300,82500,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
+'586',300,84000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11600,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
+'587',300,73800,,'',0,6300,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,50700,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,14500,,'',0
+'588',300,73800,,'',0,6300,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,50700,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,14500,,'',0
+'589',300,73800,,'',0,6300,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,50700,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,14500,,'',0
+'583',901,90200,,'',0,22000,,'',0,38000,,'',0
+'584',901,90200,,'',0,22000,,'',0,38000,,'',0
+'585',901,114700,,'',0,8500,,'',0,29000,,'',0,8500,,'',0
+'586',901,114700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',901,90200,,'',0,22000,,'',0,38000,,'',0
+'588',901,90200,,'',0,22000,,'',0,38000,,'',0
+'589',901,90200,,'',0,22000,,'',0,38000,,'',0
+'583',1101,64700,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'584',1101,64700,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'585',1101,80200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'586',1101,74100,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
+'587',1101,64700,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'588',1101,64700,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'589',1101,64700,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_190 b/src/main/res-current/raw/current_gtfs_schedule_stop_190
index faeee90c8..1ac481eae 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_190
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_190
@@ -1,7 +1,7 @@
-'576',2001,74900,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'577',2001,63000,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'578',2001,63000,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'579',2001,63000,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'580',2001,63000,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'581',2001,75500,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'582',2001,63000,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'583',2001,63000,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'584',2001,63000,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'585',2001,75500,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'586',2001,74900,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'587',2001,63000,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'588',2001,63000,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'589',2001,63000,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_191 b/src/main/res-current/raw/current_gtfs_schedule_stop_191
index 2d4176378..06f64749b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_191
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_191
@@ -1,5 +1,5 @@
-'577',2700,65000,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
-'578',2700,65000,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
-'579',2700,65000,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
-'580',2700,65000,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
-'582',2700,65000,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
+'583',2700,65000,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
+'584',2700,65000,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
+'587',2700,65000,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
+'588',2700,65000,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
+'589',2700,65000,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_192 b/src/main/res-current/raw/current_gtfs_schedule_stop_192
index d3e8bf3be..af65d39a0 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_192
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_192
@@ -1,7 +1,7 @@
-'576',3001,73900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0
-'577',3001,54400,,'',0,7700,,'',0,1800,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,700,,'',0,4800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,4800,,'',0,1000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,4800,,'',0,1700,,'',0,1600,,'',0,1800,,'',0,5500,,'',0,1700,,'',0,1600,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,6700,,'',0,1900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2600,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
-'578',3001,54400,,'',0,7700,,'',0,1800,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,700,,'',0,4800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,4800,,'',0,1000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,4800,,'',0,1700,,'',0,1600,,'',0,1800,,'',0,5500,,'',0,1700,,'',0,1600,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,6700,,'',0,1900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2600,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
-'579',3001,54400,,'',0,7700,,'',0,1800,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,700,,'',0,4800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,4800,,'',0,1000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,4800,,'',0,1700,,'',0,1600,,'',0,1800,,'',0,5500,,'',0,1700,,'',0,1600,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,6700,,'',0,1900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2600,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
-'580',3001,54400,,'',0,7700,,'',0,1800,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,700,,'',0,4800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,4800,,'',0,1000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,4800,,'',0,1700,,'',0,1600,,'',0,1800,,'',0,5500,,'',0,1700,,'',0,1600,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,6700,,'',0,1900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2600,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,9000,,'',0,8000,,'',0
-'581',3001,73900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'582',3001,54400,,'',0,7700,,'',0,1800,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,700,,'',0,4800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,4800,,'',0,1000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,4800,,'',0,1700,,'',0,1600,,'',0,1800,,'',0,5500,,'',0,1700,,'',0,1600,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,6700,,'',0,1900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2600,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
+'583',3001,54400,,'',0,7700,,'',0,1800,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,700,,'',0,4800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,4800,,'',0,1000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,4800,,'',0,1700,,'',0,1600,,'',0,1800,,'',0,5500,,'',0,1700,,'',0,1600,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,6700,,'',0,1900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2600,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
+'584',3001,54400,,'',0,7700,,'',0,1800,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,700,,'',0,4800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,4800,,'',0,1000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,4800,,'',0,1700,,'',0,1600,,'',0,1800,,'',0,5500,,'',0,1700,,'',0,1600,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,6700,,'',0,1900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2600,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,9000,,'',0,8000,,'',0
+'585',3001,73900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'586',3001,73900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0
+'587',3001,54400,,'',0,7700,,'',0,1800,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,700,,'',0,4800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,4800,,'',0,1000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,4800,,'',0,1700,,'',0,1600,,'',0,1800,,'',0,5500,,'',0,1700,,'',0,1600,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,6700,,'',0,1900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2600,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
+'588',3001,54400,,'',0,7700,,'',0,1800,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,700,,'',0,4800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,4800,,'',0,1000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,4800,,'',0,1700,,'',0,1600,,'',0,1800,,'',0,5500,,'',0,1700,,'',0,1600,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,6700,,'',0,1900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2600,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
+'589',3001,54400,,'',0,7700,,'',0,1800,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,700,,'',0,4800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,4800,,'',0,1000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,4800,,'',0,1700,,'',0,1600,,'',0,1800,,'',0,5500,,'',0,1700,,'',0,1600,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,6700,,'',0,1900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2600,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_193 b/src/main/res-current/raw/current_gtfs_schedule_stop_193
index 26a0b551f..814abc025 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_193
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_193
@@ -1,21 +1,21 @@
-'576',801,63900,,'',0,27400,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8700,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
-'577',801,61900,,'',0,8600,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'578',801,61900,,'',0,8600,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'579',801,61900,,'',0,8600,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'580',801,61900,,'',0,8600,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'581',801,63900,,'',0,10200,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'582',801,61900,,'',0,8600,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'576',900,120600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'576',901,120500,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'577',900,92300,,'',0,31200,,'',0,28800,,'',0
-'577',901,92000,4,'',0,22000,4,'',0,38000,4,'',0
-'578',900,92300,,'',0,31200,,'',0,28800,,'',0
-'578',901,92000,4,'',0,22000,4,'',0,38000,4,'',0
-'579',900,92300,,'',0,31200,,'',0,28800,,'',0
-'579',901,92000,4,'',0,22000,4,'',0,38000,4,'',0
-'580',900,92300,,'',0,31200,,'',0,28800,,'',0
-'580',901,92000,4,'',0,22000,4,'',0,38000,4,'',0
-'581',900,120600,,'',0,4500,,'',0,20500,,'',0,8500,,'',0
-'581',901,120500,4,'',0,4500,4,'',0,29000,4,'',0,8500,4,'',0
-'582',900,92300,,'',0,31200,,'',0,28800,,'',0
-'582',901,92000,4,'',0,22000,4,'',0,38000,4,'',0
+'583',801,61900,,'',0,8600,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'584',801,61900,,'',0,8600,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'585',801,63900,,'',0,10200,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
+'586',801,63900,,'',0,27400,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8700,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
+'587',801,61900,,'',0,8600,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'588',801,61900,,'',0,8600,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'589',801,61900,,'',0,8600,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'583',900,92300,,'',0,31200,,'',0,28800,,'',0
+'583',901,92000,4,'',0,22000,4,'',0,38000,4,'',0
+'584',900,92300,,'',0,31200,,'',0,28800,,'',0
+'584',901,92000,4,'',0,22000,4,'',0,38000,4,'',0
+'585',900,120600,,'',0,4500,,'',0,20500,,'',0,8500,,'',0
+'585',901,120500,4,'',0,4500,4,'',0,29000,4,'',0,8500,4,'',0
+'586',900,120600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',901,120500,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'587',900,92300,,'',0,31200,,'',0,28800,,'',0
+'587',901,92000,4,'',0,22000,4,'',0,38000,4,'',0
+'588',900,92300,,'',0,31200,,'',0,28800,,'',0
+'588',901,92000,4,'',0,22000,4,'',0,38000,4,'',0
+'589',900,92300,,'',0,31200,,'',0,28800,,'',0
+'589',901,92000,4,'',0,22000,4,'',0,38000,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_194 b/src/main/res-current/raw/current_gtfs_schedule_stop_194
index b9bca01c3..bc9321694 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_194
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_194
@@ -1,7 +1,7 @@
-'576',1000,81100,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
-'577',1000,61200,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,5900,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0,8300,4,'',0
-'578',1000,61200,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,5900,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0,8300,4,'',0
-'579',1000,61200,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,5900,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0,8300,4,'',0
-'580',1000,61200,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,5900,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0,8300,4,'',0
-'581',1000,80800,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'582',1000,61200,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,5900,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0,8300,4,'',0
+'583',1000,61200,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,5900,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0,8300,4,'',0
+'584',1000,61200,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,5900,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0,8300,4,'',0
+'585',1000,80800,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'586',1000,81100,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
+'587',1000,61200,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,5900,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0,8300,4,'',0
+'588',1000,61200,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,5900,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0,8300,4,'',0
+'589',1000,61200,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,5900,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0,8300,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_195 b/src/main/res-current/raw/current_gtfs_schedule_stop_195
index e12e7f4bb..8106622f2 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_195
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_195
@@ -1,7 +1,7 @@
-'576',1100,81200,,'',0,4200,4,'',0,15000,,'',0,10000,,'',0,1400,4,'',0,8600,,'',0,9900,4,'',0,100,,'',0,10000,,'',0,4400,4,'',0,5600,,'',0,10000,,'',0,10000,,'',0,900,4,'',0,9700,,'',0,9400,,'',0,3400,4,'',0,6600,,'',0,10000,,'',0,11800,4,'',0
-'577',1100,65400,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'578',1100,65400,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'579',1100,65400,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'580',1100,65400,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'581',1100,75900,,'',0,7500,4,'',0,500,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,900,4,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,600,4,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,4,'',0,2200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,600,4,'',0,6400,,'',0,2900,,'',0,3000,,'',0,15500,,'',0,3900,4,'',0,6600,,'',0,10000,,'',0,10000,,'',0,10800,4,'',0
-'582',1100,65400,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'583',1100,65400,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'584',1100,65400,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'585',1100,75900,,'',0,7500,4,'',0,500,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,900,4,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,600,4,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,4,'',0,2200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,600,4,'',0,6400,,'',0,2900,,'',0,3000,,'',0,15500,,'',0,3900,4,'',0,6600,,'',0,10000,,'',0,10000,,'',0,10800,4,'',0
+'586',1100,81200,,'',0,4200,4,'',0,15000,,'',0,10000,,'',0,1400,4,'',0,8600,,'',0,9900,4,'',0,100,,'',0,10000,,'',0,4400,4,'',0,5600,,'',0,10000,,'',0,10000,,'',0,900,4,'',0,9700,,'',0,9400,,'',0,3400,4,'',0,6600,,'',0,10000,,'',0,11800,4,'',0
+'587',1100,65400,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'588',1100,65400,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'589',1100,65400,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_196 b/src/main/res-current/raw/current_gtfs_schedule_stop_196
index c83e39bad..4cb8e2194 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_196
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_196
@@ -1,14 +1,14 @@
-'576',1200,93100,4,'',0,7700,4,'',0,14900,4,'',0,18700,4,'',0,18300,4,'',0,8000,4,'',0,14800,4,'',0,8100,4,'',0
-'576',1201,85900,,'',0,7700,,'',0,18900,,'',0,18700,,'',0,14300,,'',0,8000,,'',0,18800,,'',0,8100,,'',0
-'577',1200,112700,4,'',0
-'577',1201,105500,,'',0,95000,,'',0
-'578',1200,112700,4,'',0
-'578',1201,105500,,'',0,95000,,'',0
-'579',1200,112700,4,'',0
-'579',1201,105500,,'',0,95000,,'',0
-'580',1200,112700,4,'',0
-'580',1201,105500,,'',0,95000,,'',0
-'581',1200,95800,4,'',0,7600,4,'',0,21300,4,'',0,30000,4,'',0,8000,4,'',0,8000,4,'',0,42500,4,'',0
-'581',1201,92600,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,4000,,'',0,8000,,'',0,46500,,'',0
-'582',1200,112700,4,'',0
-'582',1201,105500,,'',0,95000,,'',0
+'583',1200,112700,4,'',0
+'583',1201,105500,,'',0,95000,,'',0
+'584',1200,112700,4,'',0
+'584',1201,105500,,'',0,95000,,'',0
+'585',1200,95800,4,'',0,7600,4,'',0,21300,4,'',0,30000,4,'',0,8000,4,'',0,8000,4,'',0,42500,4,'',0
+'585',1201,92600,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,4000,,'',0,8000,,'',0,46500,,'',0
+'586',1200,93100,4,'',0,7700,4,'',0,14900,4,'',0,18700,4,'',0,18300,4,'',0,8000,4,'',0,14800,4,'',0,8100,4,'',0
+'586',1201,85900,,'',0,7700,,'',0,18900,,'',0,18700,,'',0,14300,,'',0,8000,,'',0,18800,,'',0,8100,,'',0
+'587',1200,112700,4,'',0
+'587',1201,105500,,'',0,95000,,'',0
+'588',1200,112700,4,'',0
+'588',1201,105500,,'',0,95000,,'',0
+'589',1200,112700,4,'',0
+'589',1201,105500,,'',0,95000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_197 b/src/main/res-current/raw/current_gtfs_schedule_stop_197
index beecdc7e0..36418f54b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_197
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_197
@@ -1,7 +1,7 @@
-'576',1001,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'577',1001,64300,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'578',1001,64300,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'579',1001,64300,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'580',1001,64300,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'581',1001,82200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,7000,,'',0,5900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',1001,64300,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'583',1001,64300,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'584',1001,64300,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'585',1001,82200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,7000,,'',0,5900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',1001,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'587',1001,64300,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'588',1001,64300,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'589',1001,64300,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_198 b/src/main/res-current/raw/current_gtfs_schedule_stop_198
index a37a4f98e..53b805281 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_198
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_198
@@ -1,7 +1,7 @@
-'576',800,71100,,'',0,10200,,'',0,9000,,'',0,5200,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,17000,,'',0
-'577',800,60800,,'',0,2500,,'',0,2300,,'',0,6100,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
-'578',800,60800,,'',0,2500,,'',0,2300,,'',0,6100,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
-'579',800,60800,,'',0,2500,,'',0,2300,,'',0,6100,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
-'580',800,60800,,'',0,2500,,'',0,2300,,'',0,6100,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
-'581',800,63300,,'',0,7600,,'',0,4500,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'582',800,60800,,'',0,2500,,'',0,2300,,'',0,6100,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
+'583',800,60800,,'',0,2500,,'',0,2300,,'',0,6100,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
+'584',800,60800,,'',0,2500,,'',0,2300,,'',0,6100,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
+'585',800,63300,,'',0,7600,,'',0,4500,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
+'586',800,71100,,'',0,10200,,'',0,9000,,'',0,5200,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,17000,,'',0
+'587',800,60800,,'',0,2500,,'',0,2300,,'',0,6100,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
+'588',800,60800,,'',0,2500,,'',0,2300,,'',0,6100,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
+'589',800,60800,,'',0,2500,,'',0,2300,,'',0,6100,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_199 b/src/main/res-current/raw/current_gtfs_schedule_stop_199
index ad75759ce..98930704b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_199
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_199
@@ -1,14 +1,14 @@
-'576',400,80100,,'',0,20000,,'',0,21500,,'',0,23000,,'',0,20500,,'',0,36000,,'',0,10000,,'',0
-'577',400,65100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
-'578',400,65100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
-'579',400,65100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
-'580',400,65100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
-'581',400,83900,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'582',400,65100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
-'576',1001,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'577',1001,64400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'578',1001,64400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'579',1001,64400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'580',1001,64400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'581',1001,82300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,7000,,'',0,9900,,'',0,5900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',1001,64400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'583',400,65100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'584',400,65100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'585',400,83900,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'586',400,80100,,'',0,20000,,'',0,21500,,'',0,23000,,'',0,20500,,'',0,36000,,'',0,10000,,'',0
+'587',400,65100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'588',400,65100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'589',400,65100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'583',1001,64400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'584',1001,64400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'585',1001,82300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,7000,,'',0,9900,,'',0,5900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',1001,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'587',1001,64400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'588',1001,64400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'589',1001,64400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2300,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_2 b/src/main/res-current/raw/current_gtfs_schedule_stop_2
index 512a190b0..8a3e22c84 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_2
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_2
@@ -1,7 +1,7 @@
-'576',3001,73000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0
-'577',3001,62900,,'',0,1500,,'',0,1500,,'',0,5700,,'',0,1800,,'',0,800,,'',0,700,,'',0,700,,'',0,4700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,500,,'',0,5300,4,'',0,100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,1000,,'',0,5000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,800,,'',0,4900,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,800,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,800,4,'',0,800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,6000,,'',0,800,4,'',0,1100,,'',0,1200,4,'',0,1500,,'',0,6000,,'',0,2000,,'',0,1300,4,'',0,5600,,'',0,2000,,'',0,1400,4,'',0,1900,,'',0,6200,,'',0,2500,,'',0,6400,,'',0,2700,,'',0,2300,,'',0,6700,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,7900,4,'',0
-'578',3001,62900,,'',0,1500,,'',0,1500,,'',0,5700,,'',0,1800,,'',0,800,,'',0,700,,'',0,700,,'',0,4700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,500,,'',0,5300,4,'',0,100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,1000,,'',0,5000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,800,,'',0,4900,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,800,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,800,4,'',0,800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,6000,,'',0,800,4,'',0,1100,,'',0,1200,4,'',0,1500,,'',0,6000,,'',0,2000,,'',0,1300,4,'',0,5600,,'',0,2000,,'',0,1400,4,'',0,1900,,'',0,6200,,'',0,2500,,'',0,6400,,'',0,2700,,'',0,2300,,'',0,6700,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,7900,4,'',0
-'579',3001,62900,,'',0,1500,,'',0,1500,,'',0,5700,,'',0,1800,,'',0,800,,'',0,700,,'',0,700,,'',0,4700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,500,,'',0,5300,4,'',0,100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,1000,,'',0,5000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,800,,'',0,4900,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,800,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,800,4,'',0,800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,6000,,'',0,800,4,'',0,1100,,'',0,1200,4,'',0,1500,,'',0,6000,,'',0,2000,,'',0,1300,4,'',0,5600,,'',0,2000,,'',0,1400,4,'',0,1900,,'',0,6200,,'',0,2500,,'',0,6400,,'',0,2700,,'',0,2300,,'',0,6700,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,7900,4,'',0
-'580',3001,62900,,'',0,1500,,'',0,1500,,'',0,5700,,'',0,1800,,'',0,800,,'',0,700,,'',0,700,,'',0,4700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,500,,'',0,5300,4,'',0,100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,1000,,'',0,5000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,800,,'',0,4900,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,800,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,800,4,'',0,800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,6000,,'',0,800,4,'',0,1100,,'',0,1200,4,'',0,1500,,'',0,6000,,'',0,2000,,'',0,1300,4,'',0,5600,,'',0,2000,,'',0,1400,4,'',0,1900,,'',0,6200,,'',0,2500,,'',0,6400,,'',0,2700,,'',0,2300,,'',0,6700,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,7900,4,'',0,1100,,'',0,8000,,'',0
-'581',3001,73000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,4,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'582',3001,62900,,'',0,1500,,'',0,1500,,'',0,5700,,'',0,1800,,'',0,800,,'',0,700,,'',0,700,,'',0,4700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,500,,'',0,5300,4,'',0,100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,1000,,'',0,5000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,800,,'',0,4900,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,800,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,800,4,'',0,800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,6000,,'',0,800,4,'',0,1100,,'',0,1200,4,'',0,1500,,'',0,6000,,'',0,2000,,'',0,1300,4,'',0,5600,,'',0,2000,,'',0,1400,4,'',0,1900,,'',0,6200,,'',0,2500,,'',0,6400,,'',0,2700,,'',0,2300,,'',0,6700,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,7900,4,'',0
+'583',3001,62900,,'',0,1500,,'',0,1500,,'',0,5700,,'',0,1800,,'',0,800,,'',0,700,,'',0,700,,'',0,4700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,500,,'',0,5300,4,'',0,100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,1000,,'',0,5000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,800,,'',0,4900,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,800,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,800,4,'',0,800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,6000,,'',0,800,4,'',0,1100,,'',0,1200,4,'',0,1500,,'',0,6000,,'',0,2000,,'',0,1300,4,'',0,5600,,'',0,2000,,'',0,1400,4,'',0,1900,,'',0,6200,,'',0,2500,,'',0,6400,,'',0,2700,,'',0,2300,,'',0,6700,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,7900,4,'',0
+'584',3001,62900,,'',0,1500,,'',0,1500,,'',0,5700,,'',0,1800,,'',0,800,,'',0,700,,'',0,700,,'',0,4700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,500,,'',0,5300,4,'',0,100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,1000,,'',0,5000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,800,,'',0,4900,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,800,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,800,4,'',0,800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,6000,,'',0,800,4,'',0,1100,,'',0,1200,4,'',0,1500,,'',0,6000,,'',0,2000,,'',0,1300,4,'',0,5600,,'',0,2000,,'',0,1400,4,'',0,1900,,'',0,6200,,'',0,2500,,'',0,6400,,'',0,2700,,'',0,2300,,'',0,6700,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,7900,4,'',0,1100,,'',0,8000,,'',0
+'585',3001,73000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,4,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'586',3001,73000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0
+'587',3001,62900,,'',0,1500,,'',0,1500,,'',0,5700,,'',0,1800,,'',0,800,,'',0,700,,'',0,700,,'',0,4700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,500,,'',0,5300,4,'',0,100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,1000,,'',0,5000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,800,,'',0,4900,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,800,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,800,4,'',0,800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,6000,,'',0,800,4,'',0,1100,,'',0,1200,4,'',0,1500,,'',0,6000,,'',0,2000,,'',0,1300,4,'',0,5600,,'',0,2000,,'',0,1400,4,'',0,1900,,'',0,6200,,'',0,2500,,'',0,6400,,'',0,2700,,'',0,2300,,'',0,6700,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,7900,4,'',0
+'588',3001,62900,,'',0,1500,,'',0,1500,,'',0,5700,,'',0,1800,,'',0,800,,'',0,700,,'',0,700,,'',0,4700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,500,,'',0,5300,4,'',0,100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,1000,,'',0,5000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,800,,'',0,4900,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,800,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,800,4,'',0,800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,6000,,'',0,800,4,'',0,1100,,'',0,1200,4,'',0,1500,,'',0,6000,,'',0,2000,,'',0,1300,4,'',0,5600,,'',0,2000,,'',0,1400,4,'',0,1900,,'',0,6200,,'',0,2500,,'',0,6400,,'',0,2700,,'',0,2300,,'',0,6700,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,7900,4,'',0
+'589',3001,62900,,'',0,1500,,'',0,1500,,'',0,5700,,'',0,1800,,'',0,800,,'',0,700,,'',0,700,,'',0,4700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,500,,'',0,5300,4,'',0,100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,1000,,'',0,5000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,800,,'',0,4900,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,800,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,800,4,'',0,800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,6000,,'',0,800,4,'',0,1100,,'',0,1200,4,'',0,1500,,'',0,6000,,'',0,2000,,'',0,1300,4,'',0,5600,,'',0,2000,,'',0,1400,4,'',0,1900,,'',0,6200,,'',0,2500,,'',0,6400,,'',0,2700,,'',0,2300,,'',0,6700,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,7900,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_20 b/src/main/res-current/raw/current_gtfs_schedule_stop_20
index cb8743679..07d2a00cc 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_20
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_20
@@ -1,7 +1,7 @@
-'576',1001,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'577',1001,63100,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'578',1001,63100,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'579',1001,63100,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'580',1001,63100,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'581',1001,81000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',1001,63100,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'583',1001,63100,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'584',1001,63100,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'585',1001,81000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',1001,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'587',1001,63100,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'588',1001,63100,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'589',1001,63100,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_200 b/src/main/res-current/raw/current_gtfs_schedule_stop_200
index d4e28c04c..0978ad28f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_200
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_200
@@ -1,17 +1,17 @@
-'576',1101,75500,0,'Black Mtn',0,16600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
-'577',1101,70000,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'578',1101,70000,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'579',1101,70000,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'580',1101,70000,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'581',1101,81600,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'582',1101,70000,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'577',1400,122600,4,'',0,77400,4,'',0
-'577',1401,113500,,'',0,78000,,'',0
-'578',1400,122600,4,'',0,77400,4,'',0
-'578',1401,113500,,'',0,78000,,'',0
-'579',1400,122600,4,'',0,77400,4,'',0
-'579',1401,113500,,'',0,78000,,'',0
-'580',1400,122600,4,'',0,77400,4,'',0
-'580',1401,113500,,'',0,78000,,'',0
-'582',1400,122600,4,'',0,77400,4,'',0
-'582',1401,113500,,'',0,78000,,'',0
+'583',1101,70000,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'584',1101,70000,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'585',1101,81600,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'586',1101,75500,0,'Black Mtn',0,16600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
+'587',1101,70000,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'588',1101,70000,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'589',1101,70000,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'583',1400,122600,4,'',0,77400,4,'',0
+'583',1401,113500,,'',0,78000,,'',0
+'584',1400,122600,4,'',0,77400,4,'',0
+'584',1401,113500,,'',0,78000,,'',0
+'587',1400,122600,4,'',0,77400,4,'',0
+'587',1401,113500,,'',0,78000,,'',0
+'588',1400,122600,4,'',0,77400,4,'',0
+'588',1401,113500,,'',0,78000,,'',0
+'589',1400,122600,4,'',0,77400,4,'',0
+'589',1401,113500,,'',0,78000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_201 b/src/main/res-current/raw/current_gtfs_schedule_stop_201
index fafdc3016..6212b05bf 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_201
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_201
@@ -1,10 +1,10 @@
-'577',2700,65900,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'578',2700,65900,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'579',2700,65900,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'580',2700,65900,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'582',2700,65900,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'577',2901,155500,0,'',0
-'578',2901,155500,0,'',0
-'579',2901,155500,0,'',0
-'580',2901,155500,0,'',0
-'582',2901,155500,0,'',0
+'583',2700,65900,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'584',2700,65900,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'587',2700,65900,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'588',2700,65900,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'589',2700,65900,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'583',2901,155500,0,'',0
+'584',2901,155500,0,'',0
+'587',2901,155500,0,'',0
+'588',2901,155500,0,'',0
+'589',2901,155500,0,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_202 b/src/main/res-current/raw/current_gtfs_schedule_stop_202
index 786369823..4770f313b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_202
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_202
@@ -1,21 +1,21 @@
-'576',400,80000,,'',0,2300,4,'',0,17700,,'',0,2300,4,'',0,19200,,'',0,2300,4,'',0,20700,,'',0,6300,4,'',0,14200,,'',0,6300,4,'',0,29700,,'',0,2300,4,'',0,7700,,'',0,2300,4,'',0
-'577',400,65000,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,60700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,10200,,'',0,6300,4,'',0,13200,,'',0,6300,4,'',0,10700,,'',0,2200,4,'',0
-'578',400,65000,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,60700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,10200,,'',0,6300,4,'',0,13200,,'',0,6300,4,'',0,10700,,'',0,2200,4,'',0
-'579',400,65000,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,60700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,10200,,'',0,6300,4,'',0,13200,,'',0,6300,4,'',0,10700,,'',0,2200,4,'',0
-'580',400,65000,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,60700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,10200,,'',0,6300,4,'',0,13200,,'',0,6300,4,'',0,10700,,'',0,2200,4,'',0
-'581',400,83800,,'',0,6300,4,'',0,13800,,'',0,6300,4,'',0,23800,,'',0,6300,4,'',0,33700,,'',0,6300,4,'',0,12700,,'',0,2300,4,'',0,18700,,'',0,6300,4,'',0
-'582',400,65000,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,60700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,10200,,'',0,6300,4,'',0,13200,,'',0,6300,4,'',0,10700,,'',0,2200,4,'',0
-'576',1900,80000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'576',1901,75800,4,'',0,14300,4,'',0,11600,4,'',0,11500,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0,11500,4,'',0,11100,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0
-'577',1900,64500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'577',1901,71300,4,'',0,2000,4,'',0,2000,4,'',0,6100,4,'',0,2000,4,'',0,1900,4,'',0,6000,4,'',0,2100,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,3700,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,5900,4,'',0,2000,4,'',0,1900,4,'',0,5900,4,'',0,3500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,7500,4,'',0,2300,4,'',0,11500,4,'',0
-'578',1900,64500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'578',1901,71300,4,'',0,2000,4,'',0,2000,4,'',0,6100,4,'',0,2000,4,'',0,1900,4,'',0,6000,4,'',0,2100,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,3700,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,5900,4,'',0,2000,4,'',0,1900,4,'',0,5900,4,'',0,3500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,7500,4,'',0,2300,4,'',0,11500,4,'',0
-'579',1900,64500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'579',1901,71300,4,'',0,2000,4,'',0,2000,4,'',0,6100,4,'',0,2000,4,'',0,1900,4,'',0,6000,4,'',0,2100,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,3700,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,5900,4,'',0,2000,4,'',0,1900,4,'',0,5900,4,'',0,3500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,7500,4,'',0,2300,4,'',0,11500,4,'',0
-'580',1900,64500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'580',1901,71300,4,'',0,2000,4,'',0,2000,4,'',0,6100,4,'',0,2000,4,'',0,1900,4,'',0,6000,4,'',0,2100,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,3700,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,5900,4,'',0,2000,4,'',0,1900,4,'',0,5900,4,'',0,3500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,7500,4,'',0,2300,4,'',0,11500,4,'',0
-'581',1900,73000,,'',0,7500,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'581',1901,75700,4,'',0,7500,4,'',0,7500,4,'',0,3600,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,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7400,4,'',0,1600,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0,11500,4,'',0
-'582',1900,64500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'582',1901,71300,4,'',0,2000,4,'',0,2000,4,'',0,6100,4,'',0,2000,4,'',0,1900,4,'',0,6000,4,'',0,2100,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,3700,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,5900,4,'',0,2000,4,'',0,1900,4,'',0,5900,4,'',0,3500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,7500,4,'',0,2300,4,'',0,11500,4,'',0
+'583',400,65000,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,60700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,10200,,'',0,6300,4,'',0,13200,,'',0,6300,4,'',0,10700,,'',0,2200,4,'',0
+'584',400,65000,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,60700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,10200,,'',0,6300,4,'',0,13200,,'',0,6300,4,'',0,10700,,'',0,2200,4,'',0
+'585',400,83800,,'',0,6300,4,'',0,13800,,'',0,6300,4,'',0,23800,,'',0,6300,4,'',0,33700,,'',0,6300,4,'',0,12700,,'',0,2300,4,'',0,18700,,'',0,6300,4,'',0
+'586',400,80000,,'',0,2300,4,'',0,17700,,'',0,2300,4,'',0,19200,,'',0,2300,4,'',0,20700,,'',0,6300,4,'',0,14200,,'',0,6300,4,'',0,29700,,'',0,2300,4,'',0,7700,,'',0,2300,4,'',0
+'587',400,65000,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,60700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,10200,,'',0,6300,4,'',0,13200,,'',0,6300,4,'',0,10700,,'',0,2200,4,'',0
+'588',400,65000,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,60700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,10200,,'',0,6300,4,'',0,13200,,'',0,6300,4,'',0,10700,,'',0,2200,4,'',0
+'589',400,65000,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,60700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,10200,,'',0,6300,4,'',0,13200,,'',0,6300,4,'',0,10700,,'',0,2200,4,'',0
+'583',1900,64500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'583',1901,71300,4,'',0,2000,4,'',0,2000,4,'',0,6100,4,'',0,2000,4,'',0,1900,4,'',0,6000,4,'',0,2100,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,3700,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,5900,4,'',0,2000,4,'',0,1900,4,'',0,5900,4,'',0,3500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,7500,4,'',0,2300,4,'',0,11500,4,'',0
+'584',1900,64500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'584',1901,71300,4,'',0,2000,4,'',0,2000,4,'',0,6100,4,'',0,2000,4,'',0,1900,4,'',0,6000,4,'',0,2100,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,3700,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,5900,4,'',0,2000,4,'',0,1900,4,'',0,5900,4,'',0,3500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,7500,4,'',0,2300,4,'',0,11500,4,'',0
+'585',1900,73000,,'',0,7500,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'585',1901,75700,4,'',0,7500,4,'',0,7500,4,'',0,3600,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,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7400,4,'',0,1600,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0,11500,4,'',0
+'586',1900,80000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'586',1901,75800,4,'',0,14300,4,'',0,11600,4,'',0,11500,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0,11500,4,'',0,11100,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0
+'587',1900,64500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'587',1901,71300,4,'',0,2000,4,'',0,2000,4,'',0,6100,4,'',0,2000,4,'',0,1900,4,'',0,6000,4,'',0,2100,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,3700,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,5900,4,'',0,2000,4,'',0,1900,4,'',0,5900,4,'',0,3500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,7500,4,'',0,2300,4,'',0,11500,4,'',0
+'588',1900,64500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'588',1901,71300,4,'',0,2000,4,'',0,2000,4,'',0,6100,4,'',0,2000,4,'',0,1900,4,'',0,6000,4,'',0,2100,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,3700,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,5900,4,'',0,2000,4,'',0,1900,4,'',0,5900,4,'',0,3500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,7500,4,'',0,2300,4,'',0,11500,4,'',0
+'589',1900,64500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'589',1901,71300,4,'',0,2000,4,'',0,2000,4,'',0,6100,4,'',0,2000,4,'',0,1900,4,'',0,6000,4,'',0,2100,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,3700,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,5900,4,'',0,2000,4,'',0,1900,4,'',0,5900,4,'',0,3500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,7500,4,'',0,2300,4,'',0,11500,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_203 b/src/main/res-current/raw/current_gtfs_schedule_stop_203
index 322f10bd9..f86cc724c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_203
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_203
@@ -1,21 +1,21 @@
-'576',700,85100,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'577',700,70100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'578',700,70100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'579',700,70100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'580',700,70100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'581',700,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',700,70100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'576',1801,81700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'577',1801,63400,,'',0,7500,,'',0,2700,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'578',1801,63400,,'',0,7500,,'',0,2700,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'579',1801,63400,,'',0,7500,,'',0,2700,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'580',1801,63400,,'',0,7500,,'',0,2700,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'581',1801,74800,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'582',1801,63400,,'',0,7500,,'',0,2700,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'576',1901,74900,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'577',1901,70400,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'578',1901,70400,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'579',1901,70400,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'580',1901,70400,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'581',1901,74800,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'582',1901,70400,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'583',700,70100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'584',700,70100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'585',700,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',700,85100,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
+'587',700,70100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'588',700,70100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'589',700,70100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'583',1801,63400,,'',0,7500,,'',0,2700,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'584',1801,63400,,'',0,7500,,'',0,2700,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'585',1801,74800,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'586',1801,81700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'587',1801,63400,,'',0,7500,,'',0,2700,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'588',1801,63400,,'',0,7500,,'',0,2700,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'589',1801,63400,,'',0,7500,,'',0,2700,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'583',1901,70400,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'584',1901,70400,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'585',1901,74800,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'586',1901,74900,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'587',1901,70400,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'588',1901,70400,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'589',1901,70400,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_204 b/src/main/res-current/raw/current_gtfs_schedule_stop_204
index b52bf4ef4..7538afce5 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_204
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_204
@@ -1,9 +1,9 @@
-'576',1000,232100,0,'North Rutland',0
-'576',1001,90900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
-'577',1001,54700,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'578',1001,54700,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'579',1001,54700,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'580',1001,54700,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'581',1000,251100,0,'North Rutland',0
-'581',1001,84600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',1001,54700,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'583',1001,54700,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'584',1001,54700,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'585',1000,251100,0,'North Rutland',0
+'585',1001,84600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',1000,232100,0,'North Rutland',0
+'586',1001,90900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
+'587',1001,54700,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'588',1001,54700,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'589',1001,54700,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_205 b/src/main/res-current/raw/current_gtfs_schedule_stop_205
index b7b0f1385..6989dc17d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_205
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_205
@@ -1,7 +1,7 @@
-'576',400,81500,,'',0,20000,,'',0,21500,,'',0,27000,,'',0,20500,,'',0,32000,,'',0,10000,,'',0
-'577',400,70500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
-'578',400,70500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
-'579',400,70500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
-'580',400,70500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
-'581',400,85300,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'582',400,70500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
+'583',400,70500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
+'584',400,70500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
+'585',400,85300,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'586',400,81500,,'',0,20000,,'',0,21500,,'',0,27000,,'',0,20500,,'',0,32000,,'',0,10000,,'',0
+'587',400,70500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
+'588',400,70500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
+'589',400,70500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_206 b/src/main/res-current/raw/current_gtfs_schedule_stop_206
index 2af5edd43..b1cda49ae 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_206
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_206
@@ -1,7 +1,7 @@
-'576',400,80900,,'',0,20000,,'',0,21500,,'',0,23000,,'',0,20500,,'',0,36000,,'',0,10000,,'',0
-'577',400,65900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
-'578',400,65900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
-'579',400,65900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
-'580',400,65900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
-'581',400,84700,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'582',400,65900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'583',400,65900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'584',400,65900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'585',400,84700,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'586',400,80900,,'',0,20000,,'',0,21500,,'',0,23000,,'',0,20500,,'',0,36000,,'',0,10000,,'',0
+'587',400,65900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'588',400,65900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'589',400,65900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_207 b/src/main/res-current/raw/current_gtfs_schedule_stop_207
index b4f1fdaa9..e8afa6ddb 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_207
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_207
@@ -1,10 +1,10 @@
-'577',501,63000,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,71500,,'',0,8700,,'',0,7600,,'',0,9000,,'',0
-'578',501,63000,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,71500,,'',0,8700,,'',0,7600,,'',0,9000,,'',0
-'579',501,63000,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,71500,,'',0,8700,,'',0,7600,,'',0,9000,,'',0
-'580',501,63000,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,71500,,'',0,8700,,'',0,7600,,'',0,9000,,'',0
-'582',501,63000,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,71500,,'',0,8700,,'',0,7600,,'',0,9000,,'',0
-'577',1200,72100,,'',0,8100,,'',0,4000,,'',0,67800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'578',1200,72100,,'',0,8100,,'',0,4000,,'',0,67800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'579',1200,72100,,'',0,8100,,'',0,4000,,'',0,67800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'580',1200,72100,,'',0,8100,,'',0,4000,,'',0,67800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'582',1200,72100,,'',0,8100,,'',0,4000,,'',0,67800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'583',501,63000,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,71500,,'',0,8700,,'',0,7600,,'',0,9000,,'',0
+'584',501,63000,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,71500,,'',0,8700,,'',0,7600,,'',0,9000,,'',0
+'587',501,63000,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,71500,,'',0,8700,,'',0,7600,,'',0,9000,,'',0
+'588',501,63000,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,71500,,'',0,8700,,'',0,7600,,'',0,9000,,'',0
+'589',501,63000,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,71500,,'',0,8700,,'',0,7600,,'',0,9000,,'',0
+'583',1200,72100,,'',0,8100,,'',0,4000,,'',0,67800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'584',1200,72100,,'',0,8100,,'',0,4000,,'',0,67800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'587',1200,72100,,'',0,8100,,'',0,4000,,'',0,67800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'588',1200,72100,,'',0,8100,,'',0,4000,,'',0,67800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'589',1200,72100,,'',0,8100,,'',0,4000,,'',0,67800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_208 b/src/main/res-current/raw/current_gtfs_schedule_stop_208
index 6f5898cc3..7c0044c49 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_208
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_208
@@ -1,12 +1,12 @@
-'576',1101,75600,0,'Black Mtn',0,16600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
-'577',1101,70100,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'578',1101,70100,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'579',1101,70100,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'580',1101,70100,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'581',1101,81700,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'582',1101,70100,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'577',1401,113600,,'',0,78000,,'',0
-'578',1401,113600,,'',0,78000,,'',0
-'579',1401,113600,,'',0,78000,,'',0
-'580',1401,113600,,'',0,78000,,'',0
-'582',1401,113600,,'',0,78000,,'',0
+'583',1101,70100,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'584',1101,70100,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'585',1101,81700,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'586',1101,75600,0,'Black Mtn',0,16600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
+'587',1101,70100,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'588',1101,70100,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'589',1101,70100,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'583',1401,113600,,'',0,78000,,'',0
+'584',1401,113600,,'',0,78000,,'',0
+'587',1401,113600,,'',0,78000,,'',0
+'588',1401,113600,,'',0,78000,,'',0
+'589',1401,113600,,'',0,78000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_209 b/src/main/res-current/raw/current_gtfs_schedule_stop_209
index adc905648..564001b5b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_209
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_209
@@ -1,21 +1,21 @@
-'576',701,81100,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'577',701,62500,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
-'578',701,62500,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
-'579',701,62500,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
-'580',701,62500,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
-'581',701,81600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',701,62500,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
-'576',1800,73900,,'',0,10300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'577',1800,62500,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'578',1800,62500,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'579',1800,62500,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'580',1800,62500,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'581',1800,73900,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8300,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'582',1800,62500,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'576',1900,80800,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'577',1900,65300,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
-'578',1900,65300,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
-'579',1900,65300,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
-'580',1900,65300,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
-'581',1900,73800,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'582',1900,65300,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
+'583',701,62500,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'584',701,62500,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'585',701,81600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',701,81100,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'587',701,62500,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'588',701,62500,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'589',701,62500,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'583',1800,62500,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'584',1800,62500,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'585',1800,73900,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8300,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'586',1800,73900,,'',0,10300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'587',1800,62500,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'588',1800,62500,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'589',1800,62500,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'583',1900,65300,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
+'584',1900,65300,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
+'585',1900,73800,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'586',1900,80800,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'587',1900,65300,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
+'588',1900,65300,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
+'589',1900,65300,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_210 b/src/main/res-current/raw/current_gtfs_schedule_stop_210
index e0c565850..67cdc0c4f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_210
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_210
@@ -1,10 +1,10 @@
-'577',500,65100,,'',0,7700,,'',0,9700,,'',0,69700,,'',0,1500,,'',0,7900,,'',0,9000,,'',0,4000,,'',0
-'578',500,65100,,'',0,7700,,'',0,9700,,'',0,69700,,'',0,1500,,'',0,7900,,'',0,9000,,'',0,4000,,'',0
-'579',500,65100,,'',0,7700,,'',0,9700,,'',0,69700,,'',0,1500,,'',0,7900,,'',0,9000,,'',0,4000,,'',0
-'580',500,65100,,'',0,7700,,'',0,9700,,'',0,69700,,'',0,1500,,'',0,7900,,'',0,9000,,'',0,4000,,'',0
-'582',500,65100,,'',0,7700,,'',0,9700,,'',0,69700,,'',0,1500,,'',0,7900,,'',0,9000,,'',0,4000,,'',0
-'577',1201,70000,,'',0,4100,,'',0,8000,,'',0,63700,,'',0,8400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0
-'578',1201,70000,,'',0,4100,,'',0,8000,,'',0,63700,,'',0,8400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0
-'579',1201,70000,,'',0,4100,,'',0,8000,,'',0,63700,,'',0,8400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0
-'580',1201,70000,,'',0,4100,,'',0,8000,,'',0,63700,,'',0,8400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0
-'582',1201,70000,,'',0,4100,,'',0,8000,,'',0,63700,,'',0,8400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0
+'583',500,65100,,'',0,7700,,'',0,9700,,'',0,69700,,'',0,1500,,'',0,7900,,'',0,9000,,'',0,4000,,'',0
+'584',500,65100,,'',0,7700,,'',0,9700,,'',0,69700,,'',0,1500,,'',0,7900,,'',0,9000,,'',0,4000,,'',0
+'587',500,65100,,'',0,7700,,'',0,9700,,'',0,69700,,'',0,1500,,'',0,7900,,'',0,9000,,'',0,4000,,'',0
+'588',500,65100,,'',0,7700,,'',0,9700,,'',0,69700,,'',0,1500,,'',0,7900,,'',0,9000,,'',0,4000,,'',0
+'589',500,65100,,'',0,7700,,'',0,9700,,'',0,69700,,'',0,1500,,'',0,7900,,'',0,9000,,'',0,4000,,'',0
+'583',1201,70000,,'',0,4100,,'',0,8000,,'',0,63700,,'',0,8400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0
+'584',1201,70000,,'',0,4100,,'',0,8000,,'',0,63700,,'',0,8400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0
+'587',1201,70000,,'',0,4100,,'',0,8000,,'',0,63700,,'',0,8400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0
+'588',1201,70000,,'',0,4100,,'',0,8000,,'',0,63700,,'',0,8400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0
+'589',1201,70000,,'',0,4100,,'',0,8000,,'',0,63700,,'',0,8400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_211 b/src/main/res-current/raw/current_gtfs_schedule_stop_211
index 22f94ae57..09876247f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_211
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_211
@@ -1,7 +1,7 @@
-'576',400,80800,,'',0,20000,,'',0,21500,,'',0,23000,,'',0,20500,,'',0,36000,,'',0,10000,,'',0
-'577',400,65800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
-'578',400,65800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
-'579',400,65800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
-'580',400,65800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
-'581',400,84600,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'582',400,65800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'583',400,65800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'584',400,65800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'585',400,84600,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'586',400,80800,,'',0,20000,,'',0,21500,,'',0,23000,,'',0,20500,,'',0,36000,,'',0,10000,,'',0
+'587',400,65800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'588',400,65800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'589',400,65800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_212 b/src/main/res-current/raw/current_gtfs_schedule_stop_212
index 056d1dba6..3707ad60f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_212
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_212
@@ -1,7 +1,7 @@
-'576',400,81200,,'',0,20000,,'',0,21500,,'',0,23000,,'',0,24500,,'',0,32000,,'',0,10000,,'',0
-'577',400,70200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
-'578',400,70200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
-'579',400,70200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
-'580',400,70200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
-'581',400,85000,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'582',400,70200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'583',400,70200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'584',400,70200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'585',400,85000,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'586',400,81200,,'',0,20000,,'',0,21500,,'',0,23000,,'',0,24500,,'',0,32000,,'',0,10000,,'',0
+'587',400,70200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'588',400,70200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'589',400,70200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_213 b/src/main/res-current/raw/current_gtfs_schedule_stop_213
index f22cac44d..d361cc4ad 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_213
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_213
@@ -1,7 +1,7 @@
-'576',200,81100,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'577',200,60600,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'578',200,60600,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'579',200,60600,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'580',200,60600,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'581',200,81000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'582',200,60600,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'583',200,60600,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'584',200,60600,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'585',200,81000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
+'586',200,81100,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'587',200,60600,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'588',200,60600,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'589',200,60600,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_214 b/src/main/res-current/raw/current_gtfs_schedule_stop_214
index e66104f02..a525e08f4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_214
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_214
@@ -1,14 +1,14 @@
-'576',400,82100,,'',0,20000,,'',0,21500,,'',0,27000,,'',0,20500,,'',0,32000,,'',0,10000,,'',0
-'577',400,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,19500,,'',0,12900,,'',0
-'578',400,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,19500,,'',0,12900,,'',0
-'579',400,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,19500,,'',0,12900,,'',0
-'580',400,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,19500,,'',0,12900,,'',0
-'581',400,85900,,'',0,24100,,'',0,30100,,'',0,40000,,'',0,15000,,'',0,25000,,'',0
-'582',400,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,19500,,'',0,12900,,'',0
-'576',1000,80700,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,13000,,'',0
-'577',1000,60800,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,5900,,'',0,2800,,'',0,2900,,'',0,7300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'578',1000,60800,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,5900,,'',0,2800,,'',0,2900,,'',0,7300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'579',1000,60800,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,5900,,'',0,2800,,'',0,2900,,'',0,7300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'580',1000,60800,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,5900,,'',0,2800,,'',0,2900,,'',0,7300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'581',1000,80400,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'582',1000,60800,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,5900,,'',0,2800,,'',0,2900,,'',0,7300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'583',400,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,19500,,'',0,12900,,'',0
+'584',400,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,19500,,'',0,12900,,'',0
+'585',400,85900,,'',0,24100,,'',0,30100,,'',0,40000,,'',0,15000,,'',0,25000,,'',0
+'586',400,82100,,'',0,20000,,'',0,21500,,'',0,27000,,'',0,20500,,'',0,32000,,'',0,10000,,'',0
+'587',400,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,19500,,'',0,12900,,'',0
+'588',400,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,19500,,'',0,12900,,'',0
+'589',400,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,19500,,'',0,12900,,'',0
+'583',1000,60800,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,5900,,'',0,2800,,'',0,2900,,'',0,7300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'584',1000,60800,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,5900,,'',0,2800,,'',0,2900,,'',0,7300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'585',1000,80400,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'586',1000,80700,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,13000,,'',0
+'587',1000,60800,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,5900,,'',0,2800,,'',0,2900,,'',0,7300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'588',1000,60800,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,5900,,'',0,2800,,'',0,2900,,'',0,7300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'589',1000,60800,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,5900,,'',0,2800,,'',0,2900,,'',0,7300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_215 b/src/main/res-current/raw/current_gtfs_schedule_stop_215
index b244eef9f..e42b07fc8 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_215
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_215
@@ -1,7 +1,7 @@
-'576',201,75700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',201,61500,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'578',201,61500,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'579',201,61500,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'580',201,61500,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'581',201,82200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,9600,,'',0
-'582',201,61500,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'583',201,61500,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'584',201,61500,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'585',201,82200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,9600,,'',0
+'586',201,75700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',201,61500,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'588',201,61500,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'589',201,61500,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_216 b/src/main/res-current/raw/current_gtfs_schedule_stop_216
index 398bd1369..4a1a87608 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_216
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_216
@@ -1,5 +1,5 @@
-'577',2700,64700,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'578',2700,64700,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'579',2700,64700,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'580',2700,64700,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'582',2700,64700,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'583',2700,64700,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'584',2700,64700,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'587',2700,64700,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'588',2700,64700,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'589',2700,64700,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_217 b/src/main/res-current/raw/current_gtfs_schedule_stop_217
index 3f40b5068..cac843ddf 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_217
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_217
@@ -1,7 +1,7 @@
-'576',400,81600,,'',0,20000,,'',0,21500,,'',0,27000,,'',0,20500,,'',0,32000,,'',0,10000,,'',0
-'577',400,70600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
-'578',400,70600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
-'579',400,70600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
-'580',400,70600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
-'581',400,85400,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'582',400,70600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
+'583',400,70600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
+'584',400,70600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
+'585',400,85400,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'586',400,81600,,'',0,20000,,'',0,21500,,'',0,27000,,'',0,20500,,'',0,32000,,'',0,10000,,'',0
+'587',400,70600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
+'588',400,70600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
+'589',400,70600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_218 b/src/main/res-current/raw/current_gtfs_schedule_stop_218
index b90149a0f..f55be2b6e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_218
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_218
@@ -1,7 +1,7 @@
-'576',400,82100,,'',0,20000,,'',0,21500,,'',0,27000,,'',0,20500,,'',0,32000,,'',0,10000,,'',0
-'577',400,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,19500,,'',0,12900,,'',0
-'578',400,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,19500,,'',0,12900,,'',0
-'579',400,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,19500,,'',0,12900,,'',0
-'580',400,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,19500,,'',0,12900,,'',0
-'581',400,85900,,'',0,24100,,'',0,30100,,'',0,40000,,'',0,15000,,'',0,25000,,'',0
-'582',400,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,19500,,'',0,12900,,'',0
+'583',400,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,19500,,'',0,12900,,'',0
+'584',400,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,19500,,'',0,12900,,'',0
+'585',400,85900,,'',0,24100,,'',0,30100,,'',0,40000,,'',0,15000,,'',0,25000,,'',0
+'586',400,82100,,'',0,20000,,'',0,21500,,'',0,27000,,'',0,20500,,'',0,32000,,'',0,10000,,'',0
+'587',400,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,19500,,'',0,12900,,'',0
+'588',400,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,19500,,'',0,12900,,'',0
+'589',400,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,19500,,'',0,12900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_219 b/src/main/res-current/raw/current_gtfs_schedule_stop_219
index 497cbae45..a4b4dd983 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_219
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_219
@@ -1,19 +1,19 @@
-'576',801,63500,,'',0,27400,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8700,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'577',801,61600,,'',0,8500,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
-'578',801,61600,,'',0,8500,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
-'579',801,61600,,'',0,8500,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
-'580',801,61600,,'',0,8500,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
-'581',801,63500,,'',0,10200,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'582',801,61600,,'',0,8500,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
-'576',1100,80900,,'',0,4400,0,'Orchard Pk',0,14800,,'',0,10000,,'',0,1600,0,'Orchard Pk',0,8400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,4600,0,'Orchard Pk',0,5400,,'',0,10000,,'',0,10000,,'',0,1100,0,'Orchard Pk',0,8900,,'',0,10000,,'',0,3600,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,12000,0,'Orchard Pk',0
-'577',1100,65300,,'',0,8700,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'578',1100,65300,,'',0,8700,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'579',1100,65300,,'',0,8700,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'580',1100,65300,,'',0,8700,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'581',1100,75600,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,4800,0,'Orchard Pk',0,2200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'582',1100,65300,,'',0,8700,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'577',1400,122500,,'',0,73400,,'',0
-'578',1400,122500,,'',0,73400,,'',0
-'579',1400,122500,,'',0,73400,,'',0
-'580',1400,122500,,'',0,73400,,'',0
-'582',1400,122500,,'',0,73400,,'',0
+'583',801,61600,,'',0,8500,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
+'584',801,61600,,'',0,8500,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
+'585',801,63500,,'',0,10200,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
+'586',801,63500,,'',0,27400,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8700,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'587',801,61600,,'',0,8500,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
+'588',801,61600,,'',0,8500,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
+'589',801,61600,,'',0,8500,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
+'583',1100,65300,,'',0,8700,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'584',1100,65300,,'',0,8700,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'585',1100,75600,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,4800,0,'Orchard Pk',0,2200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'586',1100,80900,,'',0,4400,0,'Orchard Pk',0,14800,,'',0,10000,,'',0,1600,0,'Orchard Pk',0,8400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,4600,0,'Orchard Pk',0,5400,,'',0,10000,,'',0,10000,,'',0,1100,0,'Orchard Pk',0,8900,,'',0,10000,,'',0,3600,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,12000,0,'Orchard Pk',0
+'587',1100,65300,,'',0,8700,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'588',1100,65300,,'',0,8700,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'589',1100,65300,,'',0,8700,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'583',1400,122500,,'',0,73400,,'',0
+'584',1400,122500,,'',0,73400,,'',0
+'587',1400,122500,,'',0,73400,,'',0
+'588',1400,122500,,'',0,73400,,'',0
+'589',1400,122500,,'',0,73400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_22 b/src/main/res-current/raw/current_gtfs_schedule_stop_22
index 189abd683..b0e57af90 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_22
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_22
@@ -1,21 +1,21 @@
-'576',300,83900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11600,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
-'577',300,73700,,'',0,6300,,'',0,3000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'578',300,73700,,'',0,6300,,'',0,3000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'579',300,73700,,'',0,6300,,'',0,3000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'580',300,73700,,'',0,6300,,'',0,3000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'581',300,82400,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'582',300,73700,,'',0,6300,,'',0,3000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'576',700,90200,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'577',700,71400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'578',700,71400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'579',700,71400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'580',700,71400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'581',700,82500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',700,71400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'576',1801,82800,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'577',1801,64400,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
-'578',1801,64400,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
-'579',1801,64400,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
-'580',1801,64400,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
-'581',1801,75800,,'',0,14300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'582',1801,64400,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
+'583',300,73700,,'',0,6300,,'',0,3000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'584',300,73700,,'',0,6300,,'',0,3000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'585',300,82400,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
+'586',300,83900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11600,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
+'587',300,73700,,'',0,6300,,'',0,3000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'588',300,73700,,'',0,6300,,'',0,3000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'589',300,73700,,'',0,6300,,'',0,3000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'583',700,71400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'584',700,71400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'585',700,82500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',700,90200,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'587',700,71400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'588',700,71400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'589',700,71400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'583',1801,64400,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
+'584',1801,64400,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
+'585',1801,75800,,'',0,14300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'586',1801,82800,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'587',1801,64400,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
+'588',1801,64400,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
+'589',1801,64400,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_220 b/src/main/res-current/raw/current_gtfs_schedule_stop_220
index 03b6923e3..6f11cecc9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_220
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_220
@@ -1,7 +1,7 @@
-'576',400,81300,,'',0,20000,,'',0,21500,,'',0,23000,,'',0,24500,,'',0,32000,,'',0,10000,,'',0
-'577',400,70300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
-'578',400,70300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
-'579',400,70300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
-'580',400,70300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
-'581',400,85100,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'582',400,70300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'583',400,70300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'584',400,70300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'585',400,85100,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'586',400,81300,,'',0,20000,,'',0,21500,,'',0,23000,,'',0,24500,,'',0,32000,,'',0,10000,,'',0
+'587',400,70300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'588',400,70300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'589',400,70300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_221 b/src/main/res-current/raw/current_gtfs_schedule_stop_221
index 5e3a07d22..3e62596f7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_221
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_221
@@ -1,7 +1,7 @@
-'576',400,80200,,'',0,20000,,'',0,21500,,'',0,23000,,'',0,20500,,'',0,36000,,'',0,10000,,'',0
-'577',400,65200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
-'578',400,65200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
-'579',400,65200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
-'580',400,65200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
-'581',400,84000,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'582',400,65200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'583',400,65200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'584',400,65200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'585',400,84000,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'586',400,80200,,'',0,20000,,'',0,21500,,'',0,23000,,'',0,20500,,'',0,36000,,'',0,10000,,'',0
+'587',400,65200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'588',400,65200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'589',400,65200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_222 b/src/main/res-current/raw/current_gtfs_schedule_stop_222
index b90149a0f..f55be2b6e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_222
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_222
@@ -1,7 +1,7 @@
-'576',400,82100,,'',0,20000,,'',0,21500,,'',0,27000,,'',0,20500,,'',0,32000,,'',0,10000,,'',0
-'577',400,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,19500,,'',0,12900,,'',0
-'578',400,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,19500,,'',0,12900,,'',0
-'579',400,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,19500,,'',0,12900,,'',0
-'580',400,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,19500,,'',0,12900,,'',0
-'581',400,85900,,'',0,24100,,'',0,30100,,'',0,40000,,'',0,15000,,'',0,25000,,'',0
-'582',400,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,19500,,'',0,12900,,'',0
+'583',400,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,19500,,'',0,12900,,'',0
+'584',400,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,19500,,'',0,12900,,'',0
+'585',400,85900,,'',0,24100,,'',0,30100,,'',0,40000,,'',0,15000,,'',0,25000,,'',0
+'586',400,82100,,'',0,20000,,'',0,21500,,'',0,27000,,'',0,20500,,'',0,32000,,'',0,10000,,'',0
+'587',400,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,19500,,'',0,12900,,'',0
+'588',400,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,19500,,'',0,12900,,'',0
+'589',400,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,19500,,'',0,12900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_223 b/src/main/res-current/raw/current_gtfs_schedule_stop_223
index 5e3a07d22..3e62596f7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_223
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_223
@@ -1,7 +1,7 @@
-'576',400,80200,,'',0,20000,,'',0,21500,,'',0,23000,,'',0,20500,,'',0,36000,,'',0,10000,,'',0
-'577',400,65200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
-'578',400,65200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
-'579',400,65200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
-'580',400,65200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
-'581',400,84000,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'582',400,65200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'583',400,65200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'584',400,65200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'585',400,84000,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'586',400,80200,,'',0,20000,,'',0,21500,,'',0,23000,,'',0,20500,,'',0,36000,,'',0,10000,,'',0
+'587',400,65200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'588',400,65200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'589',400,65200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_224 b/src/main/res-current/raw/current_gtfs_schedule_stop_224
index 2195003b0..dd5ff5d29 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_224
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_224
@@ -1,21 +1,21 @@
-'576',700,85000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'577',700,70000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'578',700,70000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'579',700,70000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'580',700,70000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'581',700,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',700,70000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'576',1801,81600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'577',1801,63300,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'578',1801,63300,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'579',1801,63300,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'580',1801,63300,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'581',1801,74700,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'582',1801,63300,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'576',1901,74800,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'577',1901,70300,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'578',1901,70300,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'579',1901,70300,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'580',1901,70300,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'581',1901,74700,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'582',1901,70300,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'583',700,70000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'584',700,70000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'585',700,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',700,85000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
+'587',700,70000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'588',700,70000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'589',700,70000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'583',1801,63300,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'584',1801,63300,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'585',1801,74700,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'586',1801,81600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'587',1801,63300,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'588',1801,63300,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'589',1801,63300,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'583',1901,70300,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'584',1901,70300,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'585',1901,74700,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'586',1901,74800,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'587',1901,70300,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'588',1901,70300,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'589',1901,70300,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_225 b/src/main/res-current/raw/current_gtfs_schedule_stop_225
index 37322bd60..18d647a24 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_225
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_225
@@ -1,21 +1,21 @@
-'576',700,84800,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'577',700,65800,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
-'578',700,65800,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
-'579',700,65800,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
-'580',700,65800,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
-'581',700,81100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',700,65800,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
-'576',1801,81400,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'577',1801,63100,,'',0,7500,,'',0,2700,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
-'578',1801,63100,,'',0,7500,,'',0,2700,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
-'579',1801,63100,,'',0,7500,,'',0,2700,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
-'580',1801,63100,,'',0,7500,,'',0,2700,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
-'581',1801,74500,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'582',1801,63100,,'',0,7500,,'',0,2700,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
-'576',1901,74500,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'577',1901,70000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'578',1901,70000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'579',1901,70000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'580',1901,70000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'581',1901,74400,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'582',1901,70000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'583',700,65800,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
+'584',700,65800,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
+'585',700,81100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',700,84800,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
+'587',700,65800,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
+'588',700,65800,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
+'589',700,65800,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
+'583',1801,63100,,'',0,7500,,'',0,2700,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
+'584',1801,63100,,'',0,7500,,'',0,2700,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
+'585',1801,74500,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'586',1801,81400,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'587',1801,63100,,'',0,7500,,'',0,2700,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
+'588',1801,63100,,'',0,7500,,'',0,2700,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
+'589',1801,63100,,'',0,7500,,'',0,2700,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
+'583',1901,70000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'584',1901,70000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'585',1901,74400,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'586',1901,74500,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'587',1901,70000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'588',1901,70000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'589',1901,70000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_226 b/src/main/res-current/raw/current_gtfs_schedule_stop_226
index b0c41b9cf..d88ececf0 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_226
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_226
@@ -1,7 +1,7 @@
-'576',1001,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'577',1001,64500,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,2200,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'578',1001,64500,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,2200,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'579',1001,64500,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,2200,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'580',1001,64500,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,2200,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'581',1001,82400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',1001,64500,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,2200,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'583',1001,64500,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,2200,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'584',1001,64500,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,2200,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'585',1001,82400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',1001,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'587',1001,64500,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,2200,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'588',1001,64500,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,2200,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'589',1001,64500,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,2200,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_227 b/src/main/res-current/raw/current_gtfs_schedule_stop_227
index d6407142c..817a87657 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_227
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_227
@@ -1,21 +1,21 @@
-'576',701,81100,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'577',701,62600,,'',0,7500,,'',0,3500,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'578',701,62600,,'',0,7500,,'',0,3500,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'579',701,62600,,'',0,7500,,'',0,3500,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'580',701,62600,,'',0,7500,,'',0,3500,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'581',701,81600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',701,62600,,'',0,7500,,'',0,3500,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'576',1800,74000,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'577',1800,62600,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'578',1800,62600,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'579',1800,62600,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'580',1800,62600,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'581',1800,74000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'582',1800,62600,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'576',1900,80800,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'577',1900,65300,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'578',1900,65300,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'579',1900,65300,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'580',1900,65300,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'581',1900,73800,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'582',1900,65300,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'583',701,62600,,'',0,7500,,'',0,3500,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'584',701,62600,,'',0,7500,,'',0,3500,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'585',701,81600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',701,81100,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'587',701,62600,,'',0,7500,,'',0,3500,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'588',701,62600,,'',0,7500,,'',0,3500,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'589',701,62600,,'',0,7500,,'',0,3500,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'583',1800,62600,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'584',1800,62600,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'585',1800,74000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'586',1800,74000,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'587',1800,62600,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'588',1800,62600,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'589',1800,62600,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'583',1900,65300,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'584',1900,65300,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'585',1900,73800,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'586',1900,80800,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'587',1900,65300,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'588',1900,65300,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'589',1900,65300,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_228 b/src/main/res-current/raw/current_gtfs_schedule_stop_228
index 689bb6217..04d10e751 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_228
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_228
@@ -1,7 +1,7 @@
-'576',801,63400,,'',0,27400,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8700,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'577',801,61500,,'',0,8500,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'578',801,61500,,'',0,8500,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'579',801,61500,,'',0,8500,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'580',801,61500,,'',0,8500,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'581',801,63400,,'',0,10200,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'582',801,61500,,'',0,8500,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'583',801,61500,,'',0,8500,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'584',801,61500,,'',0,8500,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'585',801,63400,,'',0,10200,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
+'586',801,63400,,'',0,27400,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8700,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'587',801,61500,,'',0,8500,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'588',801,61500,,'',0,8500,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'589',801,61500,,'',0,8500,,'',0,2600,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_229 b/src/main/res-current/raw/current_gtfs_schedule_stop_229
index 398bd1369..4a1a87608 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_229
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_229
@@ -1,5 +1,5 @@
-'577',2700,64700,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'578',2700,64700,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'579',2700,64700,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'580',2700,64700,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'582',2700,64700,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'583',2700,64700,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'584',2700,64700,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'587',2700,64700,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'588',2700,64700,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'589',2700,64700,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_23 b/src/main/res-current/raw/current_gtfs_schedule_stop_23
index 661c9e35d..0121845ea 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_23
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_23
@@ -1,14 +1,14 @@
-'576',701,80200,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'577',701,61700,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
-'578',701,61700,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
-'579',701,61700,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
-'580',701,61700,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
-'581',701,80700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',701,61700,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
-'576',1800,73100,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'577',1800,61700,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
-'578',1800,61700,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
-'579',1800,61700,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
-'580',1800,61700,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
-'581',1800,73100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'582',1800,61700,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
+'583',701,61700,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
+'584',701,61700,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
+'585',701,80700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',701,80200,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'587',701,61700,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
+'588',701,61700,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
+'589',701,61700,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
+'583',1800,61700,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
+'584',1800,61700,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
+'585',1800,73100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'586',1800,73100,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'587',1800,61700,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
+'588',1800,61700,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
+'589',1800,61700,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_230 b/src/main/res-current/raw/current_gtfs_schedule_stop_230
index ec274cc77..fc28640ff 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_230
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_230
@@ -1,7 +1,7 @@
-'576',400,80700,,'',0,20000,,'',0,21500,,'',0,23000,,'',0,20500,,'',0,36000,,'',0,10000,,'',0
-'577',400,65700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
-'578',400,65700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
-'579',400,65700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
-'580',400,65700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
-'581',400,84500,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'582',400,65700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'583',400,65700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'584',400,65700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'585',400,84500,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'586',400,80700,,'',0,20000,,'',0,21500,,'',0,23000,,'',0,20500,,'',0,36000,,'',0,10000,,'',0
+'587',400,65700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'588',400,65700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
+'589',400,65700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_231 b/src/main/res-current/raw/current_gtfs_schedule_stop_231
index cca174f4d..54fad8f77 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_231
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_231
@@ -1,7 +1,7 @@
-'576',200,81000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'577',200,60500,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'578',200,60500,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'579',200,60500,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'580',200,60500,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'581',200,80900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'582',200,60500,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'583',200,60500,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'584',200,60500,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'585',200,80900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
+'586',200,81000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'587',200,60500,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'588',200,60500,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'589',200,60500,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_232 b/src/main/res-current/raw/current_gtfs_schedule_stop_232
index 799c7d225..a0d1a1a8b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_232
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_232
@@ -1,7 +1,7 @@
-'576',1201,90500,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
-'577',1201,70100,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,35800,,'',0,8400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0,25500,,'',0
-'578',1201,70100,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,35800,,'',0,8400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0,25500,,'',0
-'579',1201,70100,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,35800,,'',0,8400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0,25500,,'',0
-'580',1201,70100,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,35800,,'',0,8400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0,25500,,'',0
-'581',1201,93200,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
-'582',1201,70100,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,35800,,'',0,8400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0,25500,,'',0
+'583',1201,70100,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,35800,,'',0,8400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0,25500,,'',0
+'584',1201,70100,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,35800,,'',0,8400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0,25500,,'',0
+'585',1201,93200,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
+'586',1201,90500,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
+'587',1201,70100,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,35800,,'',0,8400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0,25500,,'',0
+'588',1201,70100,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,35800,,'',0,8400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0,25500,,'',0
+'589',1201,70100,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,35800,,'',0,8400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0,25500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_233 b/src/main/res-current/raw/current_gtfs_schedule_stop_233
index dfebe4d0e..679f8ec84 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_233
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_233
@@ -1,5 +1,5 @@
-'577',2700,64600,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'578',2700,64600,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'579',2700,64600,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'580',2700,64600,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'582',2700,64600,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'583',2700,64600,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'584',2700,64600,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'587',2700,64600,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'588',2700,64600,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'589',2700,64600,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_234 b/src/main/res-current/raw/current_gtfs_schedule_stop_234
index 7ac88d251..5dc5d5532 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_234
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_234
@@ -1,7 +1,7 @@
-'576',1200,92500,0,'Orchard Pk',0,7700,0,'Orchard Pk',0,14900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,14800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
-'577',1200,72000,,'',0,8100,,'',0,4000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'578',1200,72000,,'',0,8100,,'',0,4000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'579',1200,72000,,'',0,8100,,'',0,4000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'580',1200,72000,,'',0,8100,,'',0,4000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'581',1200,95200,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,42500,0,'Orchard Pk',0
-'582',1200,72000,,'',0,8100,,'',0,4000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'583',1200,72000,,'',0,8100,,'',0,4000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'584',1200,72000,,'',0,8100,,'',0,4000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'585',1200,95200,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,42500,0,'Orchard Pk',0
+'586',1200,92500,0,'Orchard Pk',0,7700,0,'Orchard Pk',0,14900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,14800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
+'587',1200,72000,,'',0,8100,,'',0,4000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'588',1200,72000,,'',0,8100,,'',0,4000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'589',1200,72000,,'',0,8100,,'',0,4000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_235 b/src/main/res-current/raw/current_gtfs_schedule_stop_235
index b46561a6d..65de05b92 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_235
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_235
@@ -1,7 +1,7 @@
-'576',400,81700,,'',0,20000,,'',0,21500,,'',0,27000,,'',0,20500,,'',0,32000,,'',0,10000,,'',0
-'577',400,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
-'578',400,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
-'579',400,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
-'580',400,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
-'581',400,85500,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'582',400,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
+'583',400,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
+'584',400,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
+'585',400,85500,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'586',400,81700,,'',0,20000,,'',0,21500,,'',0,27000,,'',0,20500,,'',0,32000,,'',0,10000,,'',0
+'587',400,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
+'588',400,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
+'589',400,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_236 b/src/main/res-current/raw/current_gtfs_schedule_stop_236
index 861240728..267669945 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_236
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_236
@@ -1,7 +1,7 @@
-'576',400,82000,,'',0,20000,,'',0,21500,,'',0,27000,,'',0,20500,,'',0,32000,,'',0,10000,,'',0
-'577',400,71000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,19500,,'',0,12900,,'',0
-'578',400,71000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,19500,,'',0,12900,,'',0
-'579',400,71000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,19500,,'',0,12900,,'',0
-'580',400,71000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,19500,,'',0,12900,,'',0
-'581',400,85800,,'',0,20100,,'',0,34100,,'',0,40000,,'',0,15000,,'',0,25000,,'',0
-'582',400,71000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,19500,,'',0,12900,,'',0
+'583',400,71000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,19500,,'',0,12900,,'',0
+'584',400,71000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,19500,,'',0,12900,,'',0
+'585',400,85800,,'',0,20100,,'',0,34100,,'',0,40000,,'',0,15000,,'',0,25000,,'',0
+'586',400,82000,,'',0,20000,,'',0,21500,,'',0,27000,,'',0,20500,,'',0,32000,,'',0,10000,,'',0
+'587',400,71000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,19500,,'',0,12900,,'',0
+'588',400,71000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,19500,,'',0,12900,,'',0
+'589',400,71000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,19500,,'',0,12900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_237 b/src/main/res-current/raw/current_gtfs_schedule_stop_237
index 2083dd3f0..70202b80a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_237
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_237
@@ -1,7 +1,7 @@
-'576',201,75700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'577',201,61600,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'578',201,61600,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'579',201,61600,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'580',201,61600,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'581',201,82200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
-'582',201,61600,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'583',201,61600,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'584',201,61600,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'585',201,82200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
+'586',201,75700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'587',201,61600,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'588',201,61600,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'589',201,61600,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_238 b/src/main/res-current/raw/current_gtfs_schedule_stop_238
index 65006246f..bd879fcad 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_238
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_238
@@ -1,7 +1,7 @@
-'576',800,71300,,'',0,10300,,'',0,9000,,'',0,5200,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8800,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,17000,,'',0
-'577',800,61000,,'',0,2500,,'',0,2300,,'',0,6100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5600,,'',0,1800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
-'578',800,61000,,'',0,2500,,'',0,2300,,'',0,6100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5600,,'',0,1800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
-'579',800,61000,,'',0,2500,,'',0,2300,,'',0,6100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5600,,'',0,1800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
-'580',800,61000,,'',0,2500,,'',0,2300,,'',0,6100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5600,,'',0,1800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
-'581',800,63500,,'',0,7600,,'',0,4500,,'',0,7600,,'',0,7500,,'',0,3000,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'582',800,61000,,'',0,2500,,'',0,2300,,'',0,6100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5600,,'',0,1800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
+'583',800,61000,,'',0,2500,,'',0,2300,,'',0,6100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5600,,'',0,1800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
+'584',800,61000,,'',0,2500,,'',0,2300,,'',0,6100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5600,,'',0,1800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
+'585',800,63500,,'',0,7600,,'',0,4500,,'',0,7600,,'',0,7500,,'',0,3000,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
+'586',800,71300,,'',0,10300,,'',0,9000,,'',0,5200,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8800,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,17000,,'',0
+'587',800,61000,,'',0,2500,,'',0,2300,,'',0,6100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5600,,'',0,1800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
+'588',800,61000,,'',0,2500,,'',0,2300,,'',0,6100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5600,,'',0,1800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
+'589',800,61000,,'',0,2500,,'',0,2300,,'',0,6100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5600,,'',0,1800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_239 b/src/main/res-current/raw/current_gtfs_schedule_stop_239
index a615397bc..c66446ac0 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_239
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_239
@@ -1,7 +1,7 @@
-'576',1001,84900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'577',1001,64600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,2200,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'578',1001,64600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,2200,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'579',1001,64600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,2200,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'580',1001,64600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,2200,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'581',1001,82500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',1001,64600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,2200,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'583',1001,64600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,2200,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'584',1001,64600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,2200,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'585',1001,82500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',1001,84900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'587',1001,64600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,2200,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'588',1001,64600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,2200,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'589',1001,64600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,2200,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_24 b/src/main/res-current/raw/current_gtfs_schedule_stop_24
index 2a7061952..7d6054dcd 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_24
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_24
@@ -1,7 +1,7 @@
-'576',201,74200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',201,60200,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'578',201,60200,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'579',201,60200,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'580',201,60200,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'581',201,80700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10200,,'',0,10000,,'',0,9600,,'',0
-'582',201,60200,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'583',201,60200,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'584',201,60200,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'585',201,80700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10200,,'',0,10000,,'',0,9600,,'',0
+'586',201,74200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',201,60200,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'588',201,60200,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'589',201,60200,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_240 b/src/main/res-current/raw/current_gtfs_schedule_stop_240
index 030fa0fae..7bf63bc2c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_240
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_240
@@ -1,7 +1,7 @@
-'576',400,80300,,'',0,20000,,'',0,21500,,'',0,23000,,'',0,20500,,'',0,36000,,'',0,10000,,'',0
-'577',400,65300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
-'578',400,65300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
-'579',400,65300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
-'580',400,65300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
-'581',400,84100,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'582',400,65300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'583',400,65300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'584',400,65300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'585',400,84100,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'586',400,80300,,'',0,20000,,'',0,21500,,'',0,23000,,'',0,20500,,'',0,36000,,'',0,10000,,'',0
+'587',400,65300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'588',400,65300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'589',400,65300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_241 b/src/main/res-current/raw/current_gtfs_schedule_stop_241
index 47e51015f..ace127ef9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_241
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_241
@@ -1,7 +1,7 @@
-'576',801,63400,,'',0,27400,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,8800,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'577',801,61500,,'',0,8500,,'',0,2500,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'578',801,61500,,'',0,8500,,'',0,2500,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'579',801,61500,,'',0,8500,,'',0,2500,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'580',801,61500,,'',0,8500,,'',0,2500,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'581',801,63400,,'',0,10200,,'',0,8000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
-'582',801,61500,,'',0,8500,,'',0,2500,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'583',801,61500,,'',0,8500,,'',0,2500,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'584',801,61500,,'',0,8500,,'',0,2500,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'585',801,63400,,'',0,10200,,'',0,8000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
+'586',801,63400,,'',0,27400,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,8800,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'587',801,61500,,'',0,8500,,'',0,2500,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'588',801,61500,,'',0,8500,,'',0,2500,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'589',801,61500,,'',0,8500,,'',0,2500,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_242 b/src/main/res-current/raw/current_gtfs_schedule_stop_242
index e407c26c8..956913208 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_242
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_242
@@ -1,12 +1,12 @@
-'577',501,62200,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,59400,,'',0,11900,,'',0,8800,,'',0,7800,,'',0,9000,,'',0,10000,,'',0,12500,,'',0,19500,,'',0,10000,,'',0,18700,,'',0
-'578',501,62200,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,59400,,'',0,11900,,'',0,8800,,'',0,7800,,'',0,9000,,'',0,10000,,'',0,12500,,'',0,19500,,'',0,10000,,'',0,18700,,'',0
-'579',501,62200,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,59400,,'',0,11900,,'',0,8800,,'',0,7800,,'',0,9000,,'',0,10000,,'',0,12500,,'',0,19500,,'',0,10000,,'',0,18700,,'',0
-'580',501,62200,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,59400,,'',0,11900,,'',0,8800,,'',0,7800,,'',0,9000,,'',0,10000,,'',0,12500,,'',0,19500,,'',0,10000,,'',0,18700,,'',0
-'582',501,62200,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,59400,,'',0,11900,,'',0,8800,,'',0,7800,,'',0,9000,,'',0,10000,,'',0,12500,,'',0,19500,,'',0,10000,,'',0,18700,,'',0
-'576',1000,80500,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
-'577',1000,60600,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2300,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'578',1000,60600,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2300,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'579',1000,60600,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2300,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'580',1000,60600,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2300,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'581',1000,80200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'582',1000,60600,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2300,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'583',501,62200,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,59400,,'',0,11900,,'',0,8800,,'',0,7800,,'',0,9000,,'',0,10000,,'',0,12500,,'',0,19500,,'',0,10000,,'',0,18700,,'',0
+'584',501,62200,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,59400,,'',0,11900,,'',0,8800,,'',0,7800,,'',0,9000,,'',0,10000,,'',0,12500,,'',0,19500,,'',0,10000,,'',0,18700,,'',0
+'587',501,62200,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,59400,,'',0,11900,,'',0,8800,,'',0,7800,,'',0,9000,,'',0,10000,,'',0,12500,,'',0,19500,,'',0,10000,,'',0,18700,,'',0
+'588',501,62200,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,59400,,'',0,11900,,'',0,8800,,'',0,7800,,'',0,9000,,'',0,10000,,'',0,12500,,'',0,19500,,'',0,10000,,'',0,18700,,'',0
+'589',501,62200,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,59400,,'',0,11900,,'',0,8800,,'',0,7800,,'',0,9000,,'',0,10000,,'',0,12500,,'',0,19500,,'',0,10000,,'',0,18700,,'',0
+'583',1000,60600,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2300,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'584',1000,60600,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2300,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'585',1000,80200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'586',1000,80500,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
+'587',1000,60600,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2300,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'588',1000,60600,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2300,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'589',1000,60600,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2300,,'',0,8100,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_243 b/src/main/res-current/raw/current_gtfs_schedule_stop_243
index 812ee6457..31aaddd17 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_243
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_243
@@ -1,12 +1,12 @@
-'577',500,65800,,'',0,7800,,'',0,9800,,'',0,9400,,'',0,60500,,'',0,1500,,'',0,7700,,'',0,9000,,'',0,4000,,'',0
-'578',500,65800,,'',0,7800,,'',0,9800,,'',0,9400,,'',0,60500,,'',0,1500,,'',0,7700,,'',0,9000,,'',0,4000,,'',0
-'579',500,65800,,'',0,7800,,'',0,9800,,'',0,9400,,'',0,60500,,'',0,1500,,'',0,7700,,'',0,9000,,'',0,4000,,'',0
-'580',500,65800,,'',0,7800,,'',0,9800,,'',0,9400,,'',0,60500,,'',0,1500,,'',0,7700,,'',0,9000,,'',0,4000,,'',0
-'582',500,65800,,'',0,7800,,'',0,9800,,'',0,9400,,'',0,60500,,'',0,1500,,'',0,7700,,'',0,9000,,'',0,4000,,'',0
-'576',1001,85000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'577',1001,64600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'578',1001,64600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'579',1001,64600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'580',1001,64600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'581',1001,82600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',1001,64600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'583',500,65800,,'',0,7800,,'',0,9800,,'',0,9400,,'',0,60500,,'',0,1500,,'',0,7700,,'',0,9000,,'',0,4000,,'',0
+'584',500,65800,,'',0,7800,,'',0,9800,,'',0,9400,,'',0,60500,,'',0,1500,,'',0,7700,,'',0,9000,,'',0,4000,,'',0
+'587',500,65800,,'',0,7800,,'',0,9800,,'',0,9400,,'',0,60500,,'',0,1500,,'',0,7700,,'',0,9000,,'',0,4000,,'',0
+'588',500,65800,,'',0,7800,,'',0,9800,,'',0,9400,,'',0,60500,,'',0,1500,,'',0,7700,,'',0,9000,,'',0,4000,,'',0
+'589',500,65800,,'',0,7800,,'',0,9800,,'',0,9400,,'',0,60500,,'',0,1500,,'',0,7700,,'',0,9000,,'',0,4000,,'',0
+'583',1001,64600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'584',1001,64600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'585',1001,82600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',1001,85000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'587',1001,64600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'588',1001,64600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'589',1001,64600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_244 b/src/main/res-current/raw/current_gtfs_schedule_stop_244
index b46561a6d..65de05b92 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_244
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_244
@@ -1,7 +1,7 @@
-'576',400,81700,,'',0,20000,,'',0,21500,,'',0,27000,,'',0,20500,,'',0,32000,,'',0,10000,,'',0
-'577',400,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
-'578',400,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
-'579',400,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
-'580',400,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
-'581',400,85500,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'582',400,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
+'583',400,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
+'584',400,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
+'585',400,85500,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'586',400,81700,,'',0,20000,,'',0,21500,,'',0,27000,,'',0,20500,,'',0,32000,,'',0,10000,,'',0
+'587',400,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
+'588',400,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
+'589',400,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_245 b/src/main/res-current/raw/current_gtfs_schedule_stop_245
index c91dfcf65..c23d94d2d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_245
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_245
@@ -1,7 +1,7 @@
-'576',400,80600,,'',0,20000,,'',0,21500,,'',0,23000,,'',0,20500,,'',0,36000,,'',0,10000,,'',0
-'577',400,65600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
-'578',400,65600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
-'579',400,65600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
-'580',400,65600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
-'581',400,84400,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'582',400,65600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'583',400,65600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'584',400,65600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'585',400,84400,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'586',400,80600,,'',0,20000,,'',0,21500,,'',0,23000,,'',0,20500,,'',0,36000,,'',0,10000,,'',0
+'587',400,65600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'588',400,65600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'589',400,65600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_246 b/src/main/res-current/raw/current_gtfs_schedule_stop_246
index 328665dcd..867d71525 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_246
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_246
@@ -1,12 +1,12 @@
-'576',1100,80800,,'',0,4400,0,'Orchard Pk',0,14800,,'',0,10000,,'',0,1600,0,'Orchard Pk',0,8400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,4600,0,'Orchard Pk',0,5400,,'',0,10000,,'',0,10000,,'',0,1100,0,'Orchard Pk',0,8900,,'',0,10000,,'',0,3600,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,12000,0,'Orchard Pk',0
-'577',1100,65200,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'578',1100,65200,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'579',1100,65200,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'580',1100,65200,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'581',1100,75500,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,4800,0,'Orchard Pk',0,2200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'582',1100,65200,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'577',1400,122400,,'',0,73500,,'',0
-'578',1400,122400,,'',0,73500,,'',0
-'579',1400,122400,,'',0,73500,,'',0
-'580',1400,122400,,'',0,73500,,'',0
-'582',1400,122400,,'',0,73500,,'',0
+'583',1100,65200,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'584',1100,65200,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'585',1100,75500,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,4800,0,'Orchard Pk',0,2200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'586',1100,80800,,'',0,4400,0,'Orchard Pk',0,14800,,'',0,10000,,'',0,1600,0,'Orchard Pk',0,8400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,4600,0,'Orchard Pk',0,5400,,'',0,10000,,'',0,10000,,'',0,1100,0,'Orchard Pk',0,8900,,'',0,10000,,'',0,3600,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,12000,0,'Orchard Pk',0
+'587',1100,65200,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'588',1100,65200,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'589',1100,65200,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'583',1400,122400,,'',0,73500,,'',0
+'584',1400,122400,,'',0,73500,,'',0
+'587',1400,122400,,'',0,73500,,'',0
+'588',1400,122400,,'',0,73500,,'',0
+'589',1400,122400,,'',0,73500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_247 b/src/main/res-current/raw/current_gtfs_schedule_stop_247
index 6eecef80d..f68e7803f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_247
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_247
@@ -1,21 +1,21 @@
-'576',700,84900,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'577',700,65900,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
-'578',700,65900,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
-'579',700,65900,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
-'580',700,65900,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
-'581',700,81200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',700,65900,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
-'576',1801,81500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'577',1801,63200,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
-'578',1801,63200,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
-'579',1801,63200,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
-'580',1801,63200,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
-'581',1801,74600,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'582',1801,63200,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
-'576',1901,74700,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'577',1901,70200,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'578',1901,70200,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'579',1901,70200,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'580',1901,70200,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'581',1901,74600,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'582',1901,70200,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'583',700,65900,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
+'584',700,65900,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
+'585',700,81200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',700,84900,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
+'587',700,65900,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
+'588',700,65900,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
+'589',700,65900,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
+'583',1801,63200,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
+'584',1801,63200,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
+'585',1801,74600,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'586',1801,81500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'587',1801,63200,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
+'588',1801,63200,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
+'589',1801,63200,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
+'583',1901,70200,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'584',1901,70200,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'585',1901,74600,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'586',1901,74700,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'587',1901,70200,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'588',1901,70200,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'589',1901,70200,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_248 b/src/main/res-current/raw/current_gtfs_schedule_stop_248
index 4ecfc5595..b329ff4c5 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_248
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_248
@@ -1,7 +1,7 @@
-'576',1800,74200,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'577',1800,62800,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'578',1800,62800,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'579',1800,62800,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'580',1800,62800,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'581',1800,74200,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8300,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'582',1800,62800,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'583',1800,62800,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'584',1800,62800,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'585',1800,74200,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8300,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'586',1800,74200,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'587',1800,62800,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'588',1800,62800,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'589',1800,62800,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_249 b/src/main/res-current/raw/current_gtfs_schedule_stop_249
index 03dab50a0..54922e197 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_249
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_249
@@ -1,7 +1,7 @@
-'576',200,80900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',200,60400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'578',200,60400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'579',200,60400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'580',200,60400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'581',200,80800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9400,,'',0,10200,,'',0,10100,,'',0
-'582',200,60400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'583',200,60400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'584',200,60400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'585',200,80800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9400,,'',0,10200,,'',0,10100,,'',0
+'586',200,80900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',200,60400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'588',200,60400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'589',200,60400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_25 b/src/main/res-current/raw/current_gtfs_schedule_stop_25
index 8d0bef65e..6c8afcaa1 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_25
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_25
@@ -1,7 +1,7 @@
-'576',900,122000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',900,93700,,'',0,31200,,'',0,28800,,'',0
-'578',900,93700,,'',0,31200,,'',0,28800,,'',0
-'579',900,93700,,'',0,31200,,'',0,28800,,'',0
-'580',900,93700,,'',0,31200,,'',0,28800,,'',0
-'581',900,122000,,'',0,8500,,'',0,20500,,'',0,4500,,'',0
-'582',900,93700,,'',0,31200,,'',0,28800,,'',0
+'583',900,93700,,'',0,31200,,'',0,28800,,'',0
+'584',900,93700,,'',0,31200,,'',0,28800,,'',0
+'585',900,122000,,'',0,8500,,'',0,20500,,'',0,4500,,'',0
+'586',900,122000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',900,93700,,'',0,31200,,'',0,28800,,'',0
+'588',900,93700,,'',0,31200,,'',0,28800,,'',0
+'589',900,93700,,'',0,31200,,'',0,28800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_250 b/src/main/res-current/raw/current_gtfs_schedule_stop_250
index 5021bb6f1..53a04ee8f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_250
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_250
@@ -1,7 +1,7 @@
-'576',2000,81800,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'577',2000,62700,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'578',2000,62700,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'579',2000,62700,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'580',2000,62700,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'581',2000,64900,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'582',2000,62700,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'583',2000,62700,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'584',2000,62700,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'585',2000,64900,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
+'586',2000,81800,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'587',2000,62700,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'588',2000,62700,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'589',2000,62700,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_251 b/src/main/res-current/raw/current_gtfs_schedule_stop_251
index 9a042b73f..9ad4cc94a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_251
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_251
@@ -1,7 +1,7 @@
-'576',2001,75800,,'',0,14300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'577',2001,64000,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'578',2001,64000,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'579',2001,64000,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'580',2001,64000,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'581',2001,80400,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,14600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'582',2001,64000,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'583',2001,64000,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'584',2001,64000,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'585',2001,80400,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,14600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'586',2001,75800,,'',0,14300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'587',2001,64000,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'588',2001,64000,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'589',2001,64000,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_252 b/src/main/res-current/raw/current_gtfs_schedule_stop_252
index 9943996d1..61ead99e2 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_252
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_252
@@ -1,14 +1,14 @@
-'576',701,81200,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'577',701,62700,,'',0,7500,,'',0,3500,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'578',701,62700,,'',0,7500,,'',0,3500,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'579',701,62700,,'',0,7500,,'',0,3500,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'580',701,62700,,'',0,7500,,'',0,3500,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'581',701,81700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',701,62700,,'',0,7500,,'',0,3500,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'576',1800,74100,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'577',1800,62700,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'578',1800,62700,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'579',1800,62700,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'580',1800,62700,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'581',1800,74100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'582',1800,62700,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'583',701,62700,,'',0,7500,,'',0,3500,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'584',701,62700,,'',0,7500,,'',0,3500,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'585',701,81700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',701,81200,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'587',701,62700,,'',0,7500,,'',0,3500,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'588',701,62700,,'',0,7500,,'',0,3500,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'589',701,62700,,'',0,7500,,'',0,3500,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'583',1800,62700,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'584',1800,62700,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'585',1800,74100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'586',1800,74100,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'587',1800,62700,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'588',1800,62700,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'589',1800,62700,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_253 b/src/main/res-current/raw/current_gtfs_schedule_stop_253
index 16d3e89b3..dd50a8192 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_253
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_253
@@ -1,12 +1,12 @@
-'576',1101,75800,0,'Black Mtn',0,16600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
-'577',1101,70200,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'578',1101,70200,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'579',1101,70200,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'580',1101,70200,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'581',1101,81900,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'582',1101,70200,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'577',1401,113700,,'',0,78000,,'',0
-'578',1401,113700,,'',0,78000,,'',0
-'579',1401,113700,,'',0,78000,,'',0
-'580',1401,113700,,'',0,78000,,'',0
-'582',1401,113700,,'',0,78000,,'',0
+'583',1101,70200,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'584',1101,70200,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'585',1101,81900,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'586',1101,75800,0,'Black Mtn',0,16600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
+'587',1101,70200,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'588',1101,70200,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'589',1101,70200,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'583',1401,113700,,'',0,78000,,'',0
+'584',1401,113700,,'',0,78000,,'',0
+'587',1401,113700,,'',0,78000,,'',0
+'588',1401,113700,,'',0,78000,,'',0
+'589',1401,113700,,'',0,78000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_254 b/src/main/res-current/raw/current_gtfs_schedule_stop_254
index b97b2e0cd..b6f8ffd06 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_254
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_254
@@ -1,7 +1,7 @@
-'576',201,75800,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'577',201,61600,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'578',201,61600,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'579',201,61600,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'580',201,61600,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'581',201,82300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
-'582',201,61600,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'583',201,61600,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'584',201,61600,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'585',201,82300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
+'586',201,75800,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'587',201,61600,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'588',201,61600,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'589',201,61600,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_255 b/src/main/res-current/raw/current_gtfs_schedule_stop_255
index 882b265f2..739c63556 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_255
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_255
@@ -1,7 +1,7 @@
-'576',1900,80900,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'577',1900,65500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'578',1900,65500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'579',1900,65500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'580',1900,65500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'581',1900,73900,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'582',1900,65500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'583',1900,65500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'584',1900,65500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'585',1900,73900,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'586',1900,80900,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'587',1900,65500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'588',1900,65500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'589',1900,65500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_256 b/src/main/res-current/raw/current_gtfs_schedule_stop_256
index f858eac10..fe87dd7ca 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_256
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_256
@@ -1,12 +1,12 @@
-'577',501,62100,,'',0,3800,,'',0,8700,,'',0,8500,,'',0,59400,,'',0,11900,,'',0,8800,,'',0,7800,,'',0,9000,,'',0,10000,,'',0,12500,,'',0,19500,,'',0,10000,,'',0,18700,,'',0
-'578',501,62100,,'',0,3800,,'',0,8700,,'',0,8500,,'',0,59400,,'',0,11900,,'',0,8800,,'',0,7800,,'',0,9000,,'',0,10000,,'',0,12500,,'',0,19500,,'',0,10000,,'',0,18700,,'',0
-'579',501,62100,,'',0,3800,,'',0,8700,,'',0,8500,,'',0,59400,,'',0,11900,,'',0,8800,,'',0,7800,,'',0,9000,,'',0,10000,,'',0,12500,,'',0,19500,,'',0,10000,,'',0,18700,,'',0
-'580',501,62100,,'',0,3800,,'',0,8700,,'',0,8500,,'',0,59400,,'',0,11900,,'',0,8800,,'',0,7800,,'',0,9000,,'',0,10000,,'',0,12500,,'',0,19500,,'',0,10000,,'',0,18700,,'',0
-'582',501,62100,,'',0,3800,,'',0,8700,,'',0,8500,,'',0,59400,,'',0,11900,,'',0,8800,,'',0,7800,,'',0,9000,,'',0,10000,,'',0,12500,,'',0,19500,,'',0,10000,,'',0,18700,,'',0
-'576',1000,80400,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
-'577',1000,60500,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'578',1000,60500,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'579',1000,60500,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'580',1000,60500,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'581',1000,80100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'582',1000,60500,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'583',501,62100,,'',0,3800,,'',0,8700,,'',0,8500,,'',0,59400,,'',0,11900,,'',0,8800,,'',0,7800,,'',0,9000,,'',0,10000,,'',0,12500,,'',0,19500,,'',0,10000,,'',0,18700,,'',0
+'584',501,62100,,'',0,3800,,'',0,8700,,'',0,8500,,'',0,59400,,'',0,11900,,'',0,8800,,'',0,7800,,'',0,9000,,'',0,10000,,'',0,12500,,'',0,19500,,'',0,10000,,'',0,18700,,'',0
+'587',501,62100,,'',0,3800,,'',0,8700,,'',0,8500,,'',0,59400,,'',0,11900,,'',0,8800,,'',0,7800,,'',0,9000,,'',0,10000,,'',0,12500,,'',0,19500,,'',0,10000,,'',0,18700,,'',0
+'588',501,62100,,'',0,3800,,'',0,8700,,'',0,8500,,'',0,59400,,'',0,11900,,'',0,8800,,'',0,7800,,'',0,9000,,'',0,10000,,'',0,12500,,'',0,19500,,'',0,10000,,'',0,18700,,'',0
+'589',501,62100,,'',0,3800,,'',0,8700,,'',0,8500,,'',0,59400,,'',0,11900,,'',0,8800,,'',0,7800,,'',0,9000,,'',0,10000,,'',0,12500,,'',0,19500,,'',0,10000,,'',0,18700,,'',0
+'583',1000,60500,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'584',1000,60500,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'585',1000,80100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'586',1000,80400,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
+'587',1000,60500,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'588',1000,60500,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'589',1000,60500,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_257 b/src/main/res-current/raw/current_gtfs_schedule_stop_257
index 2e842ca6e..8d898dedd 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_257
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_257
@@ -1,7 +1,7 @@
-'576',801,63200,,'',0,27400,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,8700,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'577',801,61300,,'',0,4500,,'',0,6600,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'578',801,61300,,'',0,4500,,'',0,6600,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'579',801,61300,,'',0,4500,,'',0,6600,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'580',801,61300,,'',0,4500,,'',0,6600,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'581',801,63200,,'',0,10200,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
-'582',801,61300,,'',0,4500,,'',0,6600,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'583',801,61300,,'',0,4500,,'',0,6600,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'584',801,61300,,'',0,4500,,'',0,6600,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'585',801,63200,,'',0,10200,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
+'586',801,63200,,'',0,27400,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,8700,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'587',801,61300,,'',0,4500,,'',0,6600,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'588',801,61300,,'',0,4500,,'',0,6600,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'589',801,61300,,'',0,4500,,'',0,6600,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_258 b/src/main/res-current/raw/current_gtfs_schedule_stop_258
index c91dfcf65..c23d94d2d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_258
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_258
@@ -1,7 +1,7 @@
-'576',400,80600,,'',0,20000,,'',0,21500,,'',0,23000,,'',0,20500,,'',0,36000,,'',0,10000,,'',0
-'577',400,65600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
-'578',400,65600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
-'579',400,65600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
-'580',400,65600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
-'581',400,84400,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'582',400,65600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'583',400,65600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'584',400,65600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'585',400,84400,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'586',400,80600,,'',0,20000,,'',0,21500,,'',0,23000,,'',0,20500,,'',0,36000,,'',0,10000,,'',0
+'587',400,65600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'588',400,65600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'589',400,65600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_259 b/src/main/res-current/raw/current_gtfs_schedule_stop_259
index 012823453..9af11af2d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_259
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_259
@@ -1,7 +1,7 @@
-'576',800,71400,,'',0,10300,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,17000,,'',0
-'577',800,61100,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
-'578',800,61100,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
-'579',800,61100,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
-'580',800,61100,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
-'581',800,63600,,'',0,7600,,'',0,4600,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'582',800,61100,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
+'583',800,61100,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
+'584',800,61100,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
+'585',800,63600,,'',0,7600,,'',0,4600,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
+'586',800,71400,,'',0,10300,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,17000,,'',0
+'587',800,61100,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
+'588',800,61100,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
+'589',800,61100,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_25960 b/src/main/res-current/raw/current_gtfs_schedule_stop_25960
index 29dfa2a3e..375b6e525 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_25960
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_25960
@@ -1,12 +1,12 @@
-'577',1300,71600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'578',1300,71600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'579',1300,71600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'580',1300,71600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'582',1300,71600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'576',2300,75600,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,16500,,'',0,5800,,'',0
-'577',2300,55100,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,2100,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,10200,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
-'578',2300,55100,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,2100,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,10200,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
-'579',2300,55100,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,2100,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,10200,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
-'580',2300,55100,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,2100,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,10200,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
-'581',2300,70000,,'',0,3300,,'',0,2600,,'',0,7100,,'',0,2700,,'',0,6900,,'',0,3200,,'',0,6700,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,10000,,'',0,7600,,'',0,3100,,'',0,7300,,'',0,2400,,'',0,7200,,'',0,3000,,'',0,10600,,'',0,9100,,'',0,10100,,'',0,15500,,'',0,10800,,'',0,11000,,'',0
-'582',2300,55100,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,2100,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,10200,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
+'583',1300,71600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'584',1300,71600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'587',1300,71600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'588',1300,71600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'589',1300,71600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'583',2300,55100,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,2100,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,10200,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
+'584',2300,55100,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,2100,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,10200,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
+'585',2300,70000,,'',0,3300,,'',0,2600,,'',0,7100,,'',0,2700,,'',0,6900,,'',0,3200,,'',0,6700,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,10000,,'',0,7600,,'',0,3100,,'',0,7300,,'',0,2400,,'',0,7200,,'',0,3000,,'',0,10600,,'',0,9100,,'',0,10100,,'',0,15500,,'',0,10800,,'',0,11000,,'',0
+'586',2300,75600,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,16500,,'',0,5800,,'',0
+'587',2300,55100,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,2100,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,10200,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
+'588',2300,55100,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,2100,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,10200,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
+'589',2300,55100,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,2100,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,10200,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_25961 b/src/main/res-current/raw/current_gtfs_schedule_stop_25961
index 06201ddfb..f8c64a3bd 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_25961
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_25961
@@ -1,12 +1,12 @@
-'577',1301,73100,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,43500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0
-'578',1301,73100,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,43500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0
-'579',1301,73100,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,43500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0
-'580',1301,73100,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,43500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0
-'582',1301,73100,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,43500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0
-'576',2301,84100,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
-'577',2301,60300,,'',0,3700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'578',2301,60300,,'',0,3700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'579',2301,60300,,'',0,3700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'580',2301,60300,,'',0,3700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'581',2301,74600,,'',0,7100,,'',0,3200,,'',0,6600,,'',0,3300,,'',0,10100,,'',0,6100,,'',0,2800,,'',0,6200,,'',0,2700,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,8000,,'',0,2000,,'',0,7900,,'',0,3400,,'',0,6700,,'',0,2900,,'',0,6600,,'',0,3400,,'',0,10100,,'',0,9300,,'',0,10200,,'',0,11200,,'',0,10800,,'',0,15000,,'',0
-'582',2301,60300,,'',0,3700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'583',1301,73100,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,43500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0
+'584',1301,73100,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,43500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0
+'587',1301,73100,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,43500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0
+'588',1301,73100,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,43500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0
+'589',1301,73100,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,43500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0
+'583',2301,60300,,'',0,3700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'584',2301,60300,,'',0,3700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'585',2301,74600,,'',0,7100,,'',0,3200,,'',0,6600,,'',0,3300,,'',0,10100,,'',0,6100,,'',0,2800,,'',0,6200,,'',0,2700,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,8000,,'',0,2000,,'',0,7900,,'',0,3400,,'',0,6700,,'',0,2900,,'',0,6600,,'',0,3400,,'',0,10100,,'',0,9300,,'',0,10200,,'',0,11200,,'',0,10800,,'',0,15000,,'',0
+'586',2301,84100,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
+'587',2301,60300,,'',0,3700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'588',2301,60300,,'',0,3700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'589',2301,60300,,'',0,3700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_26 b/src/main/res-current/raw/current_gtfs_schedule_stop_26
index 493b0efcc..abd2efb97 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_26
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_26
@@ -1,7 +1,7 @@
-'576',200,82400,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,9900,,'',0
-'577',200,61900,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'578',200,61900,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'579',200,61900,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'580',200,61900,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'581',200,82300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'582',200,61900,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'583',200,61900,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'584',200,61900,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'585',200,82300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
+'586',200,82400,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,9900,,'',0
+'587',200,61900,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'588',200,61900,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'589',200,61900,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_260 b/src/main/res-current/raw/current_gtfs_schedule_stop_260
index f7e8f0d8d..fe6121b97 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_260
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_260
@@ -1,7 +1,7 @@
-'576',400,81900,,'',0,20000,,'',0,21500,,'',0,27000,,'',0,20500,,'',0,32000,,'',0,10000,,'',0
-'577',400,70900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
-'578',400,70900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
-'579',400,70900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
-'580',400,70900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
-'581',400,85700,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'582',400,70900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
+'583',400,70900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
+'584',400,70900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
+'585',400,85700,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'586',400,81900,,'',0,20000,,'',0,21500,,'',0,27000,,'',0,20500,,'',0,32000,,'',0,10000,,'',0
+'587',400,70900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
+'588',400,70900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
+'589',400,70900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_261 b/src/main/res-current/raw/current_gtfs_schedule_stop_261
index 4c2bc3acd..92a144203 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_261
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_261
@@ -1,7 +1,7 @@
-'576',1200,92400,0,'Orchard Pk',0,7700,0,'Orchard Pk',0,14900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,14800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
-'577',1200,71900,,'',0,8100,,'',0,4000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'578',1200,71900,,'',0,8100,,'',0,4000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'579',1200,71900,,'',0,8100,,'',0,4000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'580',1200,71900,,'',0,8100,,'',0,4000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'581',1200,95100,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,42500,0,'Orchard Pk',0
-'582',1200,71900,,'',0,8100,,'',0,4000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'583',1200,71900,,'',0,8100,,'',0,4000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'584',1200,71900,,'',0,8100,,'',0,4000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'585',1200,95100,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,42500,0,'Orchard Pk',0
+'586',1200,92400,0,'Orchard Pk',0,7700,0,'Orchard Pk',0,14900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,14800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
+'587',1200,71900,,'',0,8100,,'',0,4000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'588',1200,71900,,'',0,8100,,'',0,4000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'589',1200,71900,,'',0,8100,,'',0,4000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_262 b/src/main/res-current/raw/current_gtfs_schedule_stop_262
index 729fc2077..42e57469f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_262
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_262
@@ -1,7 +1,7 @@
-'576',400,80400,,'',0,20000,,'',0,21500,,'',0,23000,,'',0,20500,,'',0,36000,,'',0,10000,,'',0
-'577',400,65400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
-'578',400,65400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
-'579',400,65400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
-'580',400,65400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
-'581',400,84200,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'582',400,65400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'583',400,65400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'584',400,65400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'585',400,84200,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'586',400,80400,,'',0,20000,,'',0,21500,,'',0,23000,,'',0,20500,,'',0,36000,,'',0,10000,,'',0
+'587',400,65400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'588',400,65400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'589',400,65400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_263 b/src/main/res-current/raw/current_gtfs_schedule_stop_263
index acfff8405..0263c68b8 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_263
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_263
@@ -1,7 +1,7 @@
-'576',400,81800,,'',0,20000,,'',0,21500,,'',0,27000,,'',0,20500,,'',0,32000,,'',0,10000,,'',0
-'577',400,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
-'578',400,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
-'579',400,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
-'580',400,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
-'581',400,85600,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'582',400,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
+'583',400,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
+'584',400,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
+'585',400,85600,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'586',400,81800,,'',0,20000,,'',0,21500,,'',0,27000,,'',0,20500,,'',0,32000,,'',0,10000,,'',0
+'587',400,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
+'588',400,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
+'589',400,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_264 b/src/main/res-current/raw/current_gtfs_schedule_stop_264
index 52869c470..469caed11 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_264
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_264
@@ -1,7 +1,7 @@
-'576',1201,90600,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
-'577',1201,70200,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,39800,,'',0,4400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0,25500,,'',0
-'578',1201,70200,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,39800,,'',0,4400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0,25500,,'',0
-'579',1201,70200,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,39800,,'',0,4400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0,25500,,'',0
-'580',1201,70200,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,39800,,'',0,4400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0,25500,,'',0
-'581',1201,93300,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
-'582',1201,70200,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,39800,,'',0,4400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0,25500,,'',0
+'583',1201,70200,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,39800,,'',0,4400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0,25500,,'',0
+'584',1201,70200,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,39800,,'',0,4400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0,25500,,'',0
+'585',1201,93300,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
+'586',1201,90600,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
+'587',1201,70200,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,39800,,'',0,4400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0,25500,,'',0
+'588',1201,70200,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,39800,,'',0,4400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0,25500,,'',0
+'589',1201,70200,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,39800,,'',0,4400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0,25500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_265 b/src/main/res-current/raw/current_gtfs_schedule_stop_265
index a99ed36b4..06b3bb4e7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_265
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_265
@@ -1,7 +1,7 @@
-'576',200,80900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'577',200,60400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'578',200,60400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'579',200,60400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'580',200,60400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'581',200,80800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'582',200,60400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'583',200,60400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'584',200,60400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'585',200,80800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
+'586',200,80900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'587',200,60400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'588',200,60400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'589',200,60400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_266 b/src/main/res-current/raw/current_gtfs_schedule_stop_266
index f3ea0c44c..752fcbb2f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_266
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_266
@@ -1,7 +1,7 @@
-'576',201,75900,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',201,61700,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'578',201,61700,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'579',201,61700,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'580',201,61700,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'581',201,82400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,9600,,'',0
-'582',201,61700,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'583',201,61700,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'584',201,61700,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'585',201,82400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,9600,,'',0
+'586',201,75900,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',201,61700,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'588',201,61700,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'589',201,61700,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_267 b/src/main/res-current/raw/current_gtfs_schedule_stop_267
index 390647ccf..42f5ee7e7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_267
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_267
@@ -1,7 +1,7 @@
-'576',1400,82700,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
-'577',1400,65200,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
-'578',1400,65200,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
-'579',1400,65200,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
-'580',1400,65200,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
-'581',1400,80500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
-'582',1400,65200,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'583',1400,65200,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'584',1400,65200,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'585',1400,80500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
+'586',1400,82700,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
+'587',1400,65200,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'588',1400,65200,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'589',1400,65200,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_268 b/src/main/res-current/raw/current_gtfs_schedule_stop_268
index 001ab6d8a..6f3427f33 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_268
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_268
@@ -1,21 +1,21 @@
-'576',700,84900,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'577',700,65900,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
-'578',700,65900,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
-'579',700,65900,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
-'580',700,65900,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
-'581',700,81200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',700,65900,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
-'576',1801,81500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'577',1801,63200,,'',0,7500,,'',0,2700,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
-'578',1801,63200,,'',0,7500,,'',0,2700,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
-'579',1801,63200,,'',0,7500,,'',0,2700,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
-'580',1801,63200,,'',0,7500,,'',0,2700,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
-'581',1801,74600,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'582',1801,63200,,'',0,7500,,'',0,2700,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
-'576',1901,74600,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'577',1901,70100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'578',1901,70100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'579',1901,70100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'580',1901,70100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'581',1901,74500,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'582',1901,70100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'583',700,65900,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
+'584',700,65900,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
+'585',700,81200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',700,84900,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
+'587',700,65900,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
+'588',700,65900,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
+'589',700,65900,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
+'583',1801,63200,,'',0,7500,,'',0,2700,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
+'584',1801,63200,,'',0,7500,,'',0,2700,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
+'585',1801,74600,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'586',1801,81500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'587',1801,63200,,'',0,7500,,'',0,2700,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
+'588',1801,63200,,'',0,7500,,'',0,2700,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
+'589',1801,63200,,'',0,7500,,'',0,2700,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
+'583',1901,70100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'584',1901,70100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'585',1901,74500,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'586',1901,74600,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'587',1901,70100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'588',1901,70100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'589',1901,70100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_26870 b/src/main/res-current/raw/current_gtfs_schedule_stop_26870
index 9ecca027a..e1d4f6d48 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_26870
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_26870
@@ -1,7 +1,7 @@
-'576',1200,92600,0,'Orchard Pk',0,7700,0,'Orchard Pk',0,14900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,14800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
-'577',1200,72000,,'',0,8100,,'',0,4000,,'',0,28100,0,'Orchard Pk',0,39700,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'578',1200,72000,,'',0,8100,,'',0,4000,,'',0,28100,0,'Orchard Pk',0,39700,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'579',1200,72000,,'',0,8100,,'',0,4000,,'',0,28100,0,'Orchard Pk',0,39700,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'580',1200,72000,,'',0,8100,,'',0,4000,,'',0,28100,0,'Orchard Pk',0,39700,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'581',1200,95300,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,42500,0,'Orchard Pk',0
-'582',1200,72000,,'',0,8100,,'',0,4000,,'',0,28100,0,'Orchard Pk',0,39700,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'583',1200,72000,,'',0,8100,,'',0,4000,,'',0,28100,0,'Orchard Pk',0,39700,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'584',1200,72000,,'',0,8100,,'',0,4000,,'',0,28100,0,'Orchard Pk',0,39700,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'585',1200,95300,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,42500,0,'Orchard Pk',0
+'586',1200,92600,0,'Orchard Pk',0,7700,0,'Orchard Pk',0,14900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,14800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
+'587',1200,72000,,'',0,8100,,'',0,4000,,'',0,28100,0,'Orchard Pk',0,39700,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'588',1200,72000,,'',0,8100,,'',0,4000,,'',0,28100,0,'Orchard Pk',0,39700,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'589',1200,72000,,'',0,8100,,'',0,4000,,'',0,28100,0,'Orchard Pk',0,39700,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_27 b/src/main/res-current/raw/current_gtfs_schedule_stop_27
index 288eae70d..d26dd4946 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_27
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_27
@@ -1,7 +1,7 @@
-'576',901,114800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',901,90300,,'',0,22000,,'',0,38000,,'',0
-'578',901,90300,,'',0,22000,,'',0,38000,,'',0
-'579',901,90300,,'',0,22000,,'',0,38000,,'',0
-'580',901,90300,,'',0,22000,,'',0,38000,,'',0
-'581',901,114800,,'',0,8500,,'',0,29000,,'',0,8500,,'',0
-'582',901,90300,,'',0,22000,,'',0,38000,,'',0
+'583',901,90300,,'',0,22000,,'',0,38000,,'',0
+'584',901,90300,,'',0,22000,,'',0,38000,,'',0
+'585',901,114800,,'',0,8500,,'',0,29000,,'',0,8500,,'',0
+'586',901,114800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',901,90300,,'',0,22000,,'',0,38000,,'',0
+'588',901,90300,,'',0,22000,,'',0,38000,,'',0
+'589',901,90300,,'',0,22000,,'',0,38000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_270 b/src/main/res-current/raw/current_gtfs_schedule_stop_270
index 174d272c5..03c88b447 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_270
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_270
@@ -1,12 +1,12 @@
-'576',1100,80700,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,4100,0,'Orchard Pk',0,5900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'577',1100,65100,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'578',1100,65100,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'579',1100,65100,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'580',1100,65100,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'581',1100,75400,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,4800,0,'Orchard Pk',0,2200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'582',1100,65100,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'577',1400,122300,,'',0,73500,,'',0
-'578',1400,122300,,'',0,73500,,'',0
-'579',1400,122300,,'',0,73500,,'',0
-'580',1400,122300,,'',0,73500,,'',0
-'582',1400,122300,,'',0,73500,,'',0
+'583',1100,65100,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'584',1100,65100,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'585',1100,75400,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,4800,0,'Orchard Pk',0,2200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'586',1100,80700,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,4100,0,'Orchard Pk',0,5900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'587',1100,65100,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'588',1100,65100,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'589',1100,65100,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'583',1400,122300,,'',0,73500,,'',0
+'584',1400,122300,,'',0,73500,,'',0
+'587',1400,122300,,'',0,73500,,'',0
+'588',1400,122300,,'',0,73500,,'',0
+'589',1400,122300,,'',0,73500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_272 b/src/main/res-current/raw/current_gtfs_schedule_stop_272
index c2670a5f2..890b6bd4a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_272
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_272
@@ -1,14 +1,14 @@
-'576',701,81300,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'577',701,62700,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
-'578',701,62700,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
-'579',701,62700,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
-'580',701,62700,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
-'581',701,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',701,62700,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
-'576',1800,74100,,'',0,10300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'577',1800,62700,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'578',1800,62700,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'579',1800,62700,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'580',1800,62700,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'581',1800,74100,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8300,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'582',1800,62700,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'583',701,62700,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'584',701,62700,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'585',701,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',701,81300,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'587',701,62700,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'588',701,62700,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'589',701,62700,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'583',1800,62700,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'584',1800,62700,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'585',1800,74100,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8300,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'586',1800,74100,,'',0,10300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'587',1800,62700,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'588',1800,62700,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'589',1800,62700,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_273 b/src/main/res-current/raw/current_gtfs_schedule_stop_273
index 9a042b73f..9ad4cc94a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_273
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_273
@@ -1,7 +1,7 @@
-'576',2001,75800,,'',0,14300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'577',2001,64000,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'578',2001,64000,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'579',2001,64000,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'580',2001,64000,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'581',2001,80400,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,14600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'582',2001,64000,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'583',2001,64000,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'584',2001,64000,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'585',2001,80400,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,14600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'586',2001,75800,,'',0,14300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'587',2001,64000,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'588',2001,64000,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'589',2001,64000,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_274 b/src/main/res-current/raw/current_gtfs_schedule_stop_274
index de231960b..f17647821 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_274
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_274
@@ -1,5 +1,5 @@
-'577',2700,64400,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'578',2700,64400,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'579',2700,64400,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'580',2700,64400,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'582',2700,64400,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'583',2700,64400,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'584',2700,64400,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'587',2700,64400,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'588',2700,64400,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'589',2700,64400,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_275 b/src/main/res-current/raw/current_gtfs_schedule_stop_275
index b4b44346f..9fc45d052 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_275
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_275
@@ -1,10 +1,10 @@
-'577',2700,70200,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'578',2700,70200,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'579',2700,70200,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'580',2700,70200,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'582',2700,70200,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'577',2901,155900,0,'',0
-'578',2901,155900,0,'',0
-'579',2901,155900,0,'',0
-'580',2901,155900,0,'',0
-'582',2901,155900,0,'',0
+'583',2700,70200,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'584',2700,70200,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'587',2700,70200,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'588',2700,70200,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'589',2700,70200,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'583',2901,155900,0,'',0
+'584',2901,155900,0,'',0
+'587',2901,155900,0,'',0
+'588',2901,155900,0,'',0
+'589',2901,155900,0,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_276 b/src/main/res-current/raw/current_gtfs_schedule_stop_276
index 3eac78f62..75fd5a2c3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_276
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_276
@@ -1,7 +1,7 @@
-'576',2000,81700,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'577',2000,62600,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'578',2000,62600,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'579',2000,62600,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'580',2000,62600,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'581',2000,64800,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'582',2000,62600,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'583',2000,62600,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'584',2000,62600,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'585',2000,64800,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
+'586',2000,81700,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'587',2000,62600,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'588',2000,62600,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'589',2000,62600,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_277 b/src/main/res-current/raw/current_gtfs_schedule_stop_277
index e82f8cf5c..ae455a214 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_277
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_277
@@ -1,7 +1,7 @@
-'576',2001,75900,,'',0,14300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'577',2001,64100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'578',2001,64100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'579',2001,64100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'580',2001,64100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'581',2001,80500,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,14600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'582',2001,64100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'583',2001,64100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'584',2001,64100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'585',2001,80500,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,14600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'586',2001,75900,,'',0,14300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'587',2001,64100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'588',2001,64100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'589',2001,64100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_278 b/src/main/res-current/raw/current_gtfs_schedule_stop_278
index 4d0f0017b..9a24c313b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_278
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_278
@@ -1,7 +1,7 @@
-'576',1000,80300,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
-'577',1000,60400,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'578',1000,60400,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'579',1000,60400,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'580',1000,60400,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'581',1000,80000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'582',1000,60400,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'583',1000,60400,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'584',1000,60400,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'585',1000,80000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'586',1000,80300,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
+'587',1000,60400,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'588',1000,60400,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'589',1000,60400,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,5700,,'',0,2300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_279 b/src/main/res-current/raw/current_gtfs_schedule_stop_279
index acfff8405..0263c68b8 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_279
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_279
@@ -1,7 +1,7 @@
-'576',400,81800,,'',0,20000,,'',0,21500,,'',0,27000,,'',0,20500,,'',0,32000,,'',0,10000,,'',0
-'577',400,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
-'578',400,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
-'579',400,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
-'580',400,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
-'581',400,85600,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'582',400,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
+'583',400,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
+'584',400,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
+'585',400,85600,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'586',400,81800,,'',0,20000,,'',0,21500,,'',0,27000,,'',0,20500,,'',0,32000,,'',0,10000,,'',0
+'587',400,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
+'588',400,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
+'589',400,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_28 b/src/main/res-current/raw/current_gtfs_schedule_stop_28
index b40dbea04..c7acebb20 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_28
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_28
@@ -1,7 +1,7 @@
-'576',300,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11600,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
-'577',300,73600,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'578',300,73600,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'579',300,73600,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'580',300,73600,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'581',300,82300,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'582',300,73600,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'583',300,73600,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'584',300,73600,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'585',300,82300,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
+'586',300,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11600,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
+'587',300,73600,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'588',300,73600,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'589',300,73600,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_280 b/src/main/res-current/raw/current_gtfs_schedule_stop_280
index 5021bb6f1..53a04ee8f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_280
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_280
@@ -1,7 +1,7 @@
-'576',2000,81800,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'577',2000,62700,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'578',2000,62700,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'579',2000,62700,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'580',2000,62700,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'581',2000,64900,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'582',2000,62700,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'583',2000,62700,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'584',2000,62700,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'585',2000,64900,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
+'586',2000,81800,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'587',2000,62700,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'588',2000,62700,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'589',2000,62700,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_281 b/src/main/res-current/raw/current_gtfs_schedule_stop_281
index acfff8405..0263c68b8 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_281
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_281
@@ -1,7 +1,7 @@
-'576',400,81800,,'',0,20000,,'',0,21500,,'',0,27000,,'',0,20500,,'',0,32000,,'',0,10000,,'',0
-'577',400,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
-'578',400,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
-'579',400,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
-'580',400,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
-'581',400,85600,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'582',400,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
+'583',400,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
+'584',400,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
+'585',400,85600,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'586',400,81800,,'',0,20000,,'',0,21500,,'',0,27000,,'',0,20500,,'',0,32000,,'',0,10000,,'',0
+'587',400,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
+'588',400,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
+'589',400,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,15500,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_282 b/src/main/res-current/raw/current_gtfs_schedule_stop_282
index 580e652e2..87f417fc6 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_282
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_282
@@ -1,7 +1,7 @@
-'576',800,71500,,'',0,10300,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,17000,,'',0
-'577',800,61200,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8300,,'',0,4500,,'',0
-'578',800,61200,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8300,,'',0,4500,,'',0
-'579',800,61200,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8300,,'',0,4500,,'',0
-'580',800,61200,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8300,,'',0,4500,,'',0
-'581',800,63700,,'',0,7600,,'',0,4500,,'',0,7600,,'',0,7500,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'582',800,61200,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8300,,'',0,4500,,'',0
+'583',800,61200,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8300,,'',0,4500,,'',0
+'584',800,61200,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8300,,'',0,4500,,'',0
+'585',800,63700,,'',0,7600,,'',0,4500,,'',0,7600,,'',0,7500,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
+'586',800,71500,,'',0,10300,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,17000,,'',0
+'587',800,61200,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8300,,'',0,4500,,'',0
+'588',800,61200,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8300,,'',0,4500,,'',0
+'589',800,61200,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8300,,'',0,4500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_283 b/src/main/res-current/raw/current_gtfs_schedule_stop_283
index d43335a8a..3b7836180 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_283
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_283
@@ -1,7 +1,7 @@
-'576',400,80500,,'',0,20000,,'',0,21500,,'',0,23000,,'',0,20500,,'',0,36000,,'',0,10000,,'',0
-'577',400,65500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
-'578',400,65500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
-'579',400,65500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
-'580',400,65500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
-'581',400,84300,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'582',400,65500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'583',400,65500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'584',400,65500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'585',400,84300,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'586',400,80500,,'',0,20000,,'',0,21500,,'',0,23000,,'',0,20500,,'',0,36000,,'',0,10000,,'',0
+'587',400,65500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'588',400,65500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'589',400,65500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_284 b/src/main/res-current/raw/current_gtfs_schedule_stop_284
index e0fd6f464..7d264793c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_284
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_284
@@ -1,7 +1,7 @@
-'576',801,63200,,'',0,27400,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,8800,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'577',801,61300,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'578',801,61300,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'579',801,61300,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'580',801,61300,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'581',801,63200,,'',0,10200,,'',0,8000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
-'582',801,61300,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'583',801,61300,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'584',801,61300,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'585',801,63200,,'',0,10200,,'',0,8000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
+'586',801,63200,,'',0,27400,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,8800,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'587',801,61300,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'588',801,61300,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'589',801,61300,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_285 b/src/main/res-current/raw/current_gtfs_schedule_stop_285
index d43335a8a..3b7836180 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_285
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_285
@@ -1,7 +1,7 @@
-'576',400,80500,,'',0,20000,,'',0,21500,,'',0,23000,,'',0,20500,,'',0,36000,,'',0,10000,,'',0
-'577',400,65500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
-'578',400,65500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
-'579',400,65500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
-'580',400,65500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
-'581',400,84300,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'582',400,65500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'583',400,65500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'584',400,65500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'585',400,84300,,'',0,20100,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'586',400,80500,,'',0,20000,,'',0,21500,,'',0,23000,,'',0,20500,,'',0,36000,,'',0,10000,,'',0
+'587',400,65500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'588',400,65500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
+'589',400,65500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,19500,,'',0,17000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_286 b/src/main/res-current/raw/current_gtfs_schedule_stop_286
index 3bd57075b..1535b6fbb 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_286
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_286
@@ -1,5 +1,5 @@
-'577',2700,64300,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'578',2700,64300,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'579',2700,64300,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'580',2700,64300,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'582',2700,64300,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'583',2700,64300,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'584',2700,64300,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'587',2700,64300,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'588',2700,64300,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'589',2700,64300,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_287 b/src/main/res-current/raw/current_gtfs_schedule_stop_287
index 12480c665..550da9807 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_287
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_287
@@ -1,7 +1,7 @@
-'576',3001,74200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,10000,,'',0
-'577',3001,54600,,'',0,7700,,'',0,1900,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,4700,,'',0,800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,4900,,'',0,1000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,4800,,'',0,1700,,'',0,1600,,'',0,1800,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1900,,'',0,1900,,'',0,6700,,'',0,1900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
-'578',3001,54600,,'',0,7700,,'',0,1900,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,4700,,'',0,800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,4900,,'',0,1000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,4800,,'',0,1700,,'',0,1600,,'',0,1800,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1900,,'',0,1900,,'',0,6700,,'',0,1900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
-'579',3001,54600,,'',0,7700,,'',0,1900,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,4700,,'',0,800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,4900,,'',0,1000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,4800,,'',0,1700,,'',0,1600,,'',0,1800,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1900,,'',0,1900,,'',0,6700,,'',0,1900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
-'580',3001,54600,,'',0,7700,,'',0,1900,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,4700,,'',0,800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,4900,,'',0,1000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,4800,,'',0,1700,,'',0,1600,,'',0,1800,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1900,,'',0,1900,,'',0,6700,,'',0,1900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,9000,,'',0,8000,,'',0
-'581',3001,74200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'582',3001,54600,,'',0,7700,,'',0,1900,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,4700,,'',0,800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,4900,,'',0,1000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,4800,,'',0,1700,,'',0,1600,,'',0,1800,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1900,,'',0,1900,,'',0,6700,,'',0,1900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
+'583',3001,54600,,'',0,7700,,'',0,1900,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,4700,,'',0,800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,4900,,'',0,1000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,4800,,'',0,1700,,'',0,1600,,'',0,1800,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1900,,'',0,1900,,'',0,6700,,'',0,1900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
+'584',3001,54600,,'',0,7700,,'',0,1900,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,4700,,'',0,800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,4900,,'',0,1000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,4800,,'',0,1700,,'',0,1600,,'',0,1800,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1900,,'',0,1900,,'',0,6700,,'',0,1900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,9000,,'',0,8000,,'',0
+'585',3001,74200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'586',3001,74200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,10000,,'',0
+'587',3001,54600,,'',0,7700,,'',0,1900,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,4700,,'',0,800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,4900,,'',0,1000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,4800,,'',0,1700,,'',0,1600,,'',0,1800,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1900,,'',0,1900,,'',0,6700,,'',0,1900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
+'588',3001,54600,,'',0,7700,,'',0,1900,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,4700,,'',0,800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,4900,,'',0,1000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,4800,,'',0,1700,,'',0,1600,,'',0,1800,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1900,,'',0,1900,,'',0,6700,,'',0,1900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
+'589',3001,54600,,'',0,7700,,'',0,1900,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,4700,,'',0,800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,4900,,'',0,1000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,4800,,'',0,1700,,'',0,1600,,'',0,1800,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1900,,'',0,1900,,'',0,6700,,'',0,1900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_289 b/src/main/res-current/raw/current_gtfs_schedule_stop_289
index 4a919a0d3..fa1d3b332 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_289
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_289
@@ -1,7 +1,7 @@
-'576',1700,83700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',1700,61400,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1700,61400,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1700,61400,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1700,61400,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1700,83800,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'582',1700,61400,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1700,61400,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1700,61400,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1700,83800,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'586',1700,83700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',1700,61400,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1700,61400,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1700,61400,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_29 b/src/main/res-current/raw/current_gtfs_schedule_stop_29
index fc63498c5..a8944780e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_29
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_29
@@ -1,7 +1,7 @@
-'576',1101,74200,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
-'577',1101,64900,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'578',1101,64900,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'579',1101,64900,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'580',1101,64900,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'581',1101,80300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'582',1101,64900,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'583',1101,64900,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'584',1101,64900,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'585',1101,80300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'586',1101,74200,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
+'587',1101,64900,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'588',1101,64900,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'589',1101,64900,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_290 b/src/main/res-current/raw/current_gtfs_schedule_stop_290
index 2b6a11614..651645b81 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_290
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_290
@@ -1,7 +1,7 @@
-'576',1700,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',1700,61500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,1000,,'',0,2000,,'',0,7700,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1700,61500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,1000,,'',0,2000,,'',0,7700,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1700,61500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,1000,,'',0,2000,,'',0,7700,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1700,61500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,1000,,'',0,2000,,'',0,7700,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1700,83900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'582',1700,61500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,1000,,'',0,2000,,'',0,7700,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1700,61500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,1000,,'',0,2000,,'',0,7700,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1700,61500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,1000,,'',0,2000,,'',0,7700,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1700,83900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'586',1700,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',1700,61500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,1000,,'',0,2000,,'',0,7700,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1700,61500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,1000,,'',0,2000,,'',0,7700,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1700,61500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,1000,,'',0,2000,,'',0,7700,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_291 b/src/main/res-current/raw/current_gtfs_schedule_stop_291
index de231960b..f17647821 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_291
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_291
@@ -1,5 +1,5 @@
-'577',2700,64400,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'578',2700,64400,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'579',2700,64400,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'580',2700,64400,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'582',2700,64400,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'583',2700,64400,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'584',2700,64400,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'587',2700,64400,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'588',2700,64400,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'589',2700,64400,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_292 b/src/main/res-current/raw/current_gtfs_schedule_stop_292
index b31561caa..27df434e4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_292
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_292
@@ -1,7 +1,7 @@
-'576',2000,81600,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'577',2000,62500,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'578',2000,62500,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'579',2000,62500,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'580',2000,62500,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'581',2000,64700,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'582',2000,62500,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'583',2000,62500,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'584',2000,62500,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'585',2000,64700,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
+'586',2000,81600,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'587',2000,62500,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'588',2000,62500,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'589',2000,62500,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_293 b/src/main/res-current/raw/current_gtfs_schedule_stop_293
index b31561caa..27df434e4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_293
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_293
@@ -1,7 +1,7 @@
-'576',2000,81600,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'577',2000,62500,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'578',2000,62500,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'579',2000,62500,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'580',2000,62500,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'581',2000,64700,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'582',2000,62500,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'583',2000,62500,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'584',2000,62500,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'585',2000,64700,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
+'586',2000,81600,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'587',2000,62500,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'588',2000,62500,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'589',2000,62500,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_294 b/src/main/res-current/raw/current_gtfs_schedule_stop_294
index 1ba303d50..f3b9facc7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_294
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_294
@@ -1,7 +1,7 @@
-'576',2001,75800,,'',0,14300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'577',2001,63900,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'578',2001,63900,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'579',2001,63900,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'580',2001,63900,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'581',2001,80400,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,14600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'582',2001,63900,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'583',2001,63900,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'584',2001,63900,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'585',2001,80400,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,14600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'586',2001,75800,,'',0,14300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'587',2001,63900,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'588',2001,63900,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'589',2001,63900,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_295 b/src/main/res-current/raw/current_gtfs_schedule_stop_295
index 8277257bb..e35108002 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_295
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_295
@@ -1,7 +1,7 @@
-'576',2000,81900,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'577',2000,62800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'578',2000,62800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'579',2000,62800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'580',2000,62800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'581',2000,65000,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'582',2000,62800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'583',2000,62800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'584',2000,62800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'585',2000,65000,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
+'586',2000,81900,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'587',2000,62800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'588',2000,62800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'589',2000,62800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_296 b/src/main/res-current/raw/current_gtfs_schedule_stop_296
index 45a163a9c..79c803219 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_296
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_296
@@ -1,17 +1,17 @@
-'576',2001,80100,,'',0,10300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'577',2001,64300,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'578',2001,64300,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'579',2001,64300,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'580',2001,64300,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'581',2001,80700,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,14600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'582',2001,64300,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'577',2700,70300,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'578',2700,70300,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'579',2700,70300,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'580',2700,70300,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'582',2700,70300,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'577',2901,160000,0,'',0
-'578',2901,160000,0,'',0
-'579',2901,160000,0,'',0
-'580',2901,160000,0,'',0
-'582',2901,160000,0,'',0
+'583',2001,64300,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'584',2001,64300,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'585',2001,80700,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,14600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'586',2001,80100,,'',0,10300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'587',2001,64300,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'588',2001,64300,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'589',2001,64300,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'583',2700,70300,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'584',2700,70300,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'587',2700,70300,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'588',2700,70300,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'589',2700,70300,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'583',2901,160000,0,'',0
+'584',2901,160000,0,'',0
+'587',2901,160000,0,'',0
+'588',2901,160000,0,'',0
+'589',2901,160000,0,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_297 b/src/main/res-current/raw/current_gtfs_schedule_stop_297
index 7b5e566c2..f46413e41 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_297
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_297
@@ -1,7 +1,7 @@
-'576',801,63100,,'',0,27400,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,8800,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'577',801,61200,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
-'578',801,61200,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
-'579',801,61200,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
-'580',801,61200,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
-'581',801,63100,,'',0,10200,,'',0,8000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
-'582',801,61200,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
+'583',801,61200,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
+'584',801,61200,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
+'585',801,63100,,'',0,10200,,'',0,8000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
+'586',801,63100,,'',0,27400,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,8800,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'587',801,61200,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
+'588',801,61200,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
+'589',801,61200,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_298 b/src/main/res-current/raw/current_gtfs_schedule_stop_298
index 61253d29e..cbdd56929 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_298
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_298
@@ -1,7 +1,7 @@
-'576',201,80000,,'',0,5500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'577',201,61800,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'578',201,61800,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'579',201,61800,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'580',201,61800,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'581',201,82500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,5800,,'',0,10000,,'',0,10000,,'',0,9600,,'',0
-'582',201,61800,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'583',201,61800,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'584',201,61800,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'585',201,82500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,5800,,'',0,10000,,'',0,10000,,'',0,9600,,'',0
+'586',201,80000,,'',0,5500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'587',201,61800,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'588',201,61800,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'589',201,61800,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_299 b/src/main/res-current/raw/current_gtfs_schedule_stop_299
index 0a5943451..0d142c94a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_299
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_299
@@ -1,7 +1,7 @@
-'576',800,71500,,'',0,10400,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,17000,,'',0
-'577',800,61300,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
-'578',800,61300,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
-'579',800,61300,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
-'580',800,61300,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
-'581',800,63800,,'',0,7600,,'',0,4500,,'',0,7600,,'',0,7500,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'582',800,61300,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
+'583',800,61300,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
+'584',800,61300,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
+'585',800,63800,,'',0,7600,,'',0,4500,,'',0,7600,,'',0,7500,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
+'586',800,71500,,'',0,10400,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,17000,,'',0
+'587',800,61300,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
+'588',800,61300,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
+'589',800,61300,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_3 b/src/main/res-current/raw/current_gtfs_schedule_stop_3
index def88d539..d4f915ebd 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_3
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_3
@@ -1,14 +1,14 @@
-'576',1000,82600,4,'',0,12300,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9700,4,'',0,9900,4,'',0,10000,4,'',0,17000,4,'',0
-'576',1001,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'577',1000,62400,4,'',0,3200,4,'',0,5800,4,'',0,2400,4,'',0,1900,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,5900,4,'',0,2100,4,'',0,2100,4,'',0,6000,4,'',0,2800,4,'',0,6900,4,'',0,3400,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3500,4,'',0,6000,4,'',0,1700,4,'',0,2200,4,'',0,5800,4,'',0,1900,4,'',0,1800,4,'',0,5500,4,'',0,1600,4,'',0,2200,4,'',0,8100,4,'',0,8400,4,'',0,4200,4,'',0,8200,4,'',0,8300,4,'',0,4400,4,'',0,8400,4,'',0,8500,4,'',0
-'577',1001,63000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'578',1000,62400,4,'',0,3200,4,'',0,5800,4,'',0,2400,4,'',0,1900,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,5900,4,'',0,2100,4,'',0,2100,4,'',0,6000,4,'',0,2800,4,'',0,6900,4,'',0,3400,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3500,4,'',0,6000,4,'',0,1700,4,'',0,2200,4,'',0,5800,4,'',0,1900,4,'',0,1800,4,'',0,5500,4,'',0,1600,4,'',0,2200,4,'',0,8100,4,'',0,8400,4,'',0,4200,4,'',0,8200,4,'',0,8300,4,'',0,4400,4,'',0,8400,4,'',0,8500,4,'',0
-'578',1001,63000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'579',1000,62400,4,'',0,3200,4,'',0,5800,4,'',0,2400,4,'',0,1900,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,5900,4,'',0,2100,4,'',0,2100,4,'',0,6000,4,'',0,2800,4,'',0,6900,4,'',0,3400,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3500,4,'',0,6000,4,'',0,1700,4,'',0,2200,4,'',0,5800,4,'',0,1900,4,'',0,1800,4,'',0,5500,4,'',0,1600,4,'',0,2200,4,'',0,8100,4,'',0,8400,4,'',0,4200,4,'',0,8200,4,'',0,8300,4,'',0,4400,4,'',0,8400,4,'',0,8500,4,'',0
-'579',1001,63000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'580',1000,62400,4,'',0,3200,4,'',0,5800,4,'',0,2400,4,'',0,1900,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,5900,4,'',0,2100,4,'',0,2100,4,'',0,6000,4,'',0,2800,4,'',0,6900,4,'',0,3400,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3500,4,'',0,6000,4,'',0,1700,4,'',0,2200,4,'',0,5800,4,'',0,1900,4,'',0,1800,4,'',0,5500,4,'',0,1600,4,'',0,2200,4,'',0,8100,4,'',0,8400,4,'',0,4200,4,'',0,8200,4,'',0,8300,4,'',0,4400,4,'',0,8400,4,'',0,8500,4,'',0
-'580',1001,63000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'581',1000,82600,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,2900,4,'',0,7600,4,'',0,6900,4,'',0,5800,4,'',0,9900,4,'',0,9800,4,'',0,10000,4,'',0
-'581',1001,80800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',1000,62400,4,'',0,3200,4,'',0,5800,4,'',0,2400,4,'',0,1900,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,5900,4,'',0,2100,4,'',0,2100,4,'',0,6000,4,'',0,2800,4,'',0,6900,4,'',0,3400,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3500,4,'',0,6000,4,'',0,1700,4,'',0,2200,4,'',0,5800,4,'',0,1900,4,'',0,1800,4,'',0,5500,4,'',0,1600,4,'',0,2200,4,'',0,8100,4,'',0,8400,4,'',0,4200,4,'',0,8200,4,'',0,8300,4,'',0,4400,4,'',0,8400,4,'',0,8500,4,'',0
-'582',1001,63000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'583',1000,62400,4,'',0,3200,4,'',0,5800,4,'',0,2400,4,'',0,1900,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,5900,4,'',0,2100,4,'',0,2100,4,'',0,6000,4,'',0,2800,4,'',0,6900,4,'',0,3400,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3500,4,'',0,6000,4,'',0,1700,4,'',0,2200,4,'',0,5800,4,'',0,1900,4,'',0,1800,4,'',0,5500,4,'',0,1600,4,'',0,2200,4,'',0,8100,4,'',0,8400,4,'',0,4200,4,'',0,8200,4,'',0,8300,4,'',0,4400,4,'',0,8400,4,'',0,8500,4,'',0
+'583',1001,63000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'584',1000,62400,4,'',0,3200,4,'',0,5800,4,'',0,2400,4,'',0,1900,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,5900,4,'',0,2100,4,'',0,2100,4,'',0,6000,4,'',0,2800,4,'',0,6900,4,'',0,3400,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3500,4,'',0,6000,4,'',0,1700,4,'',0,2200,4,'',0,5800,4,'',0,1900,4,'',0,1800,4,'',0,5500,4,'',0,1600,4,'',0,2200,4,'',0,8100,4,'',0,8400,4,'',0,4200,4,'',0,8200,4,'',0,8300,4,'',0,4400,4,'',0,8400,4,'',0,8500,4,'',0
+'584',1001,63000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'585',1000,82600,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,2900,4,'',0,7600,4,'',0,6900,4,'',0,5800,4,'',0,9900,4,'',0,9800,4,'',0,10000,4,'',0
+'585',1001,80800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',1000,82600,4,'',0,12300,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9700,4,'',0,9900,4,'',0,10000,4,'',0,17000,4,'',0
+'586',1001,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'587',1000,62400,4,'',0,3200,4,'',0,5800,4,'',0,2400,4,'',0,1900,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,5900,4,'',0,2100,4,'',0,2100,4,'',0,6000,4,'',0,2800,4,'',0,6900,4,'',0,3400,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3500,4,'',0,6000,4,'',0,1700,4,'',0,2200,4,'',0,5800,4,'',0,1900,4,'',0,1800,4,'',0,5500,4,'',0,1600,4,'',0,2200,4,'',0,8100,4,'',0,8400,4,'',0,4200,4,'',0,8200,4,'',0,8300,4,'',0,4400,4,'',0,8400,4,'',0,8500,4,'',0
+'587',1001,63000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'588',1000,62400,4,'',0,3200,4,'',0,5800,4,'',0,2400,4,'',0,1900,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,5900,4,'',0,2100,4,'',0,2100,4,'',0,6000,4,'',0,2800,4,'',0,6900,4,'',0,3400,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3500,4,'',0,6000,4,'',0,1700,4,'',0,2200,4,'',0,5800,4,'',0,1900,4,'',0,1800,4,'',0,5500,4,'',0,1600,4,'',0,2200,4,'',0,8100,4,'',0,8400,4,'',0,4200,4,'',0,8200,4,'',0,8300,4,'',0,4400,4,'',0,8400,4,'',0,8500,4,'',0
+'588',1001,63000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'589',1000,62400,4,'',0,3200,4,'',0,5800,4,'',0,2400,4,'',0,1900,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,5900,4,'',0,2100,4,'',0,2100,4,'',0,6000,4,'',0,2800,4,'',0,6900,4,'',0,3400,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3500,4,'',0,6000,4,'',0,1700,4,'',0,2200,4,'',0,5800,4,'',0,1900,4,'',0,1800,4,'',0,5500,4,'',0,1600,4,'',0,2200,4,'',0,8100,4,'',0,8400,4,'',0,4200,4,'',0,8200,4,'',0,8300,4,'',0,4400,4,'',0,8400,4,'',0,8500,4,'',0
+'589',1001,63000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_30 b/src/main/res-current/raw/current_gtfs_schedule_stop_30
index 146edc907..b8cf81e43 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_30
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_30
@@ -1,7 +1,7 @@
-'576',1100,82200,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9400,,'',0,10000,,'',0,10000,,'',0
-'577',1100,70400,,'',0,4900,,'',0,7400,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'578',1100,70400,,'',0,4900,,'',0,7400,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'579',1100,70400,,'',0,4900,,'',0,7400,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'580',1100,70400,,'',0,4900,,'',0,7400,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'581',1100,80900,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
-'582',1100,70400,,'',0,4900,,'',0,7400,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'583',1100,70400,,'',0,4900,,'',0,7400,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'584',1100,70400,,'',0,4900,,'',0,7400,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'585',1100,80900,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
+'586',1100,82200,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9400,,'',0,10000,,'',0,10000,,'',0
+'587',1100,70400,,'',0,4900,,'',0,7400,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'588',1100,70400,,'',0,4900,,'',0,7400,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'589',1100,70400,,'',0,4900,,'',0,7400,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_300 b/src/main/res-current/raw/current_gtfs_schedule_stop_300
index 2b1c82d33..d51ecf1ce 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_300
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_300
@@ -1,7 +1,7 @@
-'576',1700,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',1700,61500,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,2900,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1700,61500,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,2900,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1700,61500,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,2900,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1700,61500,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,2900,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1700,83900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'582',1700,61500,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,2900,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1700,61500,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,2900,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1700,61500,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,2900,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1700,83900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'586',1700,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',1700,61500,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,2900,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1700,61500,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,2900,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1700,61500,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,2900,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_301 b/src/main/res-current/raw/current_gtfs_schedule_stop_301
index 0e1a71c5e..a0b25a837 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_301
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_301
@@ -1,7 +1,7 @@
-'576',200,80800,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'577',200,60300,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'578',200,60300,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'579',200,60300,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'580',200,60300,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'581',200,80700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'582',200,60300,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'583',200,60300,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'584',200,60300,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'585',200,80700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
+'586',200,80800,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'587',200,60300,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'588',200,60300,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'589',200,60300,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_302 b/src/main/res-current/raw/current_gtfs_schedule_stop_302
index b7f3e7e71..8ec2edf0d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_302
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_302
@@ -1,12 +1,12 @@
-'576',1101,75900,0,'Black Mtn',0,16600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'577',1101,70300,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'578',1101,70300,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'579',1101,70300,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'580',1101,70300,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'581',1101,82000,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'582',1101,70300,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'577',1401,113900,,'',0,77900,,'',0
-'578',1401,113900,,'',0,77900,,'',0
-'579',1401,113900,,'',0,77900,,'',0
-'580',1401,113900,,'',0,77900,,'',0
-'582',1401,113900,,'',0,77900,,'',0
+'583',1101,70300,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'584',1101,70300,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'585',1101,82000,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'586',1101,75900,0,'Black Mtn',0,16600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
+'587',1101,70300,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'588',1101,70300,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'589',1101,70300,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'583',1401,113900,,'',0,77900,,'',0
+'584',1401,113900,,'',0,77900,,'',0
+'587',1401,113900,,'',0,77900,,'',0
+'588',1401,113900,,'',0,77900,,'',0
+'589',1401,113900,,'',0,77900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_303 b/src/main/res-current/raw/current_gtfs_schedule_stop_303
index 738ff3db6..15caaaf08 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_303
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_303
@@ -1,12 +1,12 @@
-'576',1100,80600,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'577',1100,65000,,'',0,8700,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'578',1100,65000,,'',0,8700,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'579',1100,65000,,'',0,8700,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'580',1100,65000,,'',0,8700,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'581',1100,75300,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,4800,0,'Orchard Pk',0,2200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'582',1100,65000,,'',0,8700,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'577',1400,122300,,'',0,73400,,'',0
-'578',1400,122300,,'',0,73400,,'',0
-'579',1400,122300,,'',0,73400,,'',0
-'580',1400,122300,,'',0,73400,,'',0
-'582',1400,122300,,'',0,73400,,'',0
+'583',1100,65000,,'',0,8700,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'584',1100,65000,,'',0,8700,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'585',1100,75300,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,4800,0,'Orchard Pk',0,2200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'586',1100,80600,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'587',1100,65000,,'',0,8700,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'588',1100,65000,,'',0,8700,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'589',1100,65000,,'',0,8700,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'583',1400,122300,,'',0,73400,,'',0
+'584',1400,122300,,'',0,73400,,'',0
+'587',1400,122300,,'',0,73400,,'',0
+'588',1400,122300,,'',0,73400,,'',0
+'589',1400,122300,,'',0,73400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_304 b/src/main/res-current/raw/current_gtfs_schedule_stop_304
index db3a9bfc0..5e134498d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_304
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_304
@@ -1,7 +1,7 @@
-'576',1700,83900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',1700,61600,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,2900,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1700,61600,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,2900,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1700,61600,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,2900,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1700,61600,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,2900,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1700,84000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'582',1700,61600,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,2900,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1700,61600,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,2900,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1700,61600,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,2900,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1700,84000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'586',1700,83900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',1700,61600,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,2900,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1700,61600,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,2900,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1700,61600,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,2900,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_305 b/src/main/res-current/raw/current_gtfs_schedule_stop_305
index 43b3482c1..c23798493 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_305
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_305
@@ -1,7 +1,7 @@
-'576',1400,83500,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
-'577',1400,70000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,30900,,'',0,32100,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,21700,,'',0
-'578',1400,70000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,30900,,'',0,32100,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,21700,,'',0
-'579',1400,70000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,30900,,'',0,32100,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,21700,,'',0
-'580',1400,70000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,30900,,'',0,32100,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,21700,,'',0
-'581',1400,81300,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
-'582',1400,70000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,30900,,'',0,32100,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,21700,,'',0
+'583',1400,70000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,30900,,'',0,32100,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,21700,,'',0
+'584',1400,70000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,30900,,'',0,32100,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,21700,,'',0
+'585',1400,81300,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
+'586',1400,83500,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
+'587',1400,70000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,30900,,'',0,32100,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,21700,,'',0
+'588',1400,70000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,30900,,'',0,32100,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,21700,,'',0
+'589',1400,70000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,30900,,'',0,32100,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,21700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_306 b/src/main/res-current/raw/current_gtfs_schedule_stop_306
index 65414f1e5..ef54a8139 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_306
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_306
@@ -1,12 +1,12 @@
-'576',1400,83600,4,'',0,26400,4,'',0,14500,4,'',0,18500,4,'',0,22500,4,'',0,26500,4,'',0
-'577',1400,70100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,30900,,'',0,32100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,21700,,'',0
-'577',1401,63500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'578',1400,70100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,30900,,'',0,32100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,21700,,'',0
-'578',1401,63500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'579',1400,70100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,30900,,'',0,32100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,21700,,'',0
-'579',1401,63500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'580',1400,70100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,30900,,'',0,32100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,21700,,'',0
-'580',1401,63500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'581',1400,81400,4,'',0,13500,4,'',0,19700,4,'',0,30000,4,'',0,26500,4,'',0,13500,4,'',0,18700,4,'',0
-'582',1400,70100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,30900,,'',0,32100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,21700,,'',0
-'582',1401,63500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'583',1400,70100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,30900,,'',0,32100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,21700,,'',0
+'583',1401,63500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'584',1400,70100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,30900,,'',0,32100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,21700,,'',0
+'584',1401,63500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'585',1400,81400,4,'',0,13500,4,'',0,19700,4,'',0,30000,4,'',0,26500,4,'',0,13500,4,'',0,18700,4,'',0
+'586',1400,83600,4,'',0,26400,4,'',0,14500,4,'',0,18500,4,'',0,22500,4,'',0,26500,4,'',0
+'587',1400,70100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,30900,,'',0,32100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,21700,,'',0
+'587',1401,63500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'588',1400,70100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,30900,,'',0,32100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,21700,,'',0
+'588',1401,63500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'589',1400,70100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,30900,,'',0,32100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,21700,,'',0
+'589',1401,63500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_307 b/src/main/res-current/raw/current_gtfs_schedule_stop_307
index 4cb3db616..c58148b5c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_307
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_307
@@ -1,7 +1,7 @@
-'576',2001,75700,,'',0,14300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'577',2001,63900,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'578',2001,63900,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'579',2001,63900,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'580',2001,63900,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'581',2001,80300,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,14600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'582',2001,63900,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'583',2001,63900,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'584',2001,63900,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'585',2001,80300,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,14600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'586',2001,75700,,'',0,14300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'587',2001,63900,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'588',2001,63900,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'589',2001,63900,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_308 b/src/main/res-current/raw/current_gtfs_schedule_stop_308
index 8277257bb..e35108002 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_308
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_308
@@ -1,7 +1,7 @@
-'576',2000,81900,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'577',2000,62800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'578',2000,62800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'579',2000,62800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'580',2000,62800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'581',2000,65000,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'582',2000,62800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'583',2000,62800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'584',2000,62800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'585',2000,65000,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
+'586',2000,81900,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'587',2000,62800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'588',2000,62800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'589',2000,62800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_309 b/src/main/res-current/raw/current_gtfs_schedule_stop_309
index f560254d1..ac1bac4aa 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_309
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_309
@@ -1,7 +1,7 @@
-'576',1401,82500,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
-'577',1401,65000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'578',1401,65000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'579',1401,65000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'580',1401,65000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'581',1401,80300,,'',0,13500,,'',0,19700,,'',0,30000,,'',0,26500,,'',0,13500,,'',0,18700,,'',0
-'582',1401,65000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'583',1401,65000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'584',1401,65000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'585',1401,80300,,'',0,13500,,'',0,19700,,'',0,30000,,'',0,26500,,'',0,13500,,'',0,18700,,'',0
+'586',1401,82500,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
+'587',1401,65000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'588',1401,65000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'589',1401,65000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_31 b/src/main/res-current/raw/current_gtfs_schedule_stop_31
index 06a7976e7..43bb36c72 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_31
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_31
@@ -1,7 +1,7 @@
-'576',300,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
-'577',300,73100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'578',300,73100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'579',300,73100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'580',300,73100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'581',300,81800,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'582',300,73100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'583',300,73100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'584',300,73100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'585',300,81800,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
+'586',300,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
+'587',300,73100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'588',300,73100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'589',300,73100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_310 b/src/main/res-current/raw/current_gtfs_schedule_stop_310
index 19f1eaa9a..ef57818db 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_310
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_310
@@ -1,7 +1,7 @@
-'576',801,63000,,'',0,27400,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,8800,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'577',801,61100,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
-'578',801,61100,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
-'579',801,61100,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
-'580',801,61100,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
-'581',801,63000,,'',0,10200,,'',0,8000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
-'582',801,61100,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
+'583',801,61100,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
+'584',801,61100,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
+'585',801,63000,,'',0,10200,,'',0,8000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
+'586',801,63000,,'',0,27400,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,8800,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'587',801,61100,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
+'588',801,61100,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
+'589',801,61100,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_311 b/src/main/res-current/raw/current_gtfs_schedule_stop_311
index fa3014f29..f41daf93f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_311
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_311
@@ -1,12 +1,12 @@
-'576',1100,80600,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'577',1100,65000,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'578',1100,65000,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'579',1100,65000,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'580',1100,65000,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'581',1100,75300,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,4800,0,'Orchard Pk',0,2200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'582',1100,65000,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'577',1400,122200,,'',0,73500,,'',0
-'578',1400,122200,,'',0,73500,,'',0
-'579',1400,122200,,'',0,73500,,'',0
-'580',1400,122200,,'',0,73500,,'',0
-'582',1400,122200,,'',0,73500,,'',0
+'583',1100,65000,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'584',1100,65000,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'585',1100,75300,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,4800,0,'Orchard Pk',0,2200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'586',1100,80600,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'587',1100,65000,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'588',1100,65000,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'589',1100,65000,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'583',1400,122200,,'',0,73500,,'',0
+'584',1400,122200,,'',0,73500,,'',0
+'587',1400,122200,,'',0,73500,,'',0
+'588',1400,122200,,'',0,73500,,'',0
+'589',1400,122200,,'',0,73500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_312 b/src/main/res-current/raw/current_gtfs_schedule_stop_312
index 0b024a4f0..f683b0111 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_312
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_312
@@ -1,7 +1,7 @@
-'576',1900,81100,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'577',1900,65700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
-'578',1900,65700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
-'579',1900,65700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
-'580',1900,65700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
-'581',1900,74100,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'582',1900,65700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
+'583',1900,65700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
+'584',1900,65700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
+'585',1900,74100,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'586',1900,81100,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'587',1900,65700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
+'588',1900,65700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
+'589',1900,65700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_313 b/src/main/res-current/raw/current_gtfs_schedule_stop_313
index 0d8d7fcbc..d562be4c8 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_313
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_313
@@ -1,7 +1,7 @@
-'576',800,71600,,'',0,10400,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,17000,,'',0
-'577',800,61400,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
-'578',800,61400,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
-'579',800,61400,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
-'580',800,61400,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
-'581',800,63900,,'',0,7600,,'',0,8500,,'',0,3600,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'582',800,61400,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
+'583',800,61400,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
+'584',800,61400,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
+'585',800,63900,,'',0,7600,,'',0,8500,,'',0,3600,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
+'586',800,71600,,'',0,10400,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,17000,,'',0
+'587',800,61400,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
+'588',800,61400,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
+'589',800,61400,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_314 b/src/main/res-current/raw/current_gtfs_schedule_stop_314
index a4d25a07c..4b4211e8d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_314
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_314
@@ -1,12 +1,12 @@
-'576',1101,80000,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'577',1101,70400,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'578',1101,70400,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'579',1101,70400,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'580',1101,70400,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'581',1101,82100,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'582',1101,70400,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'577',1401,113900,,'',0,78000,,'',0
-'578',1401,113900,,'',0,78000,,'',0
-'579',1401,113900,,'',0,78000,,'',0
-'580',1401,113900,,'',0,78000,,'',0
-'582',1401,113900,,'',0,78000,,'',0
+'583',1101,70400,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'584',1101,70400,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'585',1101,82100,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'586',1101,80000,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
+'587',1101,70400,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'588',1101,70400,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'589',1101,70400,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'583',1401,113900,,'',0,78000,,'',0
+'584',1401,113900,,'',0,78000,,'',0
+'587',1401,113900,,'',0,78000,,'',0
+'588',1401,113900,,'',0,78000,,'',0
+'589',1401,113900,,'',0,78000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_315 b/src/main/res-current/raw/current_gtfs_schedule_stop_315
index d94f6da96..7ad8ec1e6 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_315
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_315
@@ -1,7 +1,7 @@
-'576',1800,74300,,'',0,10200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'577',1800,62900,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'578',1800,62900,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'579',1800,62900,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'580',1800,62900,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'581',1800,74300,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'582',1800,62900,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'583',1800,62900,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'584',1800,62900,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'585',1800,74300,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'586',1800,74300,,'',0,10200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'587',1800,62900,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'588',1800,62900,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'589',1800,62900,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_317 b/src/main/res-current/raw/current_gtfs_schedule_stop_317
index 3b11daa0c..cc090fc15 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_317
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_317
@@ -1,7 +1,7 @@
-'576',200,80700,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',200,60200,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'578',200,60200,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'579',200,60200,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'580',200,60200,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'581',200,80600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9400,,'',0,10200,,'',0,10100,,'',0
-'582',200,60200,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'583',200,60200,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'584',200,60200,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'585',200,80600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9400,,'',0,10200,,'',0,10100,,'',0
+'586',200,80700,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',200,60200,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'588',200,60200,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'589',200,60200,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_318 b/src/main/res-current/raw/current_gtfs_schedule_stop_318
index a1f671e5c..14d7c7fc4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_318
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_318
@@ -1,5 +1,5 @@
-'577',501,61800,,'',0,3800,,'',0,8700,,'',0,8500,,'',0,59400,,'',0,11800,,'',0,8800,,'',0,7900,,'',0,5000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,18700,,'',0
-'578',501,61800,,'',0,3800,,'',0,8700,,'',0,8500,,'',0,59400,,'',0,11800,,'',0,8800,,'',0,7900,,'',0,5000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,18700,,'',0
-'579',501,61800,,'',0,3800,,'',0,8700,,'',0,8500,,'',0,59400,,'',0,11800,,'',0,8800,,'',0,7900,,'',0,5000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,18700,,'',0
-'580',501,61800,,'',0,3800,,'',0,8700,,'',0,8500,,'',0,59400,,'',0,11800,,'',0,8800,,'',0,7900,,'',0,5000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,18700,,'',0
-'582',501,61800,,'',0,3800,,'',0,8700,,'',0,8500,,'',0,59400,,'',0,11800,,'',0,8800,,'',0,7900,,'',0,5000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,18700,,'',0
+'583',501,61800,,'',0,3800,,'',0,8700,,'',0,8500,,'',0,59400,,'',0,11800,,'',0,8800,,'',0,7900,,'',0,5000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,18700,,'',0
+'584',501,61800,,'',0,3800,,'',0,8700,,'',0,8500,,'',0,59400,,'',0,11800,,'',0,8800,,'',0,7900,,'',0,5000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,18700,,'',0
+'587',501,61800,,'',0,3800,,'',0,8700,,'',0,8500,,'',0,59400,,'',0,11800,,'',0,8800,,'',0,7900,,'',0,5000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,18700,,'',0
+'588',501,61800,,'',0,3800,,'',0,8700,,'',0,8500,,'',0,59400,,'',0,11800,,'',0,8800,,'',0,7900,,'',0,5000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,18700,,'',0
+'589',501,61800,,'',0,3800,,'',0,8700,,'',0,8500,,'',0,59400,,'',0,11800,,'',0,8800,,'',0,7900,,'',0,5000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,18700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_319 b/src/main/res-current/raw/current_gtfs_schedule_stop_319
index 6ec43d4c4..78b24630f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_319
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_319
@@ -1,7 +1,7 @@
-'576',2000,82000,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'577',2000,62900,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'578',2000,62900,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'579',2000,62900,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'580',2000,62900,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'581',2000,65100,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'582',2000,62900,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'583',2000,62900,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'584',2000,62900,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'585',2000,65100,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
+'586',2000,82000,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'587',2000,62900,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'588',2000,62900,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'589',2000,62900,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_32 b/src/main/res-current/raw/current_gtfs_schedule_stop_32
index fb4148a98..91524804b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_32
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_32
@@ -1,7 +1,7 @@
-'576',1000,82300,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
-'577',1000,62200,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8200,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'578',1000,62200,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8200,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'579',1000,62200,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8200,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'580',1000,62200,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8200,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'581',1000,82200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
-'582',1000,62200,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8200,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'583',1000,62200,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8200,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'584',1000,62200,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8200,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'585',1000,82200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'586',1000,82300,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
+'587',1000,62200,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8200,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'588',1000,62200,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8200,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'589',1000,62200,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8200,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_320 b/src/main/res-current/raw/current_gtfs_schedule_stop_320
index a536f0d9a..1639b1637 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_320
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_320
@@ -1,7 +1,7 @@
-'576',2001,75600,,'',0,10300,,'',0,14400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'577',2001,63800,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'578',2001,63800,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'579',2001,63800,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'580',2001,63800,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'581',2001,80200,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,10600,,'',0,14400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'582',2001,63800,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'583',2001,63800,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'584',2001,63800,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'585',2001,80200,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,10600,,'',0,14400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'586',2001,75600,,'',0,10300,,'',0,14400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'587',2001,63800,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'588',2001,63800,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'589',2001,63800,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_321 b/src/main/res-current/raw/current_gtfs_schedule_stop_321
index 3d7e7d5f6..0d6ed9c83 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_321
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_321
@@ -1,7 +1,7 @@
-'576',2000,81500,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'577',2000,62400,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'578',2000,62400,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'579',2000,62400,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'580',2000,62400,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'581',2000,64600,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'582',2000,62400,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'583',2000,62400,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'584',2000,62400,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'585',2000,64600,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
+'586',2000,81500,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'587',2000,62400,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'588',2000,62400,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'589',2000,62400,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_322 b/src/main/res-current/raw/current_gtfs_schedule_stop_322
index 125a37e3b..5b11cd5c6 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_322
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_322
@@ -1,12 +1,12 @@
-'576',2001,80300,,'',0,10300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'577',2001,64500,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'578',2001,64500,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'579',2001,64500,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'580',2001,64500,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'581',2001,80900,,'',0,10000,,'',0,4800,,'',0,14300,,'',0,10600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'582',2001,64500,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'577',2700,70500,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'578',2700,70500,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'579',2700,70500,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'580',2700,70500,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'582',2700,70500,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'583',2001,64500,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'584',2001,64500,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'585',2001,80900,,'',0,10000,,'',0,4800,,'',0,14300,,'',0,10600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'586',2001,80300,,'',0,10300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'587',2001,64500,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'588',2001,64500,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'589',2001,64500,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'583',2700,70500,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'584',2700,70500,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'587',2700,70500,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'588',2700,70500,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'589',2700,70500,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_323 b/src/main/res-current/raw/current_gtfs_schedule_stop_323
index 64e774464..c4f650abb 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_323
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_323
@@ -1,14 +1,14 @@
-'576',801,62900,,'',0,27400,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,8800,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'577',801,61000,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'578',801,61000,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'579',801,61000,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'580',801,61000,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'581',801,62900,,'',0,10200,,'',0,8000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
-'582',801,61000,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'576',1000,80100,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
-'577',1000,60200,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'578',1000,60200,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'579',1000,60200,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'580',1000,60200,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'581',1000,75800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'582',1000,60200,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'583',801,61000,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'584',801,61000,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'585',801,62900,,'',0,10200,,'',0,8000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
+'586',801,62900,,'',0,27400,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,8800,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'587',801,61000,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'588',801,61000,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'589',801,61000,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'583',1000,60200,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'584',1000,60200,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'585',1000,75800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'586',1000,80100,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
+'587',1000,60200,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'588',1000,60200,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'589',1000,60200,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_324 b/src/main/res-current/raw/current_gtfs_schedule_stop_324
index a93a0091c..aa7580ea9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_324
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_324
@@ -1,14 +1,14 @@
-'576',800,71700,,'',0,10500,,'',0,9000,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8800,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
-'577',800,61500,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5600,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'578',800,61500,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5600,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'579',800,61500,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5600,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'580',800,61500,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5600,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'581',800,64000,,'',0,7600,,'',0,8500,,'',0,3700,,'',0,7500,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'582',800,61500,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5600,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'576',1001,85500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'577',1001,65000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6100,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'578',1001,65000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6100,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'579',1001,65000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6100,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'580',1001,65000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6100,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'581',1001,83100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',1001,65000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6100,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'583',800,61500,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5600,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'584',800,61500,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5600,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'585',800,64000,,'',0,7600,,'',0,8500,,'',0,3700,,'',0,7500,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
+'586',800,71700,,'',0,10500,,'',0,9000,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8800,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
+'587',800,61500,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5600,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'588',800,61500,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5600,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'589',800,61500,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5600,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'583',1001,65000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6100,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'584',1001,65000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6100,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'585',1001,83100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',1001,85500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'587',1001,65000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6100,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'588',1001,65000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6100,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'589',1001,65000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6100,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_325 b/src/main/res-current/raw/current_gtfs_schedule_stop_325
index d7d191220..9f0409b74 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_325
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_325
@@ -1,7 +1,7 @@
-'576',1900,81200,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'577',1900,65700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
-'578',1900,65700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
-'579',1900,65700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
-'580',1900,65700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
-'581',1900,74200,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'582',1900,65700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
+'583',1900,65700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
+'584',1900,65700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
+'585',1900,74200,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'586',1900,81200,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'587',1900,65700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
+'588',1900,65700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
+'589',1900,65700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_327 b/src/main/res-current/raw/current_gtfs_schedule_stop_327
index 701e6207e..46131faaa 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_327
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_327
@@ -1,7 +1,7 @@
-'576',1800,74300,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'577',1800,62900,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'578',1800,62900,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'579',1800,62900,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'580',1800,62900,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'581',1800,74300,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8300,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'582',1800,62900,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'583',1800,62900,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'584',1800,62900,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'585',1800,74300,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8300,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'586',1800,74300,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'587',1800,62900,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'588',1800,62900,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'589',1800,62900,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_328 b/src/main/res-current/raw/current_gtfs_schedule_stop_328
index 33e021dec..1fd0d6c6d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_328
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_328
@@ -1,12 +1,12 @@
-'576',1100,80500,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'577',1100,64900,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'578',1100,64900,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'579',1100,64900,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'580',1100,64900,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'581',1100,75200,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,4800,0,'Orchard Pk',0,2200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'582',1100,64900,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'577',1400,122100,,'',0,73600,,'',0
-'578',1400,122100,,'',0,73600,,'',0
-'579',1400,122100,,'',0,73600,,'',0
-'580',1400,122100,,'',0,73600,,'',0
-'582',1400,122100,,'',0,73600,,'',0
+'583',1100,64900,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'584',1100,64900,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'585',1100,75200,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,4800,0,'Orchard Pk',0,2200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'586',1100,80500,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'587',1100,64900,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'588',1100,64900,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'589',1100,64900,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'583',1400,122100,,'',0,73600,,'',0
+'584',1400,122100,,'',0,73600,,'',0
+'587',1400,122100,,'',0,73600,,'',0
+'588',1400,122100,,'',0,73600,,'',0
+'589',1400,122100,,'',0,73600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_329 b/src/main/res-current/raw/current_gtfs_schedule_stop_329
index 7c8226625..6e161cb57 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_329
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_329
@@ -1,5 +1,5 @@
-'577',2700,64000,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'578',2700,64000,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'579',2700,64000,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'580',2700,64000,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'582',2700,64000,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'583',2700,64000,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'584',2700,64000,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'587',2700,64000,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'588',2700,64000,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'589',2700,64000,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_33 b/src/main/res-current/raw/current_gtfs_schedule_stop_33
index c6a4b997b..980817223 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_33
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_33
@@ -1,7 +1,7 @@
-'576',900,121900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',900,93600,,'',0,31200,,'',0,28800,,'',0
-'578',900,93600,,'',0,31200,,'',0,28800,,'',0
-'579',900,93600,,'',0,31200,,'',0,28800,,'',0
-'580',900,93600,,'',0,31200,,'',0,28800,,'',0
-'581',900,121900,,'',0,8500,,'',0,20500,,'',0,4500,,'',0
-'582',900,93600,,'',0,31200,,'',0,28800,,'',0
+'583',900,93600,,'',0,31200,,'',0,28800,,'',0
+'584',900,93600,,'',0,31200,,'',0,28800,,'',0
+'585',900,121900,,'',0,8500,,'',0,20500,,'',0,4500,,'',0
+'586',900,121900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',900,93600,,'',0,31200,,'',0,28800,,'',0
+'588',900,93600,,'',0,31200,,'',0,28800,,'',0
+'589',900,93600,,'',0,31200,,'',0,28800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_330 b/src/main/res-current/raw/current_gtfs_schedule_stop_330
index 1d06793a0..daf9148c3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_330
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_330
@@ -1,7 +1,7 @@
-'576',1200,92200,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
-'577',1200,71700,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'578',1200,71700,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'579',1200,71700,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'580',1200,71700,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'581',1200,94900,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
-'582',1200,71700,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'583',1200,71700,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'584',1200,71700,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'585',1200,94900,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
+'586',1200,92200,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
+'587',1200,71700,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'588',1200,71700,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'589',1200,71700,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_331 b/src/main/res-current/raw/current_gtfs_schedule_stop_331
index 18ae95bbb..de35e223d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_331
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_331
@@ -1,7 +1,7 @@
-'576',1201,90800,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
-'577',1201,70300,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,4600,,'',0,25600,,'',0
-'578',1201,70300,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,4600,,'',0,25600,,'',0
-'579',1201,70300,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,4600,,'',0,25600,,'',0
-'580',1201,70300,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,4600,,'',0,25600,,'',0
-'581',1201,93500,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
-'582',1201,70300,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,4600,,'',0,25600,,'',0
+'583',1201,70300,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,4600,,'',0,25600,,'',0
+'584',1201,70300,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,4600,,'',0,25600,,'',0
+'585',1201,93500,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
+'586',1201,90800,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
+'587',1201,70300,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,4600,,'',0,25600,,'',0
+'588',1201,70300,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,4600,,'',0,25600,,'',0
+'589',1201,70300,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,4600,,'',0,25600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_332 b/src/main/res-current/raw/current_gtfs_schedule_stop_332
index 796746be7..c15fce90d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_332
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_332
@@ -1,7 +1,7 @@
-'576',2000,81400,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'577',2000,62300,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'578',2000,62300,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'579',2000,62300,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'580',2000,62300,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'581',2000,64500,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'582',2000,62300,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'583',2000,62300,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'584',2000,62300,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'585',2000,64500,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
+'586',2000,81400,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'587',2000,62300,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'588',2000,62300,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'589',2000,62300,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_333 b/src/main/res-current/raw/current_gtfs_schedule_stop_333
index e50b5779b..5462bffe5 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_333
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_333
@@ -1,12 +1,12 @@
-'576',2001,80400,,'',0,10300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'577',2001,64600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'578',2001,64600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'579',2001,64600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'580',2001,64600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'581',2001,81000,,'',0,10000,,'',0,4800,,'',0,14300,,'',0,10600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'582',2001,64600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'577',2700,70600,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'578',2700,70600,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'579',2700,70600,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'580',2700,70600,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'582',2700,70600,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'583',2001,64600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'584',2001,64600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'585',2001,81000,,'',0,10000,,'',0,4800,,'',0,14300,,'',0,10600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'586',2001,80400,,'',0,10300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'587',2001,64600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'588',2001,64600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'589',2001,64600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'583',2700,70600,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'584',2700,70600,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'587',2700,70600,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'588',2700,70600,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'589',2700,70600,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_334 b/src/main/res-current/raw/current_gtfs_schedule_stop_334
index 935342d09..767efd1d3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_334
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_334
@@ -1,12 +1,12 @@
-'576',1101,80100,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'577',1101,70500,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'578',1101,70500,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'579',1101,70500,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'580',1101,70500,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'581',1101,82200,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'582',1101,70500,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'577',1401,114000,,'',0,77900,,'',0
-'578',1401,114000,,'',0,77900,,'',0
-'579',1401,114000,,'',0,77900,,'',0
-'580',1401,114000,,'',0,77900,,'',0
-'582',1401,114000,,'',0,77900,,'',0
+'583',1101,70500,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'584',1101,70500,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'585',1101,82200,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'586',1101,80100,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
+'587',1101,70500,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'588',1101,70500,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'589',1101,70500,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'583',1401,114000,,'',0,77900,,'',0
+'584',1401,114000,,'',0,77900,,'',0
+'587',1401,114000,,'',0,77900,,'',0
+'588',1401,114000,,'',0,77900,,'',0
+'589',1401,114000,,'',0,77900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_335 b/src/main/res-current/raw/current_gtfs_schedule_stop_335
index d1c263ec8..8283c7cd2 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_335
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_335
@@ -1,7 +1,7 @@
-'576',1800,74400,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'577',1800,63000,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'578',1800,63000,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'579',1800,63000,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'580',1800,63000,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'581',1800,74400,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8300,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'582',1800,63000,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'583',1800,63000,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'584',1800,63000,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'585',1800,74400,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8300,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'586',1800,74400,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'587',1800,63000,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'588',1800,63000,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'589',1800,63000,,'',0,7500,,'',0,2600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_336 b/src/main/res-current/raw/current_gtfs_schedule_stop_336
index 5ef4c29bd..e546549df 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_336
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_336
@@ -1,7 +1,7 @@
-'576',2001,75600,,'',0,10300,,'',0,14400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'577',2001,63700,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'578',2001,63700,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'579',2001,63700,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'580',2001,63700,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'581',2001,80200,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,10600,,'',0,14400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'582',2001,63700,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'583',2001,63700,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'584',2001,63700,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'585',2001,80200,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,10600,,'',0,14400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'586',2001,75600,,'',0,10300,,'',0,14400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'587',2001,63700,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'588',2001,63700,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'589',2001,63700,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_337 b/src/main/res-current/raw/current_gtfs_schedule_stop_337
index f144a08d3..9b7f8daea 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_337
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_337
@@ -1,14 +1,14 @@
-'576',801,62800,,'',0,27400,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,8700,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'577',801,60900,,'',0,4500,,'',0,6600,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
-'578',801,60900,,'',0,4500,,'',0,6600,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
-'579',801,60900,,'',0,4500,,'',0,6600,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
-'580',801,60900,,'',0,4500,,'',0,6600,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
-'581',801,62800,,'',0,10200,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
-'582',801,60900,,'',0,4500,,'',0,6600,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
-'576',1000,80000,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
-'577',1000,60100,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'578',1000,60100,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'579',1000,60100,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'580',1000,60100,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'581',1000,75700,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'582',1000,60100,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'583',801,60900,,'',0,4500,,'',0,6600,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
+'584',801,60900,,'',0,4500,,'',0,6600,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
+'585',801,62800,,'',0,10200,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
+'586',801,62800,,'',0,27400,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,8700,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'587',801,60900,,'',0,4500,,'',0,6600,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
+'588',801,60900,,'',0,4500,,'',0,6600,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
+'589',801,60900,,'',0,4500,,'',0,6600,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
+'583',1000,60100,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'584',1000,60100,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'585',1000,75700,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'586',1000,80000,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
+'587',1000,60100,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'588',1000,60100,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'589',1000,60100,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2000,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_338 b/src/main/res-current/raw/current_gtfs_schedule_stop_338
index f77f19617..30876c6d9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_338
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_338
@@ -1,7 +1,7 @@
-'576',1900,81200,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'577',1900,65800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
-'578',1900,65800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
-'579',1900,65800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
-'580',1900,65800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
-'581',1900,74200,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'582',1900,65800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
+'583',1900,65800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
+'584',1900,65800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
+'585',1900,74200,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'586',1900,81200,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'587',1900,65800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
+'588',1900,65800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
+'589',1900,65800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_339 b/src/main/res-current/raw/current_gtfs_schedule_stop_339
index 3c421bf02..4a8350d4d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_339
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_339
@@ -1,7 +1,7 @@
-'576',2000,82100,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'577',2000,63000,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'578',2000,63000,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'579',2000,63000,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'580',2000,63000,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'581',2000,65200,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'582',2000,63000,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'583',2000,63000,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'584',2000,63000,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'585',2000,65200,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
+'586',2000,82100,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'587',2000,63000,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'588',2000,63000,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'589',2000,63000,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_34 b/src/main/res-current/raw/current_gtfs_schedule_stop_34
index 511b2723f..277bf0407 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_34
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_34
@@ -1,7 +1,7 @@
-'576',901,114900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',901,90400,,'',0,22000,,'',0,38000,,'',0
-'578',901,90400,,'',0,22000,,'',0,38000,,'',0
-'579',901,90400,,'',0,22000,,'',0,38000,,'',0
-'580',901,90400,,'',0,22000,,'',0,38000,,'',0
-'581',901,114900,,'',0,8500,,'',0,29000,,'',0,8500,,'',0
-'582',901,90400,,'',0,22000,,'',0,38000,,'',0
+'583',901,90400,,'',0,22000,,'',0,38000,,'',0
+'584',901,90400,,'',0,22000,,'',0,38000,,'',0
+'585',901,114900,,'',0,8500,,'',0,29000,,'',0,8500,,'',0
+'586',901,114900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',901,90400,,'',0,22000,,'',0,38000,,'',0
+'588',901,90400,,'',0,22000,,'',0,38000,,'',0
+'589',901,90400,,'',0,22000,,'',0,38000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_340 b/src/main/res-current/raw/current_gtfs_schedule_stop_340
index 380d42896..fc4ac5cc5 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_340
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_340
@@ -1,14 +1,14 @@
-'576',800,71700,,'',0,10500,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8900,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
-'577',800,61500,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
-'578',800,61500,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
-'579',800,61500,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
-'580',800,61500,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
-'581',800,64000,,'',0,7600,,'',0,8600,,'',0,3600,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'582',800,61500,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
-'576',1001,85600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'577',1001,65100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'578',1001,65100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'579',1001,65100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'580',1001,65100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'581',1001,83200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',1001,65100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'583',800,61500,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
+'584',800,61500,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
+'585',800,64000,,'',0,7600,,'',0,8600,,'',0,3600,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
+'586',800,71700,,'',0,10500,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8900,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
+'587',800,61500,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
+'588',800,61500,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
+'589',800,61500,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
+'583',1001,65100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'584',1001,65100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'585',1001,83200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',1001,85600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'587',1001,65100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'588',1001,65100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'589',1001,65100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_341 b/src/main/res-current/raw/current_gtfs_schedule_stop_341
index 4588a7978..f23a1e636 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_341
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_341
@@ -1,12 +1,12 @@
-'576',1100,80400,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'577',1100,64800,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'578',1100,64800,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'579',1100,64800,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'580',1100,64800,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'581',1100,75100,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,4800,0,'Orchard Pk',0,2200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'582',1100,64800,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'577',1400,122100,,'',0,73500,,'',0
-'578',1400,122100,,'',0,73500,,'',0
-'579',1400,122100,,'',0,73500,,'',0
-'580',1400,122100,,'',0,73500,,'',0
-'582',1400,122100,,'',0,73500,,'',0
+'583',1100,64800,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'584',1100,64800,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'585',1100,75100,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,4800,0,'Orchard Pk',0,2200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'586',1100,80400,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'587',1100,64800,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'588',1100,64800,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'589',1100,64800,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'583',1400,122100,,'',0,73500,,'',0
+'584',1400,122100,,'',0,73500,,'',0
+'587',1400,122100,,'',0,73500,,'',0
+'588',1400,122100,,'',0,73500,,'',0
+'589',1400,122100,,'',0,73500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_342 b/src/main/res-current/raw/current_gtfs_schedule_stop_342
index 348f26ba3..db717ae3d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_342
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_342
@@ -1,7 +1,7 @@
-'576',1601,92400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
-'577',1601,62400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7900,,'',0,2300,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1601,62400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7900,,'',0,2300,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1601,62400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7900,,'',0,2300,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1601,62400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7900,,'',0,2300,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1601,82500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
-'582',1601,62400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7900,,'',0,2300,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1601,62400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7900,,'',0,2300,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1601,62400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7900,,'',0,2300,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1601,82500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
+'586',1601,92400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
+'587',1601,62400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7900,,'',0,2300,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1601,62400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7900,,'',0,2300,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1601,62400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7900,,'',0,2300,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_343 b/src/main/res-current/raw/current_gtfs_schedule_stop_343
index e50b5779b..5462bffe5 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_343
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_343
@@ -1,12 +1,12 @@
-'576',2001,80400,,'',0,10300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'577',2001,64600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'578',2001,64600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'579',2001,64600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'580',2001,64600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'581',2001,81000,,'',0,10000,,'',0,4800,,'',0,14300,,'',0,10600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'582',2001,64600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'577',2700,70600,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'578',2700,70600,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'579',2700,70600,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'580',2700,70600,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'582',2700,70600,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'583',2001,64600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'584',2001,64600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'585',2001,81000,,'',0,10000,,'',0,4800,,'',0,14300,,'',0,10600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'586',2001,80400,,'',0,10300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'587',2001,64600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'588',2001,64600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'589',2001,64600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'583',2700,70600,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'584',2700,70600,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'587',2700,70600,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'588',2700,70600,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'589',2700,70600,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_344 b/src/main/res-current/raw/current_gtfs_schedule_stop_344
index cf2fae7d2..7774eefe5 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_344
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_344
@@ -1,12 +1,12 @@
-'576',1101,80100,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'577',1101,70500,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'578',1101,70500,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'579',1101,70500,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'580',1101,70500,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'581',1101,82200,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'582',1101,70500,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'577',1401,114100,,'',0,77900,,'',0
-'578',1401,114100,,'',0,77900,,'',0
-'579',1401,114100,,'',0,77900,,'',0
-'580',1401,114100,,'',0,77900,,'',0
-'582',1401,114100,,'',0,77900,,'',0
+'583',1101,70500,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'584',1101,70500,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'585',1101,82200,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'586',1101,80100,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
+'587',1101,70500,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'588',1101,70500,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'589',1101,70500,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'583',1401,114100,,'',0,77900,,'',0
+'584',1401,114100,,'',0,77900,,'',0
+'587',1401,114100,,'',0,77900,,'',0
+'588',1401,114100,,'',0,77900,,'',0
+'589',1401,114100,,'',0,77900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_345 b/src/main/res-current/raw/current_gtfs_schedule_stop_345
index f8a9dd81f..79be181a0 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_345
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_345
@@ -1,5 +1,5 @@
-'577',2700,63900,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'578',2700,63900,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'579',2700,63900,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'580',2700,63900,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'582',2700,63900,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'583',2700,63900,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'584',2700,63900,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'587',2700,63900,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'588',2700,63900,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'589',2700,63900,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_346 b/src/main/res-current/raw/current_gtfs_schedule_stop_346
index 2c7d40623..5cf704e51 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_346
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_346
@@ -1,12 +1,12 @@
-'576',1101,80200,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'577',1101,70600,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'578',1101,70600,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'579',1101,70600,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'580',1101,70600,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'581',1101,82300,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'582',1101,70600,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'577',1401,114100,,'',0,78000,,'',0
-'578',1401,114100,,'',0,78000,,'',0
-'579',1401,114100,,'',0,78000,,'',0
-'580',1401,114100,,'',0,78000,,'',0
-'582',1401,114100,,'',0,78000,,'',0
+'583',1101,70600,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'584',1101,70600,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'585',1101,82300,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'586',1101,80200,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
+'587',1101,70600,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'588',1101,70600,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'589',1101,70600,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'583',1401,114100,,'',0,78000,,'',0
+'584',1401,114100,,'',0,78000,,'',0
+'587',1401,114100,,'',0,78000,,'',0
+'588',1401,114100,,'',0,78000,,'',0
+'589',1401,114100,,'',0,78000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_347 b/src/main/res-current/raw/current_gtfs_schedule_stop_347
index f8df0f1c4..42a0264d9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_347
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_347
@@ -1,12 +1,12 @@
-'576',1100,80300,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'577',1100,64700,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'578',1100,64700,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'579',1100,64700,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'580',1100,64700,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'581',1100,75000,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'582',1100,64700,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'577',1400,122000,,'',0,73600,,'',0
-'578',1400,122000,,'',0,73600,,'',0
-'579',1400,122000,,'',0,73600,,'',0
-'580',1400,122000,,'',0,73600,,'',0
-'582',1400,122000,,'',0,73600,,'',0
+'583',1100,64700,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'584',1100,64700,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'585',1100,75000,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'586',1100,80300,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'587',1100,64700,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'588',1100,64700,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'589',1100,64700,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'583',1400,122000,,'',0,73600,,'',0
+'584',1400,122000,,'',0,73600,,'',0
+'587',1400,122000,,'',0,73600,,'',0
+'588',1400,122000,,'',0,73600,,'',0
+'589',1400,122000,,'',0,73600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_348 b/src/main/res-current/raw/current_gtfs_schedule_stop_348
index 796746be7..c15fce90d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_348
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_348
@@ -1,7 +1,7 @@
-'576',2000,81400,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'577',2000,62300,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'578',2000,62300,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'579',2000,62300,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'580',2000,62300,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'581',2000,64500,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'582',2000,62300,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'583',2000,62300,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'584',2000,62300,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'585',2000,64500,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
+'586',2000,81400,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'587',2000,62300,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'588',2000,62300,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'589',2000,62300,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_35 b/src/main/res-current/raw/current_gtfs_schedule_stop_35
index 4c77eba3f..a34c5a962 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_35
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_35
@@ -1,7 +1,7 @@
-'576',200,82300,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,9900,,'',0
-'577',200,61800,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'578',200,61800,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'579',200,61800,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'580',200,61800,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'581',200,82200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'582',200,61800,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'583',200,61800,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'584',200,61800,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'585',200,82200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
+'586',200,82300,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,9900,,'',0
+'587',200,61800,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'588',200,61800,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'589',200,61800,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_350 b/src/main/res-current/raw/current_gtfs_schedule_stop_350
index 38838e121..c782ba0e1 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_350
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_350
@@ -1,7 +1,7 @@
-'576',3000,74400,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,9300,0,'Downtown',0
-'577',3000,60400,,'',0,2000,,'',0,2000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,1200,0,'Downtown',0,5200,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1600,,'',0,1600,0,'Downtown',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,900,,'',0,4800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2400,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
-'578',3000,60400,,'',0,2000,,'',0,2000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,1200,0,'Downtown',0,5200,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1600,,'',0,1600,0,'Downtown',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,900,,'',0,4800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2400,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
-'579',3000,60400,,'',0,2000,,'',0,2000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,1200,0,'Downtown',0,5200,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1600,,'',0,1600,0,'Downtown',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,900,,'',0,4800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2400,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
-'580',3000,60400,,'',0,2000,,'',0,2000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,1200,0,'Downtown',0,5200,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1600,,'',0,1600,0,'Downtown',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,900,,'',0,4800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2400,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0,4000,0,'Downtown',0,8000,0,'Downtown',0
-'581',3000,74300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7100,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,5700,0,'Downtown',0
-'582',3000,60400,,'',0,2000,,'',0,2000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,1200,0,'Downtown',0,5200,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1600,,'',0,1600,0,'Downtown',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,900,,'',0,4800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2400,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
+'583',3000,60400,,'',0,2000,,'',0,2000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,1200,0,'Downtown',0,5200,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1600,,'',0,1600,0,'Downtown',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,900,,'',0,4800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2400,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
+'584',3000,60400,,'',0,2000,,'',0,2000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,1200,0,'Downtown',0,5200,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1600,,'',0,1600,0,'Downtown',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,900,,'',0,4800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2400,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0,4000,0,'Downtown',0,8000,0,'Downtown',0
+'585',3000,74300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7100,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,5700,0,'Downtown',0
+'586',3000,74400,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,9300,0,'Downtown',0
+'587',3000,60400,,'',0,2000,,'',0,2000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,1200,0,'Downtown',0,5200,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1600,,'',0,1600,0,'Downtown',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,900,,'',0,4800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2400,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
+'588',3000,60400,,'',0,2000,,'',0,2000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,1200,0,'Downtown',0,5200,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1600,,'',0,1600,0,'Downtown',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,900,,'',0,4800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2400,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
+'589',3000,60400,,'',0,2000,,'',0,2000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,1200,0,'Downtown',0,5200,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1600,,'',0,1600,0,'Downtown',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,900,,'',0,4800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2400,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_351 b/src/main/res-current/raw/current_gtfs_schedule_stop_351
index de001f17d..0b7d2a9cc 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_351
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_351
@@ -1,14 +1,14 @@
-'576',1501,83200,,'',0,20000,,'',0,40000,,'',0,27000,,'',0
-'577',1501,70200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'578',1501,70200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'579',1501,70200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'580',1501,70200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'581',1501,93300,,'',0,17000,,'',0,20000,,'',0,20000,,'',0,10200,,'',0,10000,,'',0
-'582',1501,70200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'576',1700,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',1700,60800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,800,,'',0,6600,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,1000,,'',0,2000,,'',0,7900,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1700,60800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,800,,'',0,6600,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,1000,,'',0,2000,,'',0,7900,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1700,60800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,800,,'',0,6600,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,1000,,'',0,2000,,'',0,7900,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1700,60800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,800,,'',0,6600,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,1000,,'',0,2000,,'',0,7900,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1700,83300,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'582',1700,60800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,800,,'',0,6600,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,1000,,'',0,2000,,'',0,7900,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1501,70200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'584',1501,70200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'585',1501,93300,,'',0,17000,,'',0,20000,,'',0,20000,,'',0,10200,,'',0,10000,,'',0
+'586',1501,83200,,'',0,20000,,'',0,40000,,'',0,27000,,'',0
+'587',1501,70200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'588',1501,70200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'589',1501,70200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'583',1700,60800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,800,,'',0,6600,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,1000,,'',0,2000,,'',0,7900,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1700,60800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,800,,'',0,6600,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,1000,,'',0,2000,,'',0,7900,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1700,83300,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'586',1700,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',1700,60800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,800,,'',0,6600,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,1000,,'',0,2000,,'',0,7900,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1700,60800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,800,,'',0,6600,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,1000,,'',0,2000,,'',0,7900,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1700,60800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,800,,'',0,6600,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,1000,,'',0,2000,,'',0,7900,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_352 b/src/main/res-current/raw/current_gtfs_schedule_stop_352
index f8a9dd81f..79be181a0 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_352
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_352
@@ -1,5 +1,5 @@
-'577',2700,63900,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'578',2700,63900,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'579',2700,63900,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'580',2700,63900,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'582',2700,63900,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'583',2700,63900,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'584',2700,63900,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'587',2700,63900,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'588',2700,63900,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'589',2700,63900,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_354 b/src/main/res-current/raw/current_gtfs_schedule_stop_354
index fc7e8c48a..6227e5601 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_354
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_354
@@ -1,14 +1,14 @@
-'576',801,62800,,'',0,27400,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,8800,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'577',801,60900,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,4500,,'',0
-'578',801,60900,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,4500,,'',0
-'579',801,60900,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,4500,,'',0
-'580',801,60900,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,4500,,'',0
-'581',801,62800,,'',0,10200,,'',0,8000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
-'582',801,60900,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,4500,,'',0
-'576',1000,80000,,'',0,12000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
-'577',1000,60000,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'578',1000,60000,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'579',1000,60000,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'580',1000,60000,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'581',1000,75700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'582',1000,60000,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'583',801,60900,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,4500,,'',0
+'584',801,60900,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,4500,,'',0
+'585',801,62800,,'',0,10200,,'',0,8000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
+'586',801,62800,,'',0,27400,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,8800,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'587',801,60900,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,4500,,'',0
+'588',801,60900,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,4500,,'',0
+'589',801,60900,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,4500,,'',0
+'583',1000,60000,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'584',1000,60000,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'585',1000,75700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'586',1000,80000,,'',0,12000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
+'587',1000,60000,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'588',1000,60000,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'589',1000,60000,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_355 b/src/main/res-current/raw/current_gtfs_schedule_stop_355
index 796746be7..c15fce90d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_355
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_355
@@ -1,7 +1,7 @@
-'576',2000,81400,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'577',2000,62300,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'578',2000,62300,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'579',2000,62300,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'580',2000,62300,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'581',2000,64500,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'582',2000,62300,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'583',2000,62300,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'584',2000,62300,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'585',2000,64500,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
+'586',2000,81400,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'587',2000,62300,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'588',2000,62300,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'589',2000,62300,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_356 b/src/main/res-current/raw/current_gtfs_schedule_stop_356
index f8a9dd81f..79be181a0 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_356
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_356
@@ -1,5 +1,5 @@
-'577',2700,63900,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'578',2700,63900,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'579',2700,63900,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'580',2700,63900,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'582',2700,63900,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'583',2700,63900,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'584',2700,63900,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'587',2700,63900,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'588',2700,63900,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'589',2700,63900,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_357 b/src/main/res-current/raw/current_gtfs_schedule_stop_357
index b5c8b66fd..53e41c053 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_357
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_357
@@ -1,7 +1,7 @@
-'576',3001,74500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,10000,,'',0
-'577',3001,54900,,'',0,7700,,'',0,1900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,4700,,'',0,800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,700,,'',0,500,,'',0,1400,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5700,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1700,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,4800,,'',0,900,,'',0,1000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,4900,,'',0,800,,'',0,1700,,'',0,1600,,'',0,5800,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,6600,,'',0,1900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
-'578',3001,54900,,'',0,7700,,'',0,1900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,4700,,'',0,800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,700,,'',0,500,,'',0,1400,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5700,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1700,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,4800,,'',0,900,,'',0,1000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,4900,,'',0,800,,'',0,1700,,'',0,1600,,'',0,5800,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,6600,,'',0,1900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
-'579',3001,54900,,'',0,7700,,'',0,1900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,4700,,'',0,800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,700,,'',0,500,,'',0,1400,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5700,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1700,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,4800,,'',0,900,,'',0,1000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,4900,,'',0,800,,'',0,1700,,'',0,1600,,'',0,5800,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,6600,,'',0,1900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
-'580',3001,54900,,'',0,7700,,'',0,1900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,4700,,'',0,800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,700,,'',0,500,,'',0,1400,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5700,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1700,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,4800,,'',0,900,,'',0,1000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,4900,,'',0,800,,'',0,1700,,'',0,1600,,'',0,5800,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,6600,,'',0,1900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,9000,,'',0,8000,,'',0
-'581',3001,74500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'582',3001,54900,,'',0,7700,,'',0,1900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,4700,,'',0,800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,700,,'',0,500,,'',0,1400,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5700,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1700,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,4800,,'',0,900,,'',0,1000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,4900,,'',0,800,,'',0,1700,,'',0,1600,,'',0,5800,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,6600,,'',0,1900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
+'583',3001,54900,,'',0,7700,,'',0,1900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,4700,,'',0,800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,700,,'',0,500,,'',0,1400,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5700,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1700,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,4800,,'',0,900,,'',0,1000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,4900,,'',0,800,,'',0,1700,,'',0,1600,,'',0,5800,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,6600,,'',0,1900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
+'584',3001,54900,,'',0,7700,,'',0,1900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,4700,,'',0,800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,700,,'',0,500,,'',0,1400,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5700,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1700,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,4800,,'',0,900,,'',0,1000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,4900,,'',0,800,,'',0,1700,,'',0,1600,,'',0,5800,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,6600,,'',0,1900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,9000,,'',0,8000,,'',0
+'585',3001,74500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'586',3001,74500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,10000,,'',0
+'587',3001,54900,,'',0,7700,,'',0,1900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,4700,,'',0,800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,700,,'',0,500,,'',0,1400,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5700,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1700,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,4800,,'',0,900,,'',0,1000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,4900,,'',0,800,,'',0,1700,,'',0,1600,,'',0,5800,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,6600,,'',0,1900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
+'588',3001,54900,,'',0,7700,,'',0,1900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,4700,,'',0,800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,700,,'',0,500,,'',0,1400,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5700,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1700,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,4800,,'',0,900,,'',0,1000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,4900,,'',0,800,,'',0,1700,,'',0,1600,,'',0,5800,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,6600,,'',0,1900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
+'589',3001,54900,,'',0,7700,,'',0,1900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,4700,,'',0,800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,700,,'',0,500,,'',0,1400,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5700,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1700,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,4800,,'',0,900,,'',0,1000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,4900,,'',0,800,,'',0,1700,,'',0,1600,,'',0,5800,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,6600,,'',0,1900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_358 b/src/main/res-current/raw/current_gtfs_schedule_stop_358
index 8cc6266c0..65fa7247c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_358
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_358
@@ -1,14 +1,14 @@
-'576',800,71800,,'',0,10500,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
-'577',800,61600,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'578',800,61600,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'579',800,61600,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'580',800,61600,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'581',800,64100,,'',0,7600,,'',0,8500,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'582',800,61600,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'576',1001,85700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'577',1001,65100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'578',1001,65100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'579',1001,65100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'580',1001,65100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'581',1001,83300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',1001,65100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'583',800,61600,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'584',800,61600,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'585',800,64100,,'',0,7600,,'',0,8500,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
+'586',800,71800,,'',0,10500,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
+'587',800,61600,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'588',800,61600,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'589',800,61600,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'583',1001,65100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'584',1001,65100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'585',1001,83300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',1001,85700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'587',1001,65100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'588',1001,65100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'589',1001,65100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_359 b/src/main/res-current/raw/current_gtfs_schedule_stop_359
index 66c018a16..cd0855e8f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_359
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_359
@@ -1,31 +1,31 @@
-'576',2400,72400,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
-'577',2400,60600,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,14300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'578',2400,60600,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,14300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'579',2400,60600,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,14300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'580',2400,60600,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,14300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'581',2400,81900,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,14500,,'',0
-'582',2400,60600,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,14300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'576',2500,102800,,'',0,22800,,'',0,29100,,'',0,26900,,'',0
-'577',2500,71600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'578',2500,71600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'579',2500,71600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'580',2500,71600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'581',2500,94400,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
-'582',2500,71600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'577',2601,71200,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
-'578',2601,71200,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
-'579',2601,71200,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
-'580',2601,71200,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
-'582',2601,71200,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
-'577',2700,70700,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'578',2700,70700,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'579',2700,70700,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'580',2700,70700,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'582',2700,70700,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'576',139001,71600,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
-'577',139001,61000,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,8200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
-'578',139001,61000,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,8200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
-'579',139001,61000,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,8200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
-'580',139001,61000,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,8200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
-'581',139001,73500,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,5100,,'',0,16400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
-'582',139001,61000,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,8200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
+'583',2400,60600,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,14300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'584',2400,60600,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,14300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'585',2400,81900,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,14500,,'',0
+'586',2400,72400,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
+'587',2400,60600,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,14300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'588',2400,60600,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,14300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'589',2400,60600,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,14300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'583',2500,71600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'584',2500,71600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'585',2500,94400,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
+'586',2500,102800,,'',0,22800,,'',0,29100,,'',0,26900,,'',0
+'587',2500,71600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'588',2500,71600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'589',2500,71600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'583',2601,71200,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
+'584',2601,71200,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
+'587',2601,71200,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
+'588',2601,71200,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
+'589',2601,71200,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
+'583',2700,70700,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'584',2700,70700,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'587',2700,70700,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'588',2700,70700,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'589',2700,70700,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'583',139001,61000,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,8200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
+'584',139001,61000,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,8200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
+'585',139001,73500,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,5100,,'',0,16400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
+'586',139001,71600,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
+'587',139001,61000,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,8200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
+'588',139001,61000,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,8200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
+'589',139001,61000,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,8200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_36 b/src/main/res-current/raw/current_gtfs_schedule_stop_36
index d3f84a7ee..ebba03e95 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_36
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_36
@@ -1,14 +1,14 @@
-'576',901,114900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',901,90400,,'',0,22000,,'',0,38000,,'',0
-'578',901,90400,,'',0,22000,,'',0,38000,,'',0
-'579',901,90400,,'',0,22000,,'',0,38000,,'',0
-'580',901,90400,,'',0,22000,,'',0,38000,,'',0
-'581',901,114900,,'',0,8500,,'',0,29000,,'',0,8500,,'',0
-'582',901,90400,,'',0,22000,,'',0,38000,,'',0
-'576',1001,83700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'577',1001,63200,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'578',1001,63200,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'579',1001,63200,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'580',1001,63200,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'581',1001,81100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',1001,63200,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'583',901,90400,,'',0,22000,,'',0,38000,,'',0
+'584',901,90400,,'',0,22000,,'',0,38000,,'',0
+'585',901,114900,,'',0,8500,,'',0,29000,,'',0,8500,,'',0
+'586',901,114900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',901,90400,,'',0,22000,,'',0,38000,,'',0
+'588',901,90400,,'',0,22000,,'',0,38000,,'',0
+'589',901,90400,,'',0,22000,,'',0,38000,,'',0
+'583',1001,63200,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'584',1001,63200,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'585',1001,81100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',1001,83700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'587',1001,63200,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'588',1001,63200,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'589',1001,63200,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_360 b/src/main/res-current/raw/current_gtfs_schedule_stop_360
index 63706e37d..5368ca9d0 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_360
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_360
@@ -1,7 +1,7 @@
-'576',2001,75500,,'',0,10300,,'',0,14400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'577',2001,63700,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'578',2001,63700,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'579',2001,63700,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'580',2001,63700,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'581',2001,80100,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,10600,,'',0,14400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'582',2001,63700,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'583',2001,63700,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'584',2001,63700,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'585',2001,80100,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,10600,,'',0,14400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'586',2001,75500,,'',0,10300,,'',0,14400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'587',2001,63700,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'588',2001,63700,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'589',2001,63700,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_361 b/src/main/res-current/raw/current_gtfs_schedule_stop_361
index 3c421bf02..4a8350d4d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_361
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_361
@@ -1,7 +1,7 @@
-'576',2000,82100,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'577',2000,63000,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'578',2000,63000,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'579',2000,63000,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'580',2000,63000,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'581',2000,65200,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'582',2000,63000,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'583',2000,63000,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'584',2000,63000,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'585',2000,65200,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
+'586',2000,82100,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'587',2000,63000,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'588',2000,63000,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'589',2000,63000,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_362 b/src/main/res-current/raw/current_gtfs_schedule_stop_362
index f434479c3..cec2f9e58 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_362
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_362
@@ -1,12 +1,12 @@
-'576',1100,80200,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'577',1100,64600,,'',0,8700,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'578',1100,64600,,'',0,8700,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'579',1100,64600,,'',0,8700,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'580',1100,64600,,'',0,8700,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'581',1100,74900,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'582',1100,64600,,'',0,8700,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'577',1400,121900,,'',0,73600,,'',0
-'578',1400,121900,,'',0,73600,,'',0
-'579',1400,121900,,'',0,73600,,'',0
-'580',1400,121900,,'',0,73600,,'',0
-'582',1400,121900,,'',0,73600,,'',0
+'583',1100,64600,,'',0,8700,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'584',1100,64600,,'',0,8700,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'585',1100,74900,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'586',1100,80200,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'587',1100,64600,,'',0,8700,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'588',1100,64600,,'',0,8700,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'589',1100,64600,,'',0,8700,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'583',1400,121900,,'',0,73600,,'',0
+'584',1400,121900,,'',0,73600,,'',0
+'587',1400,121900,,'',0,73600,,'',0
+'588',1400,121900,,'',0,73600,,'',0
+'589',1400,121900,,'',0,73600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_363 b/src/main/res-current/raw/current_gtfs_schedule_stop_363
index 11eb71173..d6367c5b9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_363
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_363
@@ -1,7 +1,7 @@
-'576',1601,92400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
-'577',1601,62400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1601,62400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1601,62400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1601,62400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1601,82500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
-'582',1601,62400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1601,62400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1601,62400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1601,82500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
+'586',1601,92400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
+'587',1601,62400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1601,62400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1601,62400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_364 b/src/main/res-current/raw/current_gtfs_schedule_stop_364
index e4dd2aab0..6aee0d5a3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_364
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_364
@@ -1,14 +1,14 @@
-'576',801,62700,,'',0,27400,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'577',801,60800,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'578',801,60800,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'579',801,60800,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'580',801,60800,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'581',801,62700,,'',0,10200,,'',0,8000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
-'582',801,60800,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'576',1000,75900,,'',0,16100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
-'577',1000,60000,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'578',1000,60000,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'579',1000,60000,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'580',1000,60000,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'581',1000,75600,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'582',1000,60000,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'583',801,60800,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'584',801,60800,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'585',801,62700,,'',0,10200,,'',0,8000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
+'586',801,62700,,'',0,27400,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'587',801,60800,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'588',801,60800,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'589',801,60800,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'583',1000,60000,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'584',1000,60000,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'585',1000,75600,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'586',1000,75900,,'',0,16100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
+'587',1000,60000,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'588',1000,60000,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'589',1000,60000,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_365 b/src/main/res-current/raw/current_gtfs_schedule_stop_365
index f571fc0af..ef235b5d3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_365
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_365
@@ -1,12 +1,12 @@
-'576',1101,80300,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'577',1101,70700,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'578',1101,70700,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'579',1101,70700,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'580',1101,70700,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'581',1101,82400,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'582',1101,70700,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'577',1401,114200,,'',0,77900,,'',0
-'578',1401,114200,,'',0,77900,,'',0
-'579',1401,114200,,'',0,77900,,'',0
-'580',1401,114200,,'',0,77900,,'',0
-'582',1401,114200,,'',0,77900,,'',0
+'583',1101,70700,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'584',1101,70700,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'585',1101,82400,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'586',1101,80300,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
+'587',1101,70700,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'588',1101,70700,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'589',1101,70700,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'583',1401,114200,,'',0,77900,,'',0
+'584',1401,114200,,'',0,77900,,'',0
+'587',1401,114200,,'',0,77900,,'',0
+'588',1401,114200,,'',0,77900,,'',0
+'589',1401,114200,,'',0,77900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_366 b/src/main/res-current/raw/current_gtfs_schedule_stop_366
index bd886a288..becaf9f4c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_366
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_366
@@ -1,14 +1,14 @@
-'576',800,71800,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
-'577',800,61600,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
-'578',800,61600,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
-'579',800,61600,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
-'580',800,61600,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
-'581',800,64100,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'582',800,61600,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
-'576',1001,85800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'577',1001,65200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'578',1001,65200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'579',1001,65200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'580',1001,65200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'581',1001,83400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',1001,65200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'583',800,61600,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
+'584',800,61600,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
+'585',800,64100,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
+'586',800,71800,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
+'587',800,61600,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
+'588',800,61600,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
+'589',800,61600,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
+'583',1001,65200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'584',1001,65200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'585',1001,83400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',1001,85800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'587',1001,65200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'588',1001,65200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'589',1001,65200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_367 b/src/main/res-current/raw/current_gtfs_schedule_stop_367
index 1c721e058..ff4a8a805 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_367
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_367
@@ -1,31 +1,31 @@
-'576',2400,72500,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,14100,,'',0,5900,,'',0
-'577',2400,60700,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,14300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'578',2400,60700,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,14300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'579',2400,60700,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,14300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'580',2400,60700,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,14300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'581',2400,82000,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,14500,,'',0
-'582',2400,60700,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,14300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'576',2500,102800,,'',0,22800,,'',0,29100,,'',0,26900,,'',0
-'577',2500,71600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'578',2500,71600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'579',2500,71600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'580',2500,71600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'581',2500,94400,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
-'582',2500,71600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'577',2601,71200,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
-'578',2601,71200,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
-'579',2601,71200,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
-'580',2601,71200,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
-'582',2601,71200,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
-'577',2700,70800,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'578',2700,70800,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'579',2700,70800,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'580',2700,70800,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'582',2700,70800,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'576',139001,71600,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
-'577',139001,61100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
-'578',139001,61100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
-'579',139001,61100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
-'580',139001,61100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
-'581',139001,73500,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,5100,,'',0,16400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
-'582',139001,61100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
+'583',2400,60700,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,14300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'584',2400,60700,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,14300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'585',2400,82000,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,14500,,'',0
+'586',2400,72500,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,14100,,'',0,5900,,'',0
+'587',2400,60700,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,14300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'588',2400,60700,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,14300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'589',2400,60700,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,14300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'583',2500,71600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'584',2500,71600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'585',2500,94400,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
+'586',2500,102800,,'',0,22800,,'',0,29100,,'',0,26900,,'',0
+'587',2500,71600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'588',2500,71600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'589',2500,71600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'583',2601,71200,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
+'584',2601,71200,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
+'587',2601,71200,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
+'588',2601,71200,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
+'589',2601,71200,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
+'583',2700,70800,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'584',2700,70800,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'587',2700,70800,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'588',2700,70800,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'589',2700,70800,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'583',139001,61100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
+'584',139001,61100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
+'585',139001,73500,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,5100,,'',0,16400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
+'586',139001,71600,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
+'587',139001,61100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
+'588',139001,61100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
+'589',139001,61100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_368 b/src/main/res-current/raw/current_gtfs_schedule_stop_368
index 03c75ea76..e9af1a03a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_368
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_368
@@ -1,7 +1,7 @@
-'576',2000,81300,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'577',2000,62200,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'578',2000,62200,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'579',2000,62200,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'580',2000,62200,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'581',2000,64400,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'582',2000,62200,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'583',2000,62200,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'584',2000,62200,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'585',2000,64400,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
+'586',2000,81300,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'587',2000,62200,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'588',2000,62200,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'589',2000,62200,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_369 b/src/main/res-current/raw/current_gtfs_schedule_stop_369
index a46d76baf..88ed5b1da 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_369
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_369
@@ -1,9 +1,9 @@
-'576',1000,232100,0,'North Rutland',0
-'576',1001,90800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
-'577',1001,54600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'578',1001,54600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'579',1001,54600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'580',1001,54600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'581',1000,251100,0,'North Rutland',0
-'581',1001,84500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',1001,54600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'583',1001,54600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'584',1001,54600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'585',1000,251100,0,'North Rutland',0
+'585',1001,84500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',1000,232100,0,'North Rutland',0
+'586',1001,90800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
+'587',1001,54600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'588',1001,54600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'589',1001,54600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_37 b/src/main/res-current/raw/current_gtfs_schedule_stop_37
index 9b67d7a8f..4a1281a17 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_37
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_37
@@ -1,14 +1,14 @@
-'576',700,90100,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'577',700,71200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'578',700,71200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'579',700,71200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'580',700,71200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'581',700,82400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',700,71200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'576',1801,82700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'577',1801,64300,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
-'578',1801,64300,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
-'579',1801,64300,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
-'580',1801,64300,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
-'581',1801,75700,,'',0,14300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'582',1801,64300,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
+'583',700,71200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'584',700,71200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'585',700,82400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',700,90100,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'587',700,71200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'588',700,71200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'589',700,71200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'583',1801,64300,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
+'584',1801,64300,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
+'585',1801,75700,,'',0,14300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'586',1801,82700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'587',1801,64300,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
+'588',1801,64300,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
+'589',1801,64300,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_370 b/src/main/res-current/raw/current_gtfs_schedule_stop_370
index 758200631..018482ed7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_370
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_370
@@ -1,7 +1,7 @@
-'576',1201,91000,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
-'577',1201,70500,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'578',1201,70500,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'579',1201,70500,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'580',1201,70500,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'581',1201,93700,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
-'582',1201,70500,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'583',1201,70500,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'584',1201,70500,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'585',1201,93700,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
+'586',1201,91000,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
+'587',1201,70500,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'588',1201,70500,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'589',1201,70500,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_371 b/src/main/res-current/raw/current_gtfs_schedule_stop_371
index 624095e6a..6d99e505b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_371
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_371
@@ -1,7 +1,7 @@
-'576',1200,92000,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
-'577',1200,71500,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'578',1200,71500,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'579',1200,71500,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'580',1200,71500,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'581',1200,94700,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
-'582',1200,71500,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'583',1200,71500,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'584',1200,71500,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'585',1200,94700,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
+'586',1200,92000,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
+'587',1200,71500,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'588',1200,71500,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'589',1200,71500,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_372 b/src/main/res-current/raw/current_gtfs_schedule_stop_372
index 57d4b5d18..7167f0bff 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_372
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_372
@@ -1,7 +1,7 @@
-'576',1001,90600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
-'577',1001,54400,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'578',1001,54400,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'579',1001,54400,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'580',1001,54400,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'581',1001,84300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',1001,54400,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'583',1001,54400,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'584',1001,54400,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'585',1001,84300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',1001,90600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
+'587',1001,54400,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'588',1001,54400,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'589',1001,54400,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_373 b/src/main/res-current/raw/current_gtfs_schedule_stop_373
index d0a76897a..3a81eae89 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_373
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_373
@@ -1,7 +1,7 @@
-'576',1001,90700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
-'577',1001,54500,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'578',1001,54500,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'579',1001,54500,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'580',1001,54500,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'581',1001,84400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',1001,54500,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'583',1001,54500,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'584',1001,54500,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'585',1001,84400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',1001,90700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
+'587',1001,54500,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'588',1001,54500,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'589',1001,54500,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_374 b/src/main/res-current/raw/current_gtfs_schedule_stop_374
index e144d3b7d..68ebc23a8 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_374
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_374
@@ -1,12 +1,12 @@
-'576',1101,80400,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'577',1101,70700,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'578',1101,70700,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'579',1101,70700,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'580',1101,70700,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'581',1101,82500,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'582',1101,70700,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'577',1401,114300,,'',0,77900,,'',0
-'578',1401,114300,,'',0,77900,,'',0
-'579',1401,114300,,'',0,77900,,'',0
-'580',1401,114300,,'',0,77900,,'',0
-'582',1401,114300,,'',0,77900,,'',0
+'583',1101,70700,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'584',1101,70700,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'585',1101,82500,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'586',1101,80400,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
+'587',1101,70700,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'588',1101,70700,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'589',1101,70700,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'583',1401,114300,,'',0,77900,,'',0
+'584',1401,114300,,'',0,77900,,'',0
+'587',1401,114300,,'',0,77900,,'',0
+'588',1401,114300,,'',0,77900,,'',0
+'589',1401,114300,,'',0,77900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_375 b/src/main/res-current/raw/current_gtfs_schedule_stop_375
index 836886dda..a21a6f40e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_375
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_375
@@ -1,7 +1,7 @@
-'576',1601,92300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
-'577',1601,62300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1601,62300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1601,62300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1601,62300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1601,82400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
-'582',1601,62300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1601,62300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1601,62300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1601,82400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
+'586',1601,92300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
+'587',1601,62300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1601,62300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1601,62300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_376 b/src/main/res-current/raw/current_gtfs_schedule_stop_376
index f3fe65378..131722cb2 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_376
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_376
@@ -1,12 +1,12 @@
-'576',1100,80200,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'577',1100,64600,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'578',1100,64600,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'579',1100,64600,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'580',1100,64600,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'581',1100,74900,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'582',1100,64600,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'577',1400,121900,,'',0,73600,,'',0
-'578',1400,121900,,'',0,73600,,'',0
-'579',1400,121900,,'',0,73600,,'',0
-'580',1400,121900,,'',0,73600,,'',0
-'582',1400,121900,,'',0,73600,,'',0
+'583',1100,64600,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'584',1100,64600,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'585',1100,74900,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'586',1100,80200,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'587',1100,64600,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'588',1100,64600,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'589',1100,64600,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'583',1400,121900,,'',0,73600,,'',0
+'584',1400,121900,,'',0,73600,,'',0
+'587',1400,121900,,'',0,73600,,'',0
+'588',1400,121900,,'',0,73600,,'',0
+'589',1400,121900,,'',0,73600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_377 b/src/main/res-current/raw/current_gtfs_schedule_stop_377
index 0e744d49c..9e162a015 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_377
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_377
@@ -1,7 +1,7 @@
-'576',1001,90800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
-'577',1001,54600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6200,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'578',1001,54600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6200,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'579',1001,54600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6200,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'580',1001,54600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6200,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'581',1001,84400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',1001,54600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6200,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'583',1001,54600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6200,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'584',1001,54600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6200,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'585',1001,84400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',1001,90800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
+'587',1001,54600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6200,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'588',1001,54600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6200,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'589',1001,54600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6200,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_378 b/src/main/res-current/raw/current_gtfs_schedule_stop_378
index c5d742fa0..5f813420e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_378
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_378
@@ -1,7 +1,7 @@
-'576',1501,84800,,'',0,20000,,'',0,40000,,'',0,27000,,'',0
-'577',1501,71800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'578',1501,71800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'579',1501,71800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'580',1501,71800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'581',1501,94900,,'',0,17000,,'',0,20000,,'',0,20000,,'',0,10200,,'',0,10000,,'',0
-'582',1501,71800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'583',1501,71800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'584',1501,71800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'585',1501,94900,,'',0,17000,,'',0,20000,,'',0,20000,,'',0,10200,,'',0,10000,,'',0
+'586',1501,84800,,'',0,20000,,'',0,40000,,'',0,27000,,'',0
+'587',1501,71800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'588',1501,71800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'589',1501,71800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_379 b/src/main/res-current/raw/current_gtfs_schedule_stop_379
index f859c384a..53f31c182 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_379
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_379
@@ -1,7 +1,7 @@
-'576',1501,84600,,'',0,20000,,'',0,40000,,'',0,27000,,'',0
-'577',1501,71600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'578',1501,71600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'579',1501,71600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'580',1501,71600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'581',1501,94700,,'',0,17000,,'',0,20000,,'',0,20000,,'',0,10200,,'',0,10000,,'',0
-'582',1501,71600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'583',1501,71600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'584',1501,71600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'585',1501,94700,,'',0,17000,,'',0,20000,,'',0,20000,,'',0,10200,,'',0,10000,,'',0
+'586',1501,84600,,'',0,20000,,'',0,40000,,'',0,27000,,'',0
+'587',1501,71600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'588',1501,71600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'589',1501,71600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_38 b/src/main/res-current/raw/current_gtfs_schedule_stop_38
index b40dbea04..c7acebb20 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_38
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_38
@@ -1,7 +1,7 @@
-'576',300,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11600,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
-'577',300,73600,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'578',300,73600,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'579',300,73600,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'580',300,73600,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'581',300,82300,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'582',300,73600,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'583',300,73600,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'584',300,73600,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'585',300,82300,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
+'586',300,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11600,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
+'587',300,73600,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'588',300,73600,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'589',300,73600,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_380 b/src/main/res-current/raw/current_gtfs_schedule_stop_380
index 57e596807..37bcf45db 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_380
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_380
@@ -1,7 +1,7 @@
-'576',1501,83500,,'',0,20000,,'',0,40000,,'',0,27000,,'',0
-'577',1501,70500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'578',1501,70500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'579',1501,70500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'580',1501,70500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'581',1501,93600,,'',0,17000,,'',0,20000,,'',0,20000,,'',0,10200,,'',0,10000,,'',0
-'582',1501,70500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'583',1501,70500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'584',1501,70500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'585',1501,93600,,'',0,17000,,'',0,20000,,'',0,20000,,'',0,10200,,'',0,10000,,'',0
+'586',1501,83500,,'',0,20000,,'',0,40000,,'',0,27000,,'',0
+'587',1501,70500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'588',1501,70500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'589',1501,70500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_381 b/src/main/res-current/raw/current_gtfs_schedule_stop_381
index 591468160..22ec3102d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_381
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_381
@@ -1,14 +1,14 @@
-'576',800,71900,,'',0,10500,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8900,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
-'577',800,61700,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'578',800,61700,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'579',800,61700,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'580',800,61700,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'581',800,64200,,'',0,7600,,'',0,8600,,'',0,3600,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'582',800,61700,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'576',1001,85900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'577',1001,65200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'578',1001,65200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'579',1001,65200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'580',1001,65200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'581',1001,83500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',1001,65200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'583',800,61700,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'584',800,61700,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'585',800,64200,,'',0,7600,,'',0,8600,,'',0,3600,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
+'586',800,71900,,'',0,10500,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8900,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
+'587',800,61700,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'588',800,61700,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'589',800,61700,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,5300,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'583',1001,65200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'584',1001,65200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'585',1001,83500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',1001,85900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'587',1001,65200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'588',1001,65200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'589',1001,65200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_382 b/src/main/res-current/raw/current_gtfs_schedule_stop_382
index e45456fd8..c366bfd43 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_382
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_382
@@ -1,14 +1,14 @@
-'576',801,62700,,'',0,27400,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'577',801,60800,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'578',801,60800,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'579',801,60800,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'580',801,60800,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'581',801,62700,,'',0,10200,,'',0,8000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
-'582',801,60800,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'576',1000,75900,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
-'577',1000,55900,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'578',1000,55900,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'579',1000,55900,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'580',1000,55900,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'581',1000,75600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'582',1000,55900,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'583',801,60800,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'584',801,60800,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'585',801,62700,,'',0,10200,,'',0,8000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
+'586',801,62700,,'',0,27400,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'587',801,60800,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'588',801,60800,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'589',801,60800,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'583',1000,55900,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'584',1000,55900,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'585',1000,75600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'586',1000,75900,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
+'587',1000,55900,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'588',1000,55900,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'589',1000,55900,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,8200,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_383 b/src/main/res-current/raw/current_gtfs_schedule_stop_383
index cb8e9492d..f81f152e5 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_383
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_383
@@ -1,7 +1,7 @@
-'576',1501,83400,,'',0,20000,,'',0,40000,,'',0,27000,,'',0
-'577',1501,70400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'578',1501,70400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'579',1501,70400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'580',1501,70400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'581',1501,93500,,'',0,17000,,'',0,20000,,'',0,20000,,'',0,10200,,'',0,10000,,'',0
-'582',1501,70400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'583',1501,70400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'584',1501,70400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'585',1501,93500,,'',0,17000,,'',0,20000,,'',0,20000,,'',0,10200,,'',0,10000,,'',0
+'586',1501,83400,,'',0,20000,,'',0,40000,,'',0,27000,,'',0
+'587',1501,70400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'588',1501,70400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'589',1501,70400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_384 b/src/main/res-current/raw/current_gtfs_schedule_stop_384
index f09b467ab..a6740729c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_384
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_384
@@ -1,7 +1,7 @@
-'576',2000,81200,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'577',2000,62100,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'578',2000,62100,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'579',2000,62100,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'580',2000,62100,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'581',2000,64300,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'582',2000,62100,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'583',2000,62100,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'584',2000,62100,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'585',2000,64300,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
+'586',2000,81200,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'587',2000,62100,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'588',2000,62100,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'589',2000,62100,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_385 b/src/main/res-current/raw/current_gtfs_schedule_stop_385
index e07af772e..7c2bf946f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_385
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_385
@@ -1,9 +1,9 @@
-'576',1000,232200,0,'North Rutland',0
-'576',1001,91100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
-'577',1001,54900,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'578',1001,54900,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'579',1001,54900,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'580',1001,54900,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'581',1000,251200,0,'North Rutland',0
-'581',1001,84800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',1001,54900,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'583',1001,54900,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'584',1001,54900,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'585',1000,251200,0,'North Rutland',0
+'585',1001,84800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',1000,232200,0,'North Rutland',0
+'586',1001,91100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
+'587',1001,54900,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'588',1001,54900,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'589',1001,54900,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_386 b/src/main/res-current/raw/current_gtfs_schedule_stop_386
index eb49c702a..bf9a61fc4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_386
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_386
@@ -1,31 +1,31 @@
-'576',2400,72500,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,14100,,'',0,5900,,'',0
-'577',2400,60700,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,14300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'578',2400,60700,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,14300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'579',2400,60700,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,14300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'580',2400,60700,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,14300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'581',2400,82000,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,14500,,'',0
-'582',2400,60700,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,14300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'576',2500,102900,,'',0,22800,,'',0,29100,,'',0,26900,,'',0
-'577',2500,71700,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'578',2500,71700,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'579',2500,71700,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'580',2500,71700,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'581',2500,94500,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
-'582',2500,71700,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'577',2601,71300,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
-'578',2601,71300,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
-'579',2601,71300,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
-'580',2601,71300,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
-'582',2601,71300,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
-'577',2700,70900,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'578',2700,70900,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'579',2700,70900,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'580',2700,70900,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'582',2700,70900,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'576',139001,71700,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
-'577',139001,61100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
-'578',139001,61100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
-'579',139001,61100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
-'580',139001,61100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
-'581',139001,73600,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,5100,,'',0,16400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
-'582',139001,61100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
+'583',2400,60700,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,14300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'584',2400,60700,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,14300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'585',2400,82000,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,14500,,'',0
+'586',2400,72500,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,14100,,'',0,5900,,'',0
+'587',2400,60700,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,14300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'588',2400,60700,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,14300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'589',2400,60700,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,14300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'583',2500,71700,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'584',2500,71700,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'585',2500,94500,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
+'586',2500,102900,,'',0,22800,,'',0,29100,,'',0,26900,,'',0
+'587',2500,71700,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'588',2500,71700,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'589',2500,71700,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'583',2601,71300,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
+'584',2601,71300,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
+'587',2601,71300,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
+'588',2601,71300,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
+'589',2601,71300,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
+'583',2700,70900,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'584',2700,70900,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'587',2700,70900,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'588',2700,70900,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'589',2700,70900,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'583',139001,61100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
+'584',139001,61100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
+'585',139001,73600,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,5100,,'',0,16400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
+'586',139001,71700,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
+'587',139001,61100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
+'588',139001,61100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
+'589',139001,61100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_387 b/src/main/res-current/raw/current_gtfs_schedule_stop_387
index 4cd8ac2ab..548758bf9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_387
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_387
@@ -1,7 +1,7 @@
-'576',2001,75500,,'',0,10300,,'',0,14400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'577',2001,63600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'578',2001,63600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'579',2001,63600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'580',2001,63600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'581',2001,80100,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,10600,,'',0,14400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'582',2001,63600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'583',2001,63600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'584',2001,63600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'585',2001,80100,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,10600,,'',0,14400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'586',2001,75500,,'',0,10300,,'',0,14400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'587',2001,63600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'588',2001,63600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'589',2001,63600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_388 b/src/main/res-current/raw/current_gtfs_schedule_stop_388
index 69f4c0ace..0658061ba 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_388
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_388
@@ -1,12 +1,12 @@
-'576',1101,80400,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'577',1101,70800,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'578',1101,70800,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'579',1101,70800,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'580',1101,70800,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'581',1101,82500,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'582',1101,70800,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'577',1401,114300,,'',0,77900,,'',0
-'578',1401,114300,,'',0,77900,,'',0
-'579',1401,114300,,'',0,77900,,'',0
-'580',1401,114300,,'',0,77900,,'',0
-'582',1401,114300,,'',0,77900,,'',0
+'583',1101,70800,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'584',1101,70800,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'585',1101,82500,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'586',1101,80400,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
+'587',1101,70800,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'588',1101,70800,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'589',1101,70800,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'583',1401,114300,,'',0,77900,,'',0
+'584',1401,114300,,'',0,77900,,'',0
+'587',1401,114300,,'',0,77900,,'',0
+'588',1401,114300,,'',0,77900,,'',0
+'589',1401,114300,,'',0,77900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_389 b/src/main/res-current/raw/current_gtfs_schedule_stop_389
index 8c529ffeb..7a43f3c48 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_389
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_389
@@ -1,12 +1,12 @@
-'576',1100,80100,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'577',1100,64500,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'578',1100,64500,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'579',1100,64500,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'580',1100,64500,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'581',1100,74800,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'582',1100,64500,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'577',1400,121800,,'',0,73600,,'',0
-'578',1400,121800,,'',0,73600,,'',0
-'579',1400,121800,,'',0,73600,,'',0
-'580',1400,121800,,'',0,73600,,'',0
-'582',1400,121800,,'',0,73600,,'',0
+'583',1100,64500,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'584',1100,64500,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'585',1100,74800,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'586',1100,80100,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'587',1100,64500,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'588',1100,64500,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'589',1100,64500,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'583',1400,121800,,'',0,73600,,'',0
+'584',1400,121800,,'',0,73600,,'',0
+'587',1400,121800,,'',0,73600,,'',0
+'588',1400,121800,,'',0,73600,,'',0
+'589',1400,121800,,'',0,73600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_39 b/src/main/res-current/raw/current_gtfs_schedule_stop_39
index 4e473a4c0..64de10ebe 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_39
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_39
@@ -1,7 +1,7 @@
-'576',201,74300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',201,60300,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'578',201,60300,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'579',201,60300,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'580',201,60300,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'581',201,80800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10200,,'',0,10000,,'',0,9600,,'',0
-'582',201,60300,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'583',201,60300,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'584',201,60300,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'585',201,80800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10200,,'',0,10000,,'',0,9600,,'',0
+'586',201,74300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',201,60300,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'588',201,60300,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'589',201,60300,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_390 b/src/main/res-current/raw/current_gtfs_schedule_stop_390
index 18c96e95b..8fa83fc15 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_390
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_390
@@ -1,14 +1,14 @@
-'576',1501,83300,,'',0,20000,,'',0,40000,,'',0,27000,,'',0
-'577',1501,70300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'578',1501,70300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'579',1501,70300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'580',1501,70300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'581',1501,93400,,'',0,17000,,'',0,20000,,'',0,20000,,'',0,10200,,'',0,10000,,'',0
-'582',1501,70300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'576',1700,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',1700,60900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3100,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,1000,,'',0,2000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1700,60900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3100,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,1000,,'',0,2000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1700,60900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3100,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,1000,,'',0,2000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1700,60900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3100,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,1000,,'',0,2000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1700,83400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'582',1700,60900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3100,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,1000,,'',0,2000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1501,70300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'584',1501,70300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'585',1501,93400,,'',0,17000,,'',0,20000,,'',0,20000,,'',0,10200,,'',0,10000,,'',0
+'586',1501,83300,,'',0,20000,,'',0,40000,,'',0,27000,,'',0
+'587',1501,70300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'588',1501,70300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'589',1501,70300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'583',1700,60900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3100,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,1000,,'',0,2000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1700,60900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3100,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,1000,,'',0,2000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1700,83400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'586',1700,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',1700,60900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3100,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,1000,,'',0,2000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1700,60900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3100,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,1000,,'',0,2000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1700,60900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3100,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,1000,,'',0,2000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_391 b/src/main/res-current/raw/current_gtfs_schedule_stop_391
index 25d345244..99a3e4cff 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_391
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_391
@@ -1,7 +1,7 @@
-'576',2000,82200,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'577',2000,63100,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'578',2000,63100,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'579',2000,63100,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'580',2000,63100,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'581',2000,65300,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'582',2000,63100,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'583',2000,63100,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'584',2000,63100,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'585',2000,65300,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
+'586',2000,82200,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'587',2000,63100,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'588',2000,63100,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'589',2000,63100,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_392 b/src/main/res-current/raw/current_gtfs_schedule_stop_392
index d14fc35ef..55ee1a7de 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_392
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_392
@@ -1,12 +1,12 @@
-'576',1101,80500,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,6900,0,'Black Mtn',0,3100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'577',1101,70800,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'578',1101,70800,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'579',1101,70800,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'580',1101,70800,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'581',1101,82600,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'582',1101,70800,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'577',1401,114400,,'',0,77900,,'',0
-'578',1401,114400,,'',0,77900,,'',0
-'579',1401,114400,,'',0,77900,,'',0
-'580',1401,114400,,'',0,77900,,'',0
-'582',1401,114400,,'',0,77900,,'',0
+'583',1101,70800,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'584',1101,70800,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'585',1101,82600,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'586',1101,80500,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,6900,0,'Black Mtn',0,3100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
+'587',1101,70800,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'588',1101,70800,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'589',1101,70800,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'583',1401,114400,,'',0,77900,,'',0
+'584',1401,114400,,'',0,77900,,'',0
+'587',1401,114400,,'',0,77900,,'',0
+'588',1401,114400,,'',0,77900,,'',0
+'589',1401,114400,,'',0,77900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_393 b/src/main/res-current/raw/current_gtfs_schedule_stop_393
index 5579e4a04..d37a53edf 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_393
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_393
@@ -1,12 +1,12 @@
-'576',1100,80100,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'577',1100,64500,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'578',1100,64500,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'579',1100,64500,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'580',1100,64500,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'581',1100,74800,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'582',1100,64500,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'577',1400,121800,,'',0,73600,,'',0
-'578',1400,121800,,'',0,73600,,'',0
-'579',1400,121800,,'',0,73600,,'',0
-'580',1400,121800,,'',0,73600,,'',0
-'582',1400,121800,,'',0,73600,,'',0
+'583',1100,64500,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'584',1100,64500,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'585',1100,74800,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'586',1100,80100,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'587',1100,64500,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'588',1100,64500,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'589',1100,64500,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'583',1400,121800,,'',0,73600,,'',0
+'584',1400,121800,,'',0,73600,,'',0
+'587',1400,121800,,'',0,73600,,'',0
+'588',1400,121800,,'',0,73600,,'',0
+'589',1400,121800,,'',0,73600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_394 b/src/main/res-current/raw/current_gtfs_schedule_stop_394
index 49aa509ae..06301a831 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_394
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_394
@@ -1,12 +1,12 @@
-'576',1101,80600,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,6900,0,'Black Mtn',0,3100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'577',1101,70900,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'578',1101,70900,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'579',1101,70900,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'580',1101,70900,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'581',1101,82700,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'582',1101,70900,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'577',1401,114400,,'',0,77900,,'',0
-'578',1401,114400,,'',0,77900,,'',0
-'579',1401,114400,,'',0,77900,,'',0
-'580',1401,114400,,'',0,77900,,'',0
-'582',1401,114400,,'',0,77900,,'',0
+'583',1101,70900,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'584',1101,70900,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'585',1101,82700,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'586',1101,80600,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,6900,0,'Black Mtn',0,3100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
+'587',1101,70900,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'588',1101,70900,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'589',1101,70900,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'583',1401,114400,,'',0,77900,,'',0
+'584',1401,114400,,'',0,77900,,'',0
+'587',1401,114400,,'',0,77900,,'',0
+'588',1401,114400,,'',0,77900,,'',0
+'589',1401,114400,,'',0,77900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_395 b/src/main/res-current/raw/current_gtfs_schedule_stop_395
index 7d3609092..69d237ec4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_395
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_395
@@ -1,12 +1,12 @@
-'576',1100,80000,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'577',1100,64400,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'578',1100,64400,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'579',1100,64400,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'580',1100,64400,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'581',1100,74700,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,1100,0,'Orchard Pk',0,5900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'582',1100,64400,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'577',1400,121700,,'',0,73600,,'',0
-'578',1400,121700,,'',0,73600,,'',0
-'579',1400,121700,,'',0,73600,,'',0
-'580',1400,121700,,'',0,73600,,'',0
-'582',1400,121700,,'',0,73600,,'',0
+'583',1100,64400,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'584',1100,64400,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'585',1100,74700,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,1100,0,'Orchard Pk',0,5900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'586',1100,80000,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'587',1100,64400,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'588',1100,64400,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'589',1100,64400,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'583',1400,121700,,'',0,73600,,'',0
+'584',1400,121700,,'',0,73600,,'',0
+'587',1400,121700,,'',0,73600,,'',0
+'588',1400,121700,,'',0,73600,,'',0
+'589',1400,121700,,'',0,73600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_39506 b/src/main/res-current/raw/current_gtfs_schedule_stop_39506
index 8d9ad1767..ce6425bdd 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_39506
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_39506
@@ -1,7 +1,7 @@
-'576',701,82300,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0
-'577',701,63700,,'',0,7500,,'',0,3600,,'',0,5600,,'',0,2000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
-'578',701,63700,,'',0,7500,,'',0,3600,,'',0,5600,,'',0,2000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
-'579',701,63700,,'',0,7500,,'',0,3600,,'',0,5600,,'',0,2000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
-'580',701,63700,,'',0,7500,,'',0,3600,,'',0,5600,,'',0,2000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
-'581',701,82800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',701,63700,,'',0,7500,,'',0,3600,,'',0,5600,,'',0,2000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'583',701,63700,,'',0,7500,,'',0,3600,,'',0,5600,,'',0,2000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'584',701,63700,,'',0,7500,,'',0,3600,,'',0,5600,,'',0,2000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'585',701,82800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',701,82300,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0
+'587',701,63700,,'',0,7500,,'',0,3600,,'',0,5600,,'',0,2000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'588',701,63700,,'',0,7500,,'',0,3600,,'',0,5600,,'',0,2000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'589',701,63700,,'',0,7500,,'',0,3600,,'',0,5600,,'',0,2000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_39507 b/src/main/res-current/raw/current_gtfs_schedule_stop_39507
index 52456bfd3..7ca19be96 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_39507
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_39507
@@ -1,7 +1,7 @@
-'576',700,84300,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'577',700,65300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'578',700,65300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'579',700,65300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'580',700,65300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'581',700,80600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',700,65300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
+'583',700,65300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
+'584',700,65300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
+'585',700,80600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',700,84300,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
+'587',700,65300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
+'588',700,65300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
+'589',700,65300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_39508 b/src/main/res-current/raw/current_gtfs_schedule_stop_39508
index 17306bb50..a3e8b769a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_39508
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_39508
@@ -1,14 +1,14 @@
-'576',800,72000,,'',0,10600,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
-'577',800,61800,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'578',800,61800,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'579',800,61800,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'580',800,61800,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'581',800,64300,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3300,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'582',800,61800,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'576',1001,90300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
-'577',1001,54100,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'578',1001,54100,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'579',1001,54100,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'580',1001,54100,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'581',1001,83900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',1001,54100,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'583',800,61800,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'584',800,61800,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'585',800,64300,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3300,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
+'586',800,72000,,'',0,10600,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
+'587',800,61800,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'588',800,61800,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'589',800,61800,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'583',1001,54100,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'584',1001,54100,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'585',1001,83900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',1001,90300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
+'587',1001,54100,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'588',1001,54100,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'589',1001,54100,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_396 b/src/main/res-current/raw/current_gtfs_schedule_stop_396
index 0edb2586e..0c05824d6 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_396
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_396
@@ -1,14 +1,14 @@
-'576',800,71900,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
-'577',800,61700,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'578',800,61700,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'579',800,61700,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'580',800,61700,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'581',800,64200,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'582',800,61700,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'576',1001,90000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
-'577',1001,65300,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'578',1001,65300,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'579',1001,65300,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'580',1001,65300,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'581',1001,83600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',1001,65300,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'583',800,61700,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'584',800,61700,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'585',800,64200,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
+'586',800,71900,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
+'587',800,61700,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'588',800,61700,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'589',800,61700,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'583',1001,65300,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'584',1001,65300,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'585',1001,83600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',1001,90000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
+'587',1001,65300,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'588',1001,65300,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'589',1001,65300,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_397 b/src/main/res-current/raw/current_gtfs_schedule_stop_397
index 6bffb20f2..01b210d9b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_397
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_397
@@ -1,12 +1,12 @@
-'576',1101,80600,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,6900,0,'Black Mtn',0,3100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'577',1101,70900,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'578',1101,70900,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'579',1101,70900,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'580',1101,70900,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'581',1101,82700,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'582',1101,70900,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'577',1401,114500,,'',0,77800,,'',0
-'578',1401,114500,,'',0,77800,,'',0
-'579',1401,114500,,'',0,77800,,'',0
-'580',1401,114500,,'',0,77800,,'',0
-'582',1401,114500,,'',0,77800,,'',0
+'583',1101,70900,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'584',1101,70900,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'585',1101,82700,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'586',1101,80600,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,6900,0,'Black Mtn',0,3100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
+'587',1101,70900,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'588',1101,70900,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'589',1101,70900,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'583',1401,114500,,'',0,77800,,'',0
+'584',1401,114500,,'',0,77800,,'',0
+'587',1401,114500,,'',0,77800,,'',0
+'588',1401,114500,,'',0,77800,,'',0
+'589',1401,114500,,'',0,77800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_398 b/src/main/res-current/raw/current_gtfs_schedule_stop_398
index 602c2abb9..c84edb463 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_398
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_398
@@ -1,7 +1,7 @@
-'576',1501,83300,,'',0,20000,,'',0,40000,,'',0,27000,,'',0
-'577',1501,70300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'578',1501,70300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'579',1501,70300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'580',1501,70300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'581',1501,93400,,'',0,17000,,'',0,20000,,'',0,20000,,'',0,10200,,'',0,10000,,'',0
-'582',1501,70300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'583',1501,70300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'584',1501,70300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'585',1501,93400,,'',0,17000,,'',0,20000,,'',0,20000,,'',0,10200,,'',0,10000,,'',0
+'586',1501,83300,,'',0,20000,,'',0,40000,,'',0,27000,,'',0
+'587',1501,70300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'588',1501,70300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'589',1501,70300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_399 b/src/main/res-current/raw/current_gtfs_schedule_stop_399
index 4144d8b31..df39884c7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_399
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_399
@@ -1,7 +1,7 @@
-'576',1601,92200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
-'577',1601,62200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1601,62200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1601,62200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1601,62200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1601,82300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
-'582',1601,62200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1601,62200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1601,62200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1601,82300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
+'586',1601,92200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
+'587',1601,62200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1601,62200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1601,62200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_4 b/src/main/res-current/raw/current_gtfs_schedule_stop_4
index ad4c453f8..6d9ddba7c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_4
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_4
@@ -1,14 +1,14 @@
-'576',1100,82600,4,'',0,19300,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10500,4,'',0,9400,4,'',0,10000,4,'',0,10000,4,'',0
-'576',1101,73900,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
-'577',1100,70800,4,'',0,4900,4,'',0,7400,4,'',0,1500,4,'',0,5500,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7100,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,6800,4,'',0,2900,4,'',0,6900,4,'',0,1500,4,'',0,1500,4,'',0,6900,4,'',0,2800,4,'',0,2800,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,8000,4,'',0,3000,4,'',0,10000,4,'',0,12000,4,'',0
-'577',1101,64500,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'578',1100,70800,4,'',0,4900,4,'',0,7400,4,'',0,1500,4,'',0,5500,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7100,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,6800,4,'',0,2900,4,'',0,6900,4,'',0,1500,4,'',0,1500,4,'',0,6900,4,'',0,2800,4,'',0,2800,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,8000,4,'',0,3000,4,'',0,10000,4,'',0,12000,4,'',0
-'578',1101,64500,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'579',1100,70800,4,'',0,4900,4,'',0,7400,4,'',0,1500,4,'',0,5500,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7100,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,6800,4,'',0,2900,4,'',0,6900,4,'',0,1500,4,'',0,1500,4,'',0,6900,4,'',0,2800,4,'',0,2800,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,8000,4,'',0,3000,4,'',0,10000,4,'',0,12000,4,'',0
-'579',1101,64500,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'580',1100,70800,4,'',0,4900,4,'',0,7400,4,'',0,1500,4,'',0,5500,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7100,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,6800,4,'',0,2900,4,'',0,6900,4,'',0,1500,4,'',0,1500,4,'',0,6900,4,'',0,2800,4,'',0,2800,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,8000,4,'',0,3000,4,'',0,10000,4,'',0,12000,4,'',0
-'580',1101,64500,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'581',1100,81300,4,'',0,4000,4,'',0,6100,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,2900,4,'',0,7000,4,'',0,11500,4,'',0,10500,4,'',0,10000,4,'',0,10000,4,'',0
-'581',1101,80000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'582',1100,70800,4,'',0,4900,4,'',0,7400,4,'',0,1500,4,'',0,5500,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7100,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,6800,4,'',0,2900,4,'',0,6900,4,'',0,1500,4,'',0,1500,4,'',0,6900,4,'',0,2800,4,'',0,2800,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,8000,4,'',0,3000,4,'',0,10000,4,'',0,12000,4,'',0
-'582',1101,64500,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'583',1100,70800,4,'',0,4900,4,'',0,7400,4,'',0,1500,4,'',0,5500,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7100,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,6800,4,'',0,2900,4,'',0,6900,4,'',0,1500,4,'',0,1500,4,'',0,6900,4,'',0,2800,4,'',0,2800,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,8000,4,'',0,3000,4,'',0,10000,4,'',0,12000,4,'',0
+'583',1101,64500,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'584',1100,70800,4,'',0,4900,4,'',0,7400,4,'',0,1500,4,'',0,5500,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7100,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,6800,4,'',0,2900,4,'',0,6900,4,'',0,1500,4,'',0,1500,4,'',0,6900,4,'',0,2800,4,'',0,2800,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,8000,4,'',0,3000,4,'',0,10000,4,'',0,12000,4,'',0
+'584',1101,64500,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'585',1100,81300,4,'',0,4000,4,'',0,6100,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,2900,4,'',0,7000,4,'',0,11500,4,'',0,10500,4,'',0,10000,4,'',0,10000,4,'',0
+'585',1101,80000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'586',1100,82600,4,'',0,19300,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10500,4,'',0,9400,4,'',0,10000,4,'',0,10000,4,'',0
+'586',1101,73900,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
+'587',1100,70800,4,'',0,4900,4,'',0,7400,4,'',0,1500,4,'',0,5500,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7100,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,6800,4,'',0,2900,4,'',0,6900,4,'',0,1500,4,'',0,1500,4,'',0,6900,4,'',0,2800,4,'',0,2800,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,8000,4,'',0,3000,4,'',0,10000,4,'',0,12000,4,'',0
+'587',1101,64500,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'588',1100,70800,4,'',0,4900,4,'',0,7400,4,'',0,1500,4,'',0,5500,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7100,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,6800,4,'',0,2900,4,'',0,6900,4,'',0,1500,4,'',0,1500,4,'',0,6900,4,'',0,2800,4,'',0,2800,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,8000,4,'',0,3000,4,'',0,10000,4,'',0,12000,4,'',0
+'588',1101,64500,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'589',1100,70800,4,'',0,4900,4,'',0,7400,4,'',0,1500,4,'',0,5500,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7100,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,6800,4,'',0,2900,4,'',0,6900,4,'',0,1500,4,'',0,1500,4,'',0,6900,4,'',0,2800,4,'',0,2800,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,8000,4,'',0,3000,4,'',0,10000,4,'',0,12000,4,'',0
+'589',1101,64500,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_40 b/src/main/res-current/raw/current_gtfs_schedule_stop_40
index 35400348d..ae82633b1 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_40
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_40
@@ -1,7 +1,7 @@
-'576',1100,82100,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9400,,'',0,10000,,'',0,10000,,'',0
-'577',1100,70300,,'',0,4900,,'',0,7400,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'578',1100,70300,,'',0,4900,,'',0,7400,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'579',1100,70300,,'',0,4900,,'',0,7400,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'580',1100,70300,,'',0,4900,,'',0,7400,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'581',1100,80800,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
-'582',1100,70300,,'',0,4900,,'',0,7400,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'583',1100,70300,,'',0,4900,,'',0,7400,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'584',1100,70300,,'',0,4900,,'',0,7400,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'585',1100,80800,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
+'586',1100,82100,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9400,,'',0,10000,,'',0,10000,,'',0
+'587',1100,70300,,'',0,4900,,'',0,7400,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'588',1100,70300,,'',0,4900,,'',0,7400,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'589',1100,70300,,'',0,4900,,'',0,7400,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_400 b/src/main/res-current/raw/current_gtfs_schedule_stop_400
index b9ab29fd4..dca58a4d7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_400
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_400
@@ -1,7 +1,7 @@
-'576',1601,90400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
-'577',1601,60400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1601,60400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1601,60400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1601,60400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1601,80500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
-'582',1601,60400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1601,60400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1601,60400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1601,80500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
+'586',1601,90400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
+'587',1601,60400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1601,60400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1601,60400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_401 b/src/main/res-current/raw/current_gtfs_schedule_stop_401
index 5e899d55b..20824f986 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_401
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_401
@@ -1,14 +1,14 @@
-'576',801,62600,,'',0,27400,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'577',801,60700,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'578',801,60700,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'579',801,60700,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'580',801,60700,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'581',801,62600,,'',0,10200,,'',0,8000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
-'582',801,60700,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'576',1000,75800,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
-'577',1000,55800,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'578',1000,55800,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'579',1000,55800,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'580',1000,55800,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'581',1000,75500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'582',1000,55800,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'583',801,60700,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'584',801,60700,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'585',801,62600,,'',0,10200,,'',0,8000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
+'586',801,62600,,'',0,27400,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'587',801,60700,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'588',801,60700,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'589',801,60700,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'583',1000,55800,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'584',1000,55800,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'585',1000,75500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'586',1000,75800,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
+'587',1000,55800,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'588',1000,55800,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'589',1000,55800,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_402 b/src/main/res-current/raw/current_gtfs_schedule_stop_402
index f0db699b8..db26debfb 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_402
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_402
@@ -1,7 +1,7 @@
-'576',1001,90500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
-'577',1001,54300,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'578',1001,54300,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'579',1001,54300,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'580',1001,54300,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'581',1001,84200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',1001,54300,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'583',1001,54300,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'584',1001,54300,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'585',1001,84200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',1001,90500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
+'587',1001,54300,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'588',1001,54300,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'589',1001,54300,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6100,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_403 b/src/main/res-current/raw/current_gtfs_schedule_stop_403
index 624095e6a..6d99e505b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_403
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_403
@@ -1,7 +1,7 @@
-'576',1200,92000,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
-'577',1200,71500,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'578',1200,71500,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'579',1200,71500,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'580',1200,71500,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'581',1200,94700,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
-'582',1200,71500,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'583',1200,71500,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'584',1200,71500,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'585',1200,94700,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
+'586',1200,92000,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
+'587',1200,71500,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'588',1200,71500,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'589',1200,71500,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_404 b/src/main/res-current/raw/current_gtfs_schedule_stop_404
index 1f1744055..2a2243b0e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_404
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_404
@@ -1,7 +1,7 @@
-'576',1201,91000,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
-'577',1201,70600,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,39800,,'',0,4400,,'',0,8500,,'',0,8200,,'',0,8600,,'',0,21500,,'',0
-'578',1201,70600,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,39800,,'',0,4400,,'',0,8500,,'',0,8200,,'',0,8600,,'',0,21500,,'',0
-'579',1201,70600,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,39800,,'',0,4400,,'',0,8500,,'',0,8200,,'',0,8600,,'',0,21500,,'',0
-'580',1201,70600,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,39800,,'',0,4400,,'',0,8500,,'',0,8200,,'',0,8600,,'',0,21500,,'',0
-'581',1201,93700,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
-'582',1201,70600,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,39800,,'',0,4400,,'',0,8500,,'',0,8200,,'',0,8600,,'',0,21500,,'',0
+'583',1201,70600,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,39800,,'',0,4400,,'',0,8500,,'',0,8200,,'',0,8600,,'',0,21500,,'',0
+'584',1201,70600,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,39800,,'',0,4400,,'',0,8500,,'',0,8200,,'',0,8600,,'',0,21500,,'',0
+'585',1201,93700,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
+'586',1201,91000,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
+'587',1201,70600,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,39800,,'',0,4400,,'',0,8500,,'',0,8200,,'',0,8600,,'',0,21500,,'',0
+'588',1201,70600,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,39800,,'',0,4400,,'',0,8500,,'',0,8200,,'',0,8600,,'',0,21500,,'',0
+'589',1201,70600,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,39800,,'',0,4400,,'',0,8500,,'',0,8200,,'',0,8600,,'',0,21500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_405 b/src/main/res-current/raw/current_gtfs_schedule_stop_405
index 6c6e1b5e8..400a3807a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_405
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_405
@@ -1,7 +1,7 @@
-'576',1700,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',1700,61000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3100,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,1000,,'',0,2000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1700,61000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3100,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,1000,,'',0,2000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1700,61000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3100,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,1000,,'',0,2000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1700,61000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3100,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,1000,,'',0,2000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1700,83400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'582',1700,61000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3100,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,1000,,'',0,2000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1700,61000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3100,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,1000,,'',0,2000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1700,61000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3100,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,1000,,'',0,2000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1700,83400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'586',1700,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',1700,61000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3100,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,1000,,'',0,2000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1700,61000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3100,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,1000,,'',0,2000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1700,61000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3100,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,1000,,'',0,2000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_406 b/src/main/res-current/raw/current_gtfs_schedule_stop_406
index 987d47144..ceb5fae17 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_406
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_406
@@ -1,10 +1,10 @@
-'577',1400,121000,,'',0,73800,,'',0
-'577',1401,63500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'578',1400,121000,,'',0,73800,,'',0
-'578',1401,63500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'579',1400,121000,,'',0,73800,,'',0
-'579',1401,63500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'580',1400,121000,,'',0,73800,,'',0
-'580',1401,63500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'582',1400,121000,,'',0,73800,,'',0
-'582',1401,63500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'583',1400,121000,,'',0,73800,,'',0
+'583',1401,63500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'584',1400,121000,,'',0,73800,,'',0
+'584',1401,63500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'587',1400,121000,,'',0,73800,,'',0
+'587',1401,63500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'588',1400,121000,,'',0,73800,,'',0
+'588',1401,63500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'589',1400,121000,,'',0,73800,,'',0
+'589',1401,63500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_407 b/src/main/res-current/raw/current_gtfs_schedule_stop_407
index 78b66603b..a9b318b24 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_407
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_407
@@ -1,14 +1,14 @@
-'576',1000,75200,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'North Rutland',0
-'576',1001,91200,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,13000,4,'',0,10000,4,'',0
-'577',1000,55000,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'577',1001,55000,4,'',0,7200,4,'',0,1800,4,'',0,6400,4,'',0,1900,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,1900,4,'',0,5900,4,'',0,2100,4,'',0,1900,4,'',0,6800,4,'',0,2900,4,'',0,7300,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,2100,4,'',0,1900,4,'',0,6200,4,'',0,1900,4,'',0,1900,4,'',0,5900,4,'',0,1700,4,'',0,1700,4,'',0,6100,4,'',0,4400,4,'',0,8400,4,'',0,8400,4,'',0,8400,4,'',0,4300,4,'',0,8400,4,'',0,8500,4,'',0,8500,4,'',0,4500,4,'',0
-'578',1000,55000,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'578',1001,55000,4,'',0,7200,4,'',0,1800,4,'',0,6400,4,'',0,1900,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,1900,4,'',0,5900,4,'',0,2100,4,'',0,1900,4,'',0,6800,4,'',0,2900,4,'',0,7300,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,2100,4,'',0,1900,4,'',0,6200,4,'',0,1900,4,'',0,1900,4,'',0,5900,4,'',0,1700,4,'',0,1700,4,'',0,6100,4,'',0,4400,4,'',0,8400,4,'',0,8400,4,'',0,8400,4,'',0,4300,4,'',0,8400,4,'',0,8500,4,'',0,8500,4,'',0,4500,4,'',0
-'579',1000,55000,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'579',1001,55000,4,'',0,7200,4,'',0,1800,4,'',0,6400,4,'',0,1900,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,1900,4,'',0,5900,4,'',0,2100,4,'',0,1900,4,'',0,6800,4,'',0,2900,4,'',0,7300,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,2100,4,'',0,1900,4,'',0,6200,4,'',0,1900,4,'',0,1900,4,'',0,5900,4,'',0,1700,4,'',0,1700,4,'',0,6100,4,'',0,4400,4,'',0,8400,4,'',0,8400,4,'',0,8400,4,'',0,4300,4,'',0,8400,4,'',0,8500,4,'',0,8500,4,'',0,4500,4,'',0
-'580',1000,55000,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'580',1001,55000,4,'',0,7200,4,'',0,1800,4,'',0,6400,4,'',0,1900,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,1900,4,'',0,5900,4,'',0,2100,4,'',0,1900,4,'',0,6800,4,'',0,2900,4,'',0,7300,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,2100,4,'',0,1900,4,'',0,6200,4,'',0,1900,4,'',0,1900,4,'',0,5900,4,'',0,1700,4,'',0,1700,4,'',0,6100,4,'',0,4400,4,'',0,8400,4,'',0,8400,4,'',0,8400,4,'',0,4300,4,'',0,8400,4,'',0,8500,4,'',0,8500,4,'',0,4500,4,'',0
-'581',1000,74900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'North Rutland',0
-'581',1001,84900,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3700,4,'',0,6900,4,'',0,9900,4,'',0,9900,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'582',1000,55000,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'582',1001,55000,4,'',0,7200,4,'',0,1800,4,'',0,6400,4,'',0,1900,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,1900,4,'',0,5900,4,'',0,2100,4,'',0,1900,4,'',0,6800,4,'',0,2900,4,'',0,7300,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,2100,4,'',0,1900,4,'',0,6200,4,'',0,1900,4,'',0,1900,4,'',0,5900,4,'',0,1700,4,'',0,1700,4,'',0,6100,4,'',0,4400,4,'',0,8400,4,'',0,8400,4,'',0,8400,4,'',0,4300,4,'',0,8400,4,'',0,8500,4,'',0,8500,4,'',0,4500,4,'',0
+'583',1000,55000,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'583',1001,55000,4,'',0,7200,4,'',0,1800,4,'',0,6400,4,'',0,1900,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,1900,4,'',0,5900,4,'',0,2100,4,'',0,1900,4,'',0,6800,4,'',0,2900,4,'',0,7300,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,2100,4,'',0,1900,4,'',0,6200,4,'',0,1900,4,'',0,1900,4,'',0,5900,4,'',0,1700,4,'',0,1700,4,'',0,6100,4,'',0,4400,4,'',0,8400,4,'',0,8400,4,'',0,8400,4,'',0,4300,4,'',0,8400,4,'',0,8500,4,'',0,8500,4,'',0,4500,4,'',0
+'584',1000,55000,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'584',1001,55000,4,'',0,7200,4,'',0,1800,4,'',0,6400,4,'',0,1900,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,1900,4,'',0,5900,4,'',0,2100,4,'',0,1900,4,'',0,6800,4,'',0,2900,4,'',0,7300,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,2100,4,'',0,1900,4,'',0,6200,4,'',0,1900,4,'',0,1900,4,'',0,5900,4,'',0,1700,4,'',0,1700,4,'',0,6100,4,'',0,4400,4,'',0,8400,4,'',0,8400,4,'',0,8400,4,'',0,4300,4,'',0,8400,4,'',0,8500,4,'',0,8500,4,'',0,4500,4,'',0
+'585',1000,74900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'North Rutland',0
+'585',1001,84900,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3700,4,'',0,6900,4,'',0,9900,4,'',0,9900,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'586',1000,75200,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'North Rutland',0
+'586',1001,91200,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,13000,4,'',0,10000,4,'',0
+'587',1000,55000,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'587',1001,55000,4,'',0,7200,4,'',0,1800,4,'',0,6400,4,'',0,1900,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,1900,4,'',0,5900,4,'',0,2100,4,'',0,1900,4,'',0,6800,4,'',0,2900,4,'',0,7300,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,2100,4,'',0,1900,4,'',0,6200,4,'',0,1900,4,'',0,1900,4,'',0,5900,4,'',0,1700,4,'',0,1700,4,'',0,6100,4,'',0,4400,4,'',0,8400,4,'',0,8400,4,'',0,8400,4,'',0,4300,4,'',0,8400,4,'',0,8500,4,'',0,8500,4,'',0,4500,4,'',0
+'588',1000,55000,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'588',1001,55000,4,'',0,7200,4,'',0,1800,4,'',0,6400,4,'',0,1900,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,1900,4,'',0,5900,4,'',0,2100,4,'',0,1900,4,'',0,6800,4,'',0,2900,4,'',0,7300,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,2100,4,'',0,1900,4,'',0,6200,4,'',0,1900,4,'',0,1900,4,'',0,5900,4,'',0,1700,4,'',0,1700,4,'',0,6100,4,'',0,4400,4,'',0,8400,4,'',0,8400,4,'',0,8400,4,'',0,4300,4,'',0,8400,4,'',0,8500,4,'',0,8500,4,'',0,4500,4,'',0
+'589',1000,55000,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'589',1001,55000,4,'',0,7200,4,'',0,1800,4,'',0,6400,4,'',0,1900,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,1900,4,'',0,5900,4,'',0,2100,4,'',0,1900,4,'',0,6800,4,'',0,2900,4,'',0,7300,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,2100,4,'',0,1900,4,'',0,6200,4,'',0,1900,4,'',0,1900,4,'',0,5900,4,'',0,1700,4,'',0,1700,4,'',0,6100,4,'',0,4400,4,'',0,8400,4,'',0,8400,4,'',0,8400,4,'',0,4300,4,'',0,8400,4,'',0,8500,4,'',0,8500,4,'',0,4500,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_408 b/src/main/res-current/raw/current_gtfs_schedule_stop_408
index 2c782789c..37de615d6 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_408
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_408
@@ -1,14 +1,14 @@
-'576',2500,103000,,'',0,22800,,'',0,29100,,'',0,26900,,'',0
-'577',2500,71800,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'578',2500,71800,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'579',2500,71800,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'580',2500,71800,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'581',2500,94600,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
-'582',2500,71800,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'576',139001,71800,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
-'577',139001,61200,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
-'578',139001,61200,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
-'579',139001,61200,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
-'580',139001,61200,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
-'581',139001,73700,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
-'582',139001,61200,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
+'583',2500,71800,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'584',2500,71800,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'585',2500,94600,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
+'586',2500,103000,,'',0,22800,,'',0,29100,,'',0,26900,,'',0
+'587',2500,71800,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'588',2500,71800,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'589',2500,71800,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'583',139001,61200,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
+'584',139001,61200,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
+'585',139001,73700,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
+'586',139001,71800,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
+'587',139001,61200,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
+'588',139001,61200,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
+'589',139001,61200,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_409 b/src/main/res-current/raw/current_gtfs_schedule_stop_409
index a0bda4c6e..8605b2e09 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_409
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_409
@@ -1,14 +1,14 @@
-'576',2501,102100,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
-'577',2501,80300,,'',0,5100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'578',2501,80300,,'',0,5100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'579',2501,80300,,'',0,5100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'580',2501,80300,,'',0,5100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'581',2501,93600,,'',0,17200,,'',0,13300,,'',0,17100,,'',0,40300,,'',0
-'582',2501,80300,,'',0,5100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'576',139000,110800,,'',0,22800,,'',0,29100,,'',0,30300,,'',0
-'577',139000,60400,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,17400,,'',0,4000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'578',139000,60400,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,17400,,'',0,4000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'579',139000,60400,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,17400,,'',0,4000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'580',139000,60400,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,17400,,'',0,4000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'581',139000,74200,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,17600,,'',0,12300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
-'582',139000,60400,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,17400,,'',0,4000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'583',2501,80300,,'',0,5100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'584',2501,80300,,'',0,5100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'585',2501,93600,,'',0,17200,,'',0,13300,,'',0,17100,,'',0,40300,,'',0
+'586',2501,102100,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
+'587',2501,80300,,'',0,5100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'588',2501,80300,,'',0,5100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'589',2501,80300,,'',0,5100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'583',139000,60400,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,17400,,'',0,4000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'584',139000,60400,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,17400,,'',0,4000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'585',139000,74200,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,17600,,'',0,12300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
+'586',139000,110800,,'',0,22800,,'',0,29100,,'',0,30300,,'',0
+'587',139000,60400,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,17400,,'',0,4000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'588',139000,60400,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,17400,,'',0,4000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'589',139000,60400,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,17400,,'',0,4000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_41 b/src/main/res-current/raw/current_gtfs_schedule_stop_41
index bb18c4d4b..cd4059095 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_41
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_41
@@ -1,14 +1,14 @@
-'576',701,80300,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'577',701,61800,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
-'578',701,61800,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
-'579',701,61800,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
-'580',701,61800,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
-'581',701,80800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',701,61800,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
-'576',1800,73200,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'577',1800,61800,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
-'578',1800,61800,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
-'579',1800,61800,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
-'580',1800,61800,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
-'581',1800,73200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'582',1800,61800,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
+'583',701,61800,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
+'584',701,61800,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
+'585',701,80800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',701,80300,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'587',701,61800,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
+'588',701,61800,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
+'589',701,61800,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
+'583',1800,61800,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
+'584',1800,61800,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
+'585',1800,73200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'586',1800,73200,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'587',1800,61800,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
+'588',1800,61800,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
+'589',1800,61800,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_410 b/src/main/res-current/raw/current_gtfs_schedule_stop_410
index 9104d8249..500149f31 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_410
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_410
@@ -1,12 +1,12 @@
-'576',1101,80700,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,6900,0,'Black Mtn',0,3100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'577',1101,71000,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'578',1101,71000,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'579',1101,71000,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'580',1101,71000,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'581',1101,82800,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'582',1101,71000,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'577',1401,114500,,'',0,77900,,'',0
-'578',1401,114500,,'',0,77900,,'',0
-'579',1401,114500,,'',0,77900,,'',0
-'580',1401,114500,,'',0,77900,,'',0
-'582',1401,114500,,'',0,77900,,'',0
+'583',1101,71000,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'584',1101,71000,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'585',1101,82800,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'586',1101,80700,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,6900,0,'Black Mtn',0,3100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
+'587',1101,71000,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'588',1101,71000,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'589',1101,71000,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'583',1401,114500,,'',0,77900,,'',0
+'584',1401,114500,,'',0,77900,,'',0
+'587',1401,114500,,'',0,77900,,'',0
+'588',1401,114500,,'',0,77900,,'',0
+'589',1401,114500,,'',0,77900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_411 b/src/main/res-current/raw/current_gtfs_schedule_stop_411
index a896d0372..8d64753ec 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_411
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_411
@@ -1,10 +1,10 @@
-'577',1400,121100,,'',0,73800,,'',0
-'577',1401,63600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'578',1400,121100,,'',0,73800,,'',0
-'578',1401,63600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'579',1400,121100,,'',0,73800,,'',0
-'579',1401,63600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'580',1400,121100,,'',0,73800,,'',0
-'580',1401,63600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'582',1400,121100,,'',0,73800,,'',0
-'582',1401,63600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'583',1400,121100,,'',0,73800,,'',0
+'583',1401,63600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'584',1400,121100,,'',0,73800,,'',0
+'584',1401,63600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'587',1400,121100,,'',0,73800,,'',0
+'587',1401,63600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'588',1400,121100,,'',0,73800,,'',0
+'588',1401,63600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'589',1400,121100,,'',0,73800,,'',0
+'589',1401,63600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_412 b/src/main/res-current/raw/current_gtfs_schedule_stop_412
index 4144d8b31..df39884c7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_412
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_412
@@ -1,7 +1,7 @@
-'576',1601,92200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
-'577',1601,62200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1601,62200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1601,62200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1601,62200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1601,82300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
-'582',1601,62200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1601,62200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1601,62200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1601,82300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
+'586',1601,92200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
+'587',1601,62200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1601,62200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1601,62200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_413 b/src/main/res-current/raw/current_gtfs_schedule_stop_413
index 8c2c044e5..9adcd564d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_413
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_413
@@ -1,7 +1,7 @@
-'576',1601,90400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
-'577',1601,60400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1601,60400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1601,60400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1601,60400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1601,80500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
-'582',1601,60400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1601,60400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1601,60400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1601,80500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
+'586',1601,90400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
+'587',1601,60400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1601,60400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1601,60400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_414 b/src/main/res-current/raw/current_gtfs_schedule_stop_414
index 384374b05..daf0d6597 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_414
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_414
@@ -1,7 +1,7 @@
-'576',201,80100,,'',0,5500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',201,61800,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'578',201,61800,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'579',201,61800,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'580',201,61800,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'581',201,82600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,5800,,'',0,10000,,'',0,10000,,'',0,9600,,'',0
-'582',201,61800,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'583',201,61800,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'584',201,61800,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'585',201,82600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,5800,,'',0,10000,,'',0,10000,,'',0,9600,,'',0
+'586',201,80100,,'',0,5500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',201,61800,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'588',201,61800,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'589',201,61800,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_415 b/src/main/res-current/raw/current_gtfs_schedule_stop_415
index 0a7f39894..a5d5a0f2e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_415
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_415
@@ -1,7 +1,7 @@
-'576',1000,75200,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'North Rutland',0
-'577',1000,55000,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'578',1000,55000,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'579',1000,55000,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'580',1000,55000,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'581',1000,74900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'North Rutland',0
-'582',1000,55000,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'583',1000,55000,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'584',1000,55000,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'585',1000,74900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'North Rutland',0
+'586',1000,75200,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'North Rutland',0
+'587',1000,55000,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'588',1000,55000,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'589',1000,55000,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_416 b/src/main/res-current/raw/current_gtfs_schedule_stop_416
index 0c6eaeeba..8912e4b5d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_416
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_416
@@ -1,7 +1,7 @@
-'576',1001,90500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
-'577',1001,54300,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6200,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'578',1001,54300,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6200,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'579',1001,54300,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6200,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'580',1001,54300,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6200,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'581',1001,84100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',1001,54300,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6200,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'583',1001,54300,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6200,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'584',1001,54300,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6200,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'585',1001,84100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',1001,90500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
+'587',1001,54300,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6200,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'588',1001,54300,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6200,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'589',1001,54300,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6200,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_417 b/src/main/res-current/raw/current_gtfs_schedule_stop_417
index 9b6e0897d..5115c5d40 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_417
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_417
@@ -1,12 +1,12 @@
-'576',1100,75800,,'',0,8400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'577',1100,64200,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'578',1100,64200,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'579',1100,64200,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'580',1100,64200,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'581',1100,74500,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,1100,0,'Orchard Pk',0,5900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'582',1100,64200,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'577',1400,121600,,'',0,73600,,'',0
-'578',1400,121600,,'',0,73600,,'',0
-'579',1400,121600,,'',0,73600,,'',0
-'580',1400,121600,,'',0,73600,,'',0
-'582',1400,121600,,'',0,73600,,'',0
+'583',1100,64200,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'584',1100,64200,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'585',1100,74500,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,1100,0,'Orchard Pk',0,5900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'586',1100,75800,,'',0,8400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'587',1100,64200,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'588',1100,64200,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'589',1100,64200,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'583',1400,121600,,'',0,73600,,'',0
+'584',1400,121600,,'',0,73600,,'',0
+'587',1400,121600,,'',0,73600,,'',0
+'588',1400,121600,,'',0,73600,,'',0
+'589',1400,121600,,'',0,73600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_418 b/src/main/res-current/raw/current_gtfs_schedule_stop_418
index 994f1c4b0..a6af82676 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_418
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_418
@@ -1,7 +1,7 @@
-'576',1601,92100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
-'577',1601,62100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1601,62100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1601,62100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1601,62100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1601,82200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
-'582',1601,62100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1601,62100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1601,62100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1601,82200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
+'586',1601,92100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
+'587',1601,62100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1601,62100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1601,62100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_419 b/src/main/res-current/raw/current_gtfs_schedule_stop_419
index f447893a4..cb7a7e17a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_419
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_419
@@ -1,7 +1,7 @@
-'576',1201,91100,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
-'577',1201,70600,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'578',1201,70600,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'579',1201,70600,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'580',1201,70600,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'581',1201,93800,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
-'582',1201,70600,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'583',1201,70600,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'584',1201,70600,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'585',1201,93800,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
+'586',1201,91100,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
+'587',1201,70600,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'588',1201,70600,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'589',1201,70600,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_42 b/src/main/res-current/raw/current_gtfs_schedule_stop_42
index 365ead01a..f15954492 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_42
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_42
@@ -1,7 +1,7 @@
-'576',1101,74300,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
-'577',1101,65000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'578',1101,65000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'579',1101,65000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'580',1101,65000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'581',1101,80400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'582',1101,65000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'583',1101,65000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'584',1101,65000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'585',1101,80400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'586',1101,74300,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
+'587',1101,65000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'588',1101,65000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'589',1101,65000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_420 b/src/main/res-current/raw/current_gtfs_schedule_stop_420
index e686d74f9..0be410ed4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_420
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_420
@@ -1,7 +1,7 @@
-'576',1200,91900,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
-'577',1200,71400,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'578',1200,71400,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'579',1200,71400,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'580',1200,71400,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'581',1200,94600,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
-'582',1200,71400,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'583',1200,71400,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'584',1200,71400,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'585',1200,94600,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
+'586',1200,91900,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
+'587',1200,71400,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'588',1200,71400,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'589',1200,71400,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_421 b/src/main/res-current/raw/current_gtfs_schedule_stop_421
index 3114ab8a0..43e5d56fc 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_421
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_421
@@ -1,7 +1,7 @@
-'576',2001,75400,,'',0,10300,,'',0,14400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'577',2001,63500,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'578',2001,63500,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'579',2001,63500,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'580',2001,63500,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'581',2001,80000,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,10600,,'',0,14400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'582',2001,63500,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'583',2001,63500,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'584',2001,63500,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'585',2001,80000,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,10600,,'',0,14400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'586',2001,75400,,'',0,10300,,'',0,14400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'587',2001,63500,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'588',2001,63500,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'589',2001,63500,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_422 b/src/main/res-current/raw/current_gtfs_schedule_stop_422
index d6198fe7e..df6d129a0 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_422
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_422
@@ -1,7 +1,7 @@
-'576',1001,90400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
-'577',1001,54200,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2100,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'578',1001,54200,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2100,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'579',1001,54200,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2100,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'580',1001,54200,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2100,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'581',1001,84100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',1001,54200,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2100,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'583',1001,54200,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2100,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'584',1001,54200,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2100,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'585',1001,84100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',1001,90400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
+'587',1001,54200,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2100,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'588',1001,54200,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2100,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'589',1001,54200,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2100,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_423 b/src/main/res-current/raw/current_gtfs_schedule_stop_423
index ce0de20f4..cea4d820e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_423
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_423
@@ -1,7 +1,7 @@
-'576',1601,90500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
-'577',1601,60500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1601,60500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1601,60500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1601,60500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1601,80600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
-'582',1601,60500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1601,60500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1601,60500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1601,80600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
+'586',1601,90500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
+'587',1601,60500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1601,60500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1601,60500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_424 b/src/main/res-current/raw/current_gtfs_schedule_stop_424
index eae1be32d..ceff38713 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_424
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_424
@@ -1,12 +1,12 @@
-'576',1101,80800,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,6900,0,'Black Mtn',0,3100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'577',1101,71100,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'578',1101,71100,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'579',1101,71100,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'580',1101,71100,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'581',1101,82900,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'582',1101,71100,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'577',1401,114600,,'',0,77900,,'',0
-'578',1401,114600,,'',0,77900,,'',0
-'579',1401,114600,,'',0,77900,,'',0
-'580',1401,114600,,'',0,77900,,'',0
-'582',1401,114600,,'',0,77900,,'',0
+'583',1101,71100,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'584',1101,71100,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'585',1101,82900,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'586',1101,80800,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,6900,0,'Black Mtn',0,3100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
+'587',1101,71100,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'588',1101,71100,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'589',1101,71100,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'583',1401,114600,,'',0,77900,,'',0
+'584',1401,114600,,'',0,77900,,'',0
+'587',1401,114600,,'',0,77900,,'',0
+'588',1401,114600,,'',0,77900,,'',0
+'589',1401,114600,,'',0,77900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_425 b/src/main/res-current/raw/current_gtfs_schedule_stop_425
index f9543d0d5..5430efefd 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_425
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_425
@@ -1,7 +1,7 @@
-'576',2000,82300,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'577',2000,63200,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'578',2000,63200,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'579',2000,63200,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'580',2000,63200,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'581',2000,65400,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'582',2000,63200,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'583',2000,63200,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'584',2000,63200,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'585',2000,65400,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
+'586',2000,82300,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'587',2000,63200,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'588',2000,63200,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'589',2000,63200,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_426 b/src/main/res-current/raw/current_gtfs_schedule_stop_426
index e94b3750e..b85c8f1a3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_426
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_426
@@ -1,7 +1,7 @@
-'576',1000,75300,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'North Rutland',0
-'577',1000,55100,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'578',1000,55100,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'579',1000,55100,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'580',1000,55100,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'581',1000,75000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'North Rutland',0
-'582',1000,55100,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'583',1000,55100,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'584',1000,55100,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'585',1000,75000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'North Rutland',0
+'586',1000,75300,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'North Rutland',0
+'587',1000,55100,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'588',1000,55100,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'589',1000,55100,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_427 b/src/main/res-current/raw/current_gtfs_schedule_stop_427
index 84ee8360a..40f2c74ba 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_427
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_427
@@ -1,12 +1,12 @@
-'576',1100,75600,,'',0,8300,0,'Orchard Pk',0,10900,,'',0,10000,,'',0,5500,0,'Orchard Pk',0,4500,,'',0,10000,0,'Orchard Pk',0,10000,,'',0,8500,0,'Orchard Pk',0,1500,,'',0,10000,,'',0,10000,,'',0,1000,0,'Orchard Pk',0,9000,,'',0,10000,,'',0,7500,0,'Orchard Pk',0,2500,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'577',1100,64000,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'578',1100,64000,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'579',1100,64000,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'580',1100,64000,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'581',1100,74300,,'',0,7600,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,1100,0,'Orchard Pk',0,5900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,8000,0,'Orchard Pk',0,6500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'582',1100,64000,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'577',1400,121300,,'',0,73800,,'',0
-'578',1400,121300,,'',0,73800,,'',0
-'579',1400,121300,,'',0,73800,,'',0
-'580',1400,121300,,'',0,73800,,'',0
-'582',1400,121300,,'',0,73800,,'',0
+'583',1100,64000,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'584',1100,64000,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'585',1100,74300,,'',0,7600,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,1100,0,'Orchard Pk',0,5900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,8000,0,'Orchard Pk',0,6500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'586',1100,75600,,'',0,8300,0,'Orchard Pk',0,10900,,'',0,10000,,'',0,5500,0,'Orchard Pk',0,4500,,'',0,10000,0,'Orchard Pk',0,10000,,'',0,8500,0,'Orchard Pk',0,1500,,'',0,10000,,'',0,10000,,'',0,1000,0,'Orchard Pk',0,9000,,'',0,10000,,'',0,7500,0,'Orchard Pk',0,2500,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'587',1100,64000,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'588',1100,64000,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'589',1100,64000,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'583',1400,121300,,'',0,73800,,'',0
+'584',1400,121300,,'',0,73800,,'',0
+'587',1400,121300,,'',0,73800,,'',0
+'588',1400,121300,,'',0,73800,,'',0
+'589',1400,121300,,'',0,73800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_428 b/src/main/res-current/raw/current_gtfs_schedule_stop_428
index a1dd2a742..9f935d801 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_428
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_428
@@ -1,5 +1,5 @@
-'577',501,61400,,'',0,3800,,'',0,8600,,'',0,8500,,'',0,59400,,'',0,11600,,'',0,9000,,'',0,7900,,'',0,5000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
-'578',501,61400,,'',0,3800,,'',0,8600,,'',0,8500,,'',0,59400,,'',0,11600,,'',0,9000,,'',0,7900,,'',0,5000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
-'579',501,61400,,'',0,3800,,'',0,8600,,'',0,8500,,'',0,59400,,'',0,11600,,'',0,9000,,'',0,7900,,'',0,5000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
-'580',501,61400,,'',0,3800,,'',0,8600,,'',0,8500,,'',0,59400,,'',0,11600,,'',0,9000,,'',0,7900,,'',0,5000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
-'582',501,61400,,'',0,3800,,'',0,8600,,'',0,8500,,'',0,59400,,'',0,11600,,'',0,9000,,'',0,7900,,'',0,5000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
+'583',501,61400,,'',0,3800,,'',0,8600,,'',0,8500,,'',0,59400,,'',0,11600,,'',0,9000,,'',0,7900,,'',0,5000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
+'584',501,61400,,'',0,3800,,'',0,8600,,'',0,8500,,'',0,59400,,'',0,11600,,'',0,9000,,'',0,7900,,'',0,5000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
+'587',501,61400,,'',0,3800,,'',0,8600,,'',0,8500,,'',0,59400,,'',0,11600,,'',0,9000,,'',0,7900,,'',0,5000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
+'588',501,61400,,'',0,3800,,'',0,8600,,'',0,8500,,'',0,59400,,'',0,11600,,'',0,9000,,'',0,7900,,'',0,5000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
+'589',501,61400,,'',0,3800,,'',0,8600,,'',0,8500,,'',0,59400,,'',0,11600,,'',0,9000,,'',0,7900,,'',0,5000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_429 b/src/main/res-current/raw/current_gtfs_schedule_stop_429
index bcaae56dd..1622bd8af 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_429
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_429
@@ -1,12 +1,12 @@
-'576',1100,75600,,'',0,8300,0,'Orchard Pk',0,10900,,'',0,10000,,'',0,5500,0,'Orchard Pk',0,4500,,'',0,10000,0,'Orchard Pk',0,10000,,'',0,8500,0,'Orchard Pk',0,1500,,'',0,10000,,'',0,10000,,'',0,1000,0,'Orchard Pk',0,9000,,'',0,10000,,'',0,7500,0,'Orchard Pk',0,2500,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'577',1100,64000,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'578',1100,64000,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'579',1100,64000,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'580',1100,64000,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'581',1100,74300,,'',0,7500,0,'Orchard Pk',0,400,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,700,0,'Orchard Pk',0,6300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,900,0,'Orchard Pk',0,6100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,700,0,'Orchard Pk',0,2300,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,8000,0,'Orchard Pk',0,6500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'582',1100,64000,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'577',1400,121300,,'',0,73700,,'',0
-'578',1400,121300,,'',0,73700,,'',0
-'579',1400,121300,,'',0,73700,,'',0
-'580',1400,121300,,'',0,73700,,'',0
-'582',1400,121300,,'',0,73700,,'',0
+'583',1100,64000,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'584',1100,64000,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'585',1100,74300,,'',0,7500,0,'Orchard Pk',0,400,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,700,0,'Orchard Pk',0,6300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,900,0,'Orchard Pk',0,6100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,700,0,'Orchard Pk',0,2300,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,8000,0,'Orchard Pk',0,6500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'586',1100,75600,,'',0,8300,0,'Orchard Pk',0,10900,,'',0,10000,,'',0,5500,0,'Orchard Pk',0,4500,,'',0,10000,0,'Orchard Pk',0,10000,,'',0,8500,0,'Orchard Pk',0,1500,,'',0,10000,,'',0,10000,,'',0,1000,0,'Orchard Pk',0,9000,,'',0,10000,,'',0,7500,0,'Orchard Pk',0,2500,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'587',1100,64000,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'588',1100,64000,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'589',1100,64000,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'583',1400,121300,,'',0,73700,,'',0
+'584',1400,121300,,'',0,73700,,'',0
+'587',1400,121300,,'',0,73700,,'',0
+'588',1400,121300,,'',0,73700,,'',0
+'589',1400,121300,,'',0,73700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43 b/src/main/res-current/raw/current_gtfs_schedule_stop_43
index 09ff573fb..ae32c39a6 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43
@@ -1,14 +1,14 @@
-'576',900,121800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',900,93500,,'',0,31200,,'',0,28800,,'',0
-'578',900,93500,,'',0,31200,,'',0,28800,,'',0
-'579',900,93500,,'',0,31200,,'',0,28800,,'',0
-'580',900,93500,,'',0,31200,,'',0,28800,,'',0
-'581',900,121800,,'',0,8500,,'',0,20500,,'',0,4500,,'',0
-'582',900,93500,,'',0,31200,,'',0,28800,,'',0
-'576',1000,82200,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
-'577',1000,62100,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1600,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'578',1000,62100,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1600,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'579',1000,62100,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1600,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'580',1000,62100,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1600,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'581',1000,82200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,9800,,'',0,10000,,'',0
-'582',1000,62100,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1600,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'583',900,93500,,'',0,31200,,'',0,28800,,'',0
+'584',900,93500,,'',0,31200,,'',0,28800,,'',0
+'585',900,121800,,'',0,8500,,'',0,20500,,'',0,4500,,'',0
+'586',900,121800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',900,93500,,'',0,31200,,'',0,28800,,'',0
+'588',900,93500,,'',0,31200,,'',0,28800,,'',0
+'589',900,93500,,'',0,31200,,'',0,28800,,'',0
+'583',1000,62100,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1600,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'584',1000,62100,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1600,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'585',1000,82200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,9800,,'',0,10000,,'',0
+'586',1000,82200,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
+'587',1000,62100,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1600,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'588',1000,62100,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1600,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'589',1000,62100,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1600,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_430 b/src/main/res-current/raw/current_gtfs_schedule_stop_430
index 0e02dc298..4fbf0fd65 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_430
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_430
@@ -1,12 +1,12 @@
-'576',1100,75600,,'',0,8400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,1100,0,'Orchard Pk',0,8900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'577',1100,64000,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'578',1100,64000,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'579',1100,64000,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'580',1100,64000,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'581',1100,74300,,'',0,7600,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,1100,0,'Orchard Pk',0,5900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,8100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'582',1100,64000,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'577',1400,121400,,'',0,73700,,'',0
-'578',1400,121400,,'',0,73700,,'',0
-'579',1400,121400,,'',0,73700,,'',0
-'580',1400,121400,,'',0,73700,,'',0
-'582',1400,121400,,'',0,73700,,'',0
+'583',1100,64000,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'584',1100,64000,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'585',1100,74300,,'',0,7600,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,1100,0,'Orchard Pk',0,5900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,8100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'586',1100,75600,,'',0,8400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,1100,0,'Orchard Pk',0,8900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'587',1100,64000,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'588',1100,64000,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'589',1100,64000,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'583',1400,121400,,'',0,73700,,'',0
+'584',1400,121400,,'',0,73700,,'',0
+'587',1400,121400,,'',0,73700,,'',0
+'588',1400,121400,,'',0,73700,,'',0
+'589',1400,121400,,'',0,73700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_431 b/src/main/res-current/raw/current_gtfs_schedule_stop_431
index a5c2ccccb..a7deee09c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_431
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_431
@@ -1,31 +1,31 @@
-'576',801,85800,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'577',801,60500,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'578',801,60500,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'579',801,60500,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'580',801,60500,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'581',801,72600,,'',0,8000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
-'582',801,60500,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'576',1000,75600,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'North Rutland',0
-'577',1000,55600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'578',1000,55600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'579',1000,55600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'580',1000,55600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'581',1000,75300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'North Rutland',0
-'582',1000,55600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'576',1100,75500,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'577',1100,63900,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'578',1100,63900,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'579',1100,63900,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'580',1100,63900,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'581',1100,74200,,'',0,7900,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'582',1100,63900,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'577',1400,121300,,'',0,73700,,'',0
-'577',1401,63900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'578',1400,121300,,'',0,73700,,'',0
-'578',1401,63900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'579',1400,121300,,'',0,73700,,'',0
-'579',1401,63900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'580',1400,121300,,'',0,73700,,'',0
-'580',1401,63900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'582',1400,121300,,'',0,73700,,'',0
-'582',1401,63900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'583',801,60500,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'584',801,60500,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'585',801,72600,,'',0,8000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
+'586',801,85800,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'587',801,60500,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'588',801,60500,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'589',801,60500,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'583',1000,55600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'584',1000,55600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'585',1000,75300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'North Rutland',0
+'586',1000,75600,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'North Rutland',0
+'587',1000,55600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'588',1000,55600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'589',1000,55600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'583',1100,63900,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'584',1100,63900,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'585',1100,74200,,'',0,7900,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'586',1100,75500,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'587',1100,63900,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'588',1100,63900,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'589',1100,63900,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'583',1400,121300,,'',0,73700,,'',0
+'583',1401,63900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'584',1400,121300,,'',0,73700,,'',0
+'584',1401,63900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'587',1400,121300,,'',0,73700,,'',0
+'587',1401,63900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'588',1400,121300,,'',0,73700,,'',0
+'588',1401,63900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'589',1400,121300,,'',0,73700,,'',0
+'589',1401,63900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_432 b/src/main/res-current/raw/current_gtfs_schedule_stop_432
index 82239eec6..c1bbcf6b9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_432
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_432
@@ -1,12 +1,12 @@
-'576',1100,75800,,'',0,8300,0,'Orchard Pk',0,10900,,'',0,10000,,'',0,5500,0,'Orchard Pk',0,4500,,'',0,10000,0,'Orchard Pk',0,10000,,'',0,8500,0,'Orchard Pk',0,1500,,'',0,10000,,'',0,10000,,'',0,5000,0,'Orchard Pk',0,5000,,'',0,10000,,'',0,7500,0,'Orchard Pk',0,2500,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'577',1100,64200,,'',0,8600,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'578',1100,64200,,'',0,8600,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'579',1100,64200,,'',0,8600,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'580',1100,64200,,'',0,8600,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'581',1100,74500,,'',0,7600,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,1100,0,'Orchard Pk',0,5900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,7000,,'',0,3000,,'',0,15500,,'',0,4000,0,'Orchard Pk',0,6500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'582',1100,64200,,'',0,8600,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'577',1400,121500,,'',0,73700,,'',0
-'578',1400,121500,,'',0,73700,,'',0
-'579',1400,121500,,'',0,73700,,'',0
-'580',1400,121500,,'',0,73700,,'',0
-'582',1400,121500,,'',0,73700,,'',0
+'583',1100,64200,,'',0,8600,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'584',1100,64200,,'',0,8600,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'585',1100,74500,,'',0,7600,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,1100,0,'Orchard Pk',0,5900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,7000,,'',0,3000,,'',0,15500,,'',0,4000,0,'Orchard Pk',0,6500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'586',1100,75800,,'',0,8300,0,'Orchard Pk',0,10900,,'',0,10000,,'',0,5500,0,'Orchard Pk',0,4500,,'',0,10000,0,'Orchard Pk',0,10000,,'',0,8500,0,'Orchard Pk',0,1500,,'',0,10000,,'',0,10000,,'',0,5000,0,'Orchard Pk',0,5000,,'',0,10000,,'',0,7500,0,'Orchard Pk',0,2500,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'587',1100,64200,,'',0,8600,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'588',1100,64200,,'',0,8600,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'589',1100,64200,,'',0,8600,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'583',1400,121500,,'',0,73700,,'',0
+'584',1400,121500,,'',0,73700,,'',0
+'587',1400,121500,,'',0,73700,,'',0
+'588',1400,121500,,'',0,73700,,'',0
+'589',1400,121500,,'',0,73700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_433 b/src/main/res-current/raw/current_gtfs_schedule_stop_433
index 8bd62e935..2e3ebfc30 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_433
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_433
@@ -1,12 +1,12 @@
-'576',1101,80900,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,6900,0,'Black Mtn',0,3100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'577',1101,71200,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'578',1101,71200,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'579',1101,71200,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'580',1101,71200,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'581',1101,83000,,'',0,7000,,'',0,2200,0,'Black Mtn',0,800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1900,0,'Black Mtn',0,1100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1900,0,'Black Mtn',0,1100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1400,0,'Black Mtn',0,5600,,'',0,3000,,'',0,7000,,'',0,1900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
-'582',1101,71200,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'577',1401,114700,,'',0,77800,,'',0
-'578',1401,114700,,'',0,77800,,'',0
-'579',1401,114700,,'',0,77800,,'',0
-'580',1401,114700,,'',0,77800,,'',0
-'582',1401,114700,,'',0,77800,,'',0
+'583',1101,71200,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'584',1101,71200,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'585',1101,83000,,'',0,7000,,'',0,2200,0,'Black Mtn',0,800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1900,0,'Black Mtn',0,1100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1900,0,'Black Mtn',0,1100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1400,0,'Black Mtn',0,5600,,'',0,3000,,'',0,7000,,'',0,1900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
+'586',1101,80900,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,6900,0,'Black Mtn',0,3100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
+'587',1101,71200,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'588',1101,71200,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'589',1101,71200,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'583',1401,114700,,'',0,77800,,'',0
+'584',1401,114700,,'',0,77800,,'',0
+'587',1401,114700,,'',0,77800,,'',0
+'588',1401,114700,,'',0,77800,,'',0
+'589',1401,114700,,'',0,77800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43309 b/src/main/res-current/raw/current_gtfs_schedule_stop_43309
index 84354b570..46b5ee5ce 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43309
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43309
@@ -1,7 +1,7 @@
-'576',1700,84100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',1700,61700,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1700,61700,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1700,61700,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1700,61700,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1700,84200,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'582',1700,61700,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1700,61700,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1700,61700,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1700,84200,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'586',1700,84100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',1700,61700,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1700,61700,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1700,61700,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43313 b/src/main/res-current/raw/current_gtfs_schedule_stop_43313
index c45d56fb0..529608d56 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43313
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43313
@@ -1,10 +1,10 @@
-'577',2600,70700,4,'',0,9500,4,'',0,4600,4,'',0,70200,4,'',0,9800,4,'',0,9400,4,'',0
-'577',2601,71000,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
-'578',2600,70700,4,'',0,9500,4,'',0,4600,4,'',0,70200,4,'',0,9800,4,'',0,9400,4,'',0
-'578',2601,71000,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
-'579',2600,70700,4,'',0,9500,4,'',0,4600,4,'',0,70200,4,'',0,9800,4,'',0,9400,4,'',0
-'579',2601,71000,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
-'580',2600,70700,4,'',0,9500,4,'',0,4600,4,'',0,70200,4,'',0,9800,4,'',0,9400,4,'',0
-'580',2601,71000,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
-'582',2600,70700,4,'',0,9500,4,'',0,4600,4,'',0,70200,4,'',0,9800,4,'',0,9400,4,'',0
-'582',2601,71000,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
+'583',2600,70700,4,'',0,9500,4,'',0,4600,4,'',0,70200,4,'',0,9800,4,'',0,9400,4,'',0
+'583',2601,71000,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
+'584',2600,70700,4,'',0,9500,4,'',0,4600,4,'',0,70200,4,'',0,9800,4,'',0,9400,4,'',0
+'584',2601,71000,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
+'587',2600,70700,4,'',0,9500,4,'',0,4600,4,'',0,70200,4,'',0,9800,4,'',0,9400,4,'',0
+'587',2601,71000,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
+'588',2600,70700,4,'',0,9500,4,'',0,4600,4,'',0,70200,4,'',0,9800,4,'',0,9400,4,'',0
+'588',2601,71000,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
+'589',2600,70700,4,'',0,9500,4,'',0,4600,4,'',0,70200,4,'',0,9800,4,'',0,9400,4,'',0
+'589',2601,71000,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43314 b/src/main/res-current/raw/current_gtfs_schedule_stop_43314
index cbceef5ca..151b710f5 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43314
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43314
@@ -1,5 +1,5 @@
-'577',2600,65700,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'578',2600,65700,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'579',2600,65700,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'580',2600,65700,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'582',2600,65700,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'583',2600,65700,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'584',2600,65700,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'587',2600,65700,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'588',2600,65700,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'589',2600,65700,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43315 b/src/main/res-current/raw/current_gtfs_schedule_stop_43315
index e848493e0..572291207 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43315
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43315
@@ -1,5 +1,5 @@
-'577',2600,65200,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'578',2600,65200,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'579',2600,65200,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'580',2600,65200,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'582',2600,65200,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'583',2600,65200,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'584',2600,65200,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'587',2600,65200,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'588',2600,65200,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'589',2600,65200,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43316 b/src/main/res-current/raw/current_gtfs_schedule_stop_43316
index 9e2544f72..0d1e56b56 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43316
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43316
@@ -1,7 +1,7 @@
-'576',2401,81800,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
-'577',2401,55700,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'578',2401,55700,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'579',2401,55700,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'580',2401,55700,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'581',2401,72600,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'582',2401,55700,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'583',2401,55700,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'584',2401,55700,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'585',2401,72600,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'586',2401,81800,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
+'587',2401,55700,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'588',2401,55700,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'589',2401,55700,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43317 b/src/main/res-current/raw/current_gtfs_schedule_stop_43317
index 62af295f8..fccea4e5b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43317
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43317
@@ -1,5 +1,5 @@
-'577',2600,70500,,'',0,9500,,'',0,4600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'578',2600,70500,,'',0,9500,,'',0,4600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'579',2600,70500,,'',0,9500,,'',0,4600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'580',2600,70500,,'',0,9500,,'',0,4600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'582',2600,70500,,'',0,9500,,'',0,4600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'583',2600,70500,,'',0,9500,,'',0,4600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'584',2600,70500,,'',0,9500,,'',0,4600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'587',2600,70500,,'',0,9500,,'',0,4600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'588',2600,70500,,'',0,9500,,'',0,4600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'589',2600,70500,,'',0,9500,,'',0,4600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43318 b/src/main/res-current/raw/current_gtfs_schedule_stop_43318
index 9e33b27fb..4ff3655be 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43318
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43318
@@ -1,7 +1,7 @@
-'576',2401,81200,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
-'577',2401,55100,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'578',2401,55100,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'579',2401,55100,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'580',2401,55100,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'581',2401,72000,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'582',2401,55100,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'583',2401,55100,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'584',2401,55100,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'585',2401,72000,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'586',2401,81200,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
+'587',2401,55100,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'588',2401,55100,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'589',2401,55100,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43319 b/src/main/res-current/raw/current_gtfs_schedule_stop_43319
index 5848569ea..2574a6a60 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43319
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43319
@@ -1,5 +1,5 @@
-'577',2600,65500,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'578',2600,65500,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'579',2600,65500,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'580',2600,65500,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'582',2600,65500,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'583',2600,65500,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'584',2600,65500,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'587',2600,65500,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'588',2600,65500,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'589',2600,65500,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43320 b/src/main/res-current/raw/current_gtfs_schedule_stop_43320
index cde88bd36..132142393 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43320
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43320
@@ -1,5 +1,5 @@
-'577',2600,64700,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'578',2600,64700,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'579',2600,64700,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'580',2600,64700,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'582',2600,64700,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'583',2600,64700,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'584',2600,64700,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'587',2600,64700,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'588',2600,64700,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'589',2600,64700,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43321 b/src/main/res-current/raw/current_gtfs_schedule_stop_43321
index dc4707e08..4ebfd9f4c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43321
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43321
@@ -1,5 +1,5 @@
-'577',2600,65000,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'578',2600,65000,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'579',2600,65000,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'580',2600,65000,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'582',2600,65000,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'583',2600,65000,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'584',2600,65000,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'587',2600,65000,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'588',2600,65000,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'589',2600,65000,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43322 b/src/main/res-current/raw/current_gtfs_schedule_stop_43322
index 804efdb46..ffa1fbe99 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43322
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43322
@@ -1,5 +1,5 @@
-'577',2600,64600,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'578',2600,64600,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'579',2600,64600,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'580',2600,64600,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'582',2600,64600,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'583',2600,64600,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'584',2600,64600,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'587',2600,64600,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'588',2600,64600,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'589',2600,64600,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43323 b/src/main/res-current/raw/current_gtfs_schedule_stop_43323
index a0e30ffe2..695a54053 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43323
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43323
@@ -1,5 +1,5 @@
-'577',2600,64900,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'578',2600,64900,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'579',2600,64900,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'580',2600,64900,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'582',2600,64900,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'583',2600,64900,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'584',2600,64900,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'587',2600,64900,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'588',2600,64900,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'589',2600,64900,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43324 b/src/main/res-current/raw/current_gtfs_schedule_stop_43324
index 804efdb46..ffa1fbe99 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43324
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43324
@@ -1,5 +1,5 @@
-'577',2600,64600,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'578',2600,64600,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'579',2600,64600,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'580',2600,64600,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'582',2600,64600,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'583',2600,64600,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'584',2600,64600,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'587',2600,64600,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'588',2600,64600,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'589',2600,64600,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43325 b/src/main/res-current/raw/current_gtfs_schedule_stop_43325
index 205aa2a26..551161825 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43325
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43325
@@ -1,7 +1,7 @@
-'576',2401,81600,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
-'577',2401,55500,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'578',2401,55500,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'579',2401,55500,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'580',2401,55500,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'581',2401,72400,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'582',2401,55500,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'583',2401,55500,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'584',2401,55500,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'585',2401,72400,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'586',2401,81600,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
+'587',2401,55500,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'588',2401,55500,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'589',2401,55500,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43326 b/src/main/res-current/raw/current_gtfs_schedule_stop_43326
index 961639a0f..cf6745858 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43326
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43326
@@ -1,5 +1,5 @@
-'577',2600,65400,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'578',2600,65400,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'579',2600,65400,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'580',2600,65400,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'582',2600,65400,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'583',2600,65400,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'584',2600,65400,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'587',2600,65400,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'588',2600,65400,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'589',2600,65400,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43327 b/src/main/res-current/raw/current_gtfs_schedule_stop_43327
index 9c809e576..ab037fe94 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43327
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43327
@@ -1,7 +1,7 @@
-'576',2401,81700,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
-'577',2401,55600,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'578',2401,55600,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'579',2401,55600,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'580',2401,55600,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'581',2401,72500,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'582',2401,55600,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'583',2401,55600,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'584',2401,55600,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'585',2401,72500,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'586',2401,81700,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
+'587',2401,55600,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'588',2401,55600,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'589',2401,55600,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43328 b/src/main/res-current/raw/current_gtfs_schedule_stop_43328
index d174543bc..f637cc1cd 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43328
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43328
@@ -1,5 +1,5 @@
-'577',2601,71300,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
-'578',2601,71300,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
-'579',2601,71300,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
-'580',2601,71300,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
-'582',2601,71300,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
+'583',2601,71300,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
+'584',2601,71300,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
+'587',2601,71300,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
+'588',2601,71300,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
+'589',2601,71300,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43329 b/src/main/res-current/raw/current_gtfs_schedule_stop_43329
index cffe3e99d..396fd34d2 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43329
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43329
@@ -1,7 +1,7 @@
-'576',2401,82000,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
-'577',2401,55900,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,14600,,'',0,11100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'578',2401,55900,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,14600,,'',0,11100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'579',2401,55900,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,14600,,'',0,11100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'580',2401,55900,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,14600,,'',0,11100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'581',2401,72800,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,16900,,'',0,5100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'582',2401,55900,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,14600,,'',0,11100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'583',2401,55900,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,14600,,'',0,11100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'584',2401,55900,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,14600,,'',0,11100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'585',2401,72800,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,16900,,'',0,5100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'586',2401,82000,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
+'587',2401,55900,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,14600,,'',0,11100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'588',2401,55900,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,14600,,'',0,11100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'589',2401,55900,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,14600,,'',0,11100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43330 b/src/main/res-current/raw/current_gtfs_schedule_stop_43330
index cffe3e99d..396fd34d2 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43330
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43330
@@ -1,7 +1,7 @@
-'576',2401,82000,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
-'577',2401,55900,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,14600,,'',0,11100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'578',2401,55900,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,14600,,'',0,11100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'579',2401,55900,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,14600,,'',0,11100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'580',2401,55900,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,14600,,'',0,11100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'581',2401,72800,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,16900,,'',0,5100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'582',2401,55900,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,14600,,'',0,11100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'583',2401,55900,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,14600,,'',0,11100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'584',2401,55900,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,14600,,'',0,11100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'585',2401,72800,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,16900,,'',0,5100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'586',2401,82000,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
+'587',2401,55900,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,14600,,'',0,11100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'588',2401,55900,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,14600,,'',0,11100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'589',2401,55900,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,14600,,'',0,11100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43331 b/src/main/res-current/raw/current_gtfs_schedule_stop_43331
index c753d632c..8d628b30e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43331
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43331
@@ -1,5 +1,5 @@
-'577',2600,65600,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'578',2600,65600,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'579',2600,65600,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'580',2600,65600,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'582',2600,65600,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'583',2600,65600,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'584',2600,65600,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'587',2600,65600,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'588',2600,65600,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'589',2600,65600,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43332 b/src/main/res-current/raw/current_gtfs_schedule_stop_43332
index e33478f6a..0b1c95729 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43332
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43332
@@ -1,5 +1,5 @@
-'577',2600,70200,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'578',2600,70200,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'579',2600,70200,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'580',2600,70200,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'582',2600,70200,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'583',2600,70200,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'584',2600,70200,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'587',2600,70200,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'588',2600,70200,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'589',2600,70200,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43333 b/src/main/res-current/raw/current_gtfs_schedule_stop_43333
index e33478f6a..0b1c95729 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43333
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43333
@@ -1,5 +1,5 @@
-'577',2600,70200,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'578',2600,70200,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'579',2600,70200,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'580',2600,70200,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'582',2600,70200,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'583',2600,70200,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'584',2600,70200,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'587',2600,70200,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'588',2600,70200,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'589',2600,70200,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43334 b/src/main/res-current/raw/current_gtfs_schedule_stop_43334
index 9d3649218..74375eb2e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43334
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43334
@@ -1,5 +1,5 @@
-'577',2600,70300,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'578',2600,70300,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'579',2600,70300,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'580',2600,70300,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'582',2600,70300,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'583',2600,70300,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'584',2600,70300,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'587',2600,70300,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'588',2600,70300,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'589',2600,70300,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43335 b/src/main/res-current/raw/current_gtfs_schedule_stop_43335
index 10ecc3699..6e4f4b099 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43335
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43335
@@ -1,5 +1,5 @@
-'577',2600,65900,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'578',2600,65900,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'579',2600,65900,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'580',2600,65900,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'582',2600,65900,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'583',2600,65900,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'584',2600,65900,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'587',2600,65900,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'588',2600,65900,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'589',2600,65900,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43336 b/src/main/res-current/raw/current_gtfs_schedule_stop_43336
index 35c12f857..9f0945fdd 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43336
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43336
@@ -1,5 +1,5 @@
-'577',2600,70000,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'578',2600,70000,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'579',2600,70000,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'580',2600,70000,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'582',2600,70000,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'583',2600,70000,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'584',2600,70000,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'587',2600,70000,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'588',2600,70000,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'589',2600,70000,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43337 b/src/main/res-current/raw/current_gtfs_schedule_stop_43337
index 10ecc3699..6e4f4b099 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43337
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43337
@@ -1,5 +1,5 @@
-'577',2600,65900,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'578',2600,65900,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'579',2600,65900,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'580',2600,65900,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'582',2600,65900,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'583',2600,65900,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'584',2600,65900,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'587',2600,65900,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'588',2600,65900,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'589',2600,65900,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43338 b/src/main/res-current/raw/current_gtfs_schedule_stop_43338
index 2ef4ae314..93e93d469 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43338
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43338
@@ -1,5 +1,5 @@
-'577',2600,70100,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'578',2600,70100,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'579',2600,70100,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'580',2600,70100,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'582',2600,70100,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'583',2600,70100,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'584',2600,70100,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'587',2600,70100,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'588',2600,70100,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'589',2600,70100,,'',0,5500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43339 b/src/main/res-current/raw/current_gtfs_schedule_stop_43339
index d227d4d4f..f7537e29b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43339
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43339
@@ -1,5 +1,5 @@
-'577',2601,71800,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,14400,,'',0,10000,,'',0
-'578',2601,71800,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,14400,,'',0,10000,,'',0
-'579',2601,71800,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,14400,,'',0,10000,,'',0
-'580',2601,71800,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,14400,,'',0,10000,,'',0
-'582',2601,71800,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,14400,,'',0,10000,,'',0
+'583',2601,71800,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,14400,,'',0,10000,,'',0
+'584',2601,71800,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,14400,,'',0,10000,,'',0
+'587',2601,71800,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,14400,,'',0,10000,,'',0
+'588',2601,71800,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,14400,,'',0,10000,,'',0
+'589',2601,71800,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,14400,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43340 b/src/main/res-current/raw/current_gtfs_schedule_stop_43340
index bdbc7f9b1..6121ed564 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43340
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43340
@@ -1,5 +1,5 @@
-'577',2600,65300,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'578',2600,65300,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'579',2600,65300,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'580',2600,65300,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'582',2600,65300,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'583',2600,65300,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'584',2600,65300,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'587',2600,65300,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'588',2600,65300,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'589',2600,65300,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43341 b/src/main/res-current/raw/current_gtfs_schedule_stop_43341
index 5579e60be..28e493ccf 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43341
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43341
@@ -1,7 +1,7 @@
-'576',2401,81300,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
-'577',2401,55200,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'578',2401,55200,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'579',2401,55200,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'580',2401,55200,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'581',2401,72100,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'582',2401,55200,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'583',2401,55200,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'584',2401,55200,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'585',2401,72100,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'586',2401,81300,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
+'587',2401,55200,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'588',2401,55200,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'589',2401,55200,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43342 b/src/main/res-current/raw/current_gtfs_schedule_stop_43342
index 7b817662e..1e38c40db 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43342
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43342
@@ -1,7 +1,7 @@
-'576',2401,81400,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
-'577',2401,55300,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'578',2401,55300,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'579',2401,55300,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'580',2401,55300,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'581',2401,72200,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'582',2401,55300,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'583',2401,55300,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'584',2401,55300,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'585',2401,72200,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'586',2401,81400,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
+'587',2401,55300,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'588',2401,55300,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'589',2401,55300,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43343 b/src/main/res-current/raw/current_gtfs_schedule_stop_43343
index 8689a37ee..e6b1e4795 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43343
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43343
@@ -1,7 +1,7 @@
-'576',2401,81500,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
-'577',2401,55400,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'578',2401,55400,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'579',2401,55400,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'580',2401,55400,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'581',2401,72300,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'582',2401,55400,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'583',2401,55400,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'584',2401,55400,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'585',2401,72300,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'586',2401,81500,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
+'587',2401,55400,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'588',2401,55400,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'589',2401,55400,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43344 b/src/main/res-current/raw/current_gtfs_schedule_stop_43344
index a2c4a4afb..b5b9a4e7b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43344
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43344
@@ -1,5 +1,5 @@
-'577',2600,65100,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'578',2600,65100,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'579',2600,65100,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'580',2600,65100,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'582',2600,65100,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'583',2600,65100,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'584',2600,65100,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'587',2600,65100,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'588',2600,65100,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'589',2600,65100,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43345 b/src/main/res-current/raw/current_gtfs_schedule_stop_43345
index e848493e0..572291207 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43345
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43345
@@ -1,5 +1,5 @@
-'577',2600,65200,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'578',2600,65200,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'579',2600,65200,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'580',2600,65200,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'582',2600,65200,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'583',2600,65200,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'584',2600,65200,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'587',2600,65200,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'588',2600,65200,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'589',2600,65200,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43346 b/src/main/res-current/raw/current_gtfs_schedule_stop_43346
index 34849f282..8525b72f6 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43346
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43346
@@ -1,7 +1,7 @@
-'576',2400,73200,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,5300,,'',0,14700,,'',0,10100,,'',0,9900,,'',0
-'577',2400,61400,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,14300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'578',2400,61400,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,14300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'579',2400,61400,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,14300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'580',2400,61400,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,14300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'581',2400,82700,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,14500,,'',0,10500,,'',0,10500,,'',0
-'582',2400,61400,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,14300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'583',2400,61400,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,14300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'584',2400,61400,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,14300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'585',2400,82700,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,14500,,'',0,10500,,'',0,10500,,'',0
+'586',2400,73200,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,5300,,'',0,14700,,'',0,10100,,'',0,9900,,'',0
+'587',2400,61400,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,14300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'588',2400,61400,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,14300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'589',2400,61400,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,14300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43347 b/src/main/res-current/raw/current_gtfs_schedule_stop_43347
index fffce4ccf..ed6138c1e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43347
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43347
@@ -1,7 +1,7 @@
-'576',2400,73000,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,5300,,'',0,14700,,'',0,10100,,'',0,9900,,'',0
-'577',2400,61200,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,14300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'578',2400,61200,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,14300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'579',2400,61200,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,14300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'580',2400,61200,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,14300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'581',2400,82500,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,14500,,'',0,10500,,'',0
-'582',2400,61200,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,14300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'583',2400,61200,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,14300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'584',2400,61200,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,14300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'585',2400,82500,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,14500,,'',0,10500,,'',0
+'586',2400,73000,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,5300,,'',0,14700,,'',0,10100,,'',0,9900,,'',0
+'587',2400,61200,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,14300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'588',2400,61200,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,14300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'589',2400,61200,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,14300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43348 b/src/main/res-current/raw/current_gtfs_schedule_stop_43348
index fffce4ccf..ed6138c1e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43348
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43348
@@ -1,7 +1,7 @@
-'576',2400,73000,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,5300,,'',0,14700,,'',0,10100,,'',0,9900,,'',0
-'577',2400,61200,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,14300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'578',2400,61200,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,14300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'579',2400,61200,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,14300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'580',2400,61200,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,14300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'581',2400,82500,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,14500,,'',0,10500,,'',0
-'582',2400,61200,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,14300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'583',2400,61200,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,14300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'584',2400,61200,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,14300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'585',2400,82500,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,14500,,'',0,10500,,'',0
+'586',2400,73000,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,5300,,'',0,14700,,'',0,10100,,'',0,9900,,'',0
+'587',2400,61200,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,14300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'588',2400,61200,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,14300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'589',2400,61200,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,14300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43349 b/src/main/res-current/raw/current_gtfs_schedule_stop_43349
index 127b6550b..c77c47069 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43349
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43349
@@ -1,5 +1,5 @@
-'577',2600,70600,,'',0,9500,,'',0,4600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'578',2600,70600,,'',0,9500,,'',0,4600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'579',2600,70600,,'',0,9500,,'',0,4600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'580',2600,70600,,'',0,9500,,'',0,4600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'582',2600,70600,,'',0,9500,,'',0,4600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'583',2600,70600,,'',0,9500,,'',0,4600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'584',2600,70600,,'',0,9500,,'',0,4600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'587',2600,70600,,'',0,9500,,'',0,4600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'588',2600,70600,,'',0,9500,,'',0,4600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'589',2600,70600,,'',0,9500,,'',0,4600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43350 b/src/main/res-current/raw/current_gtfs_schedule_stop_43350
index f38f533ad..206ca69f1 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43350
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43350
@@ -1,7 +1,7 @@
-'576',2400,72700,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,14200,,'',0,5300,,'',0,14700,,'',0,10100,,'',0,9900,,'',0
-'577',2400,60900,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,14400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'578',2400,60900,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,14400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'579',2400,60900,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,14400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'580',2400,60900,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,14400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'581',2400,82200,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,14500,,'',0,10500,,'',0
-'582',2400,60900,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,14400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'583',2400,60900,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,14400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'584',2400,60900,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,14400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'585',2400,82200,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,14500,,'',0,10500,,'',0
+'586',2400,72700,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,14200,,'',0,5300,,'',0,14700,,'',0,10100,,'',0,9900,,'',0
+'587',2400,60900,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,14400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'588',2400,60900,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,14400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'589',2400,60900,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,14400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43351 b/src/main/res-current/raw/current_gtfs_schedule_stop_43351
index 66162c1fb..6ba9521cf 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43351
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43351
@@ -1,7 +1,7 @@
-'576',2400,72800,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,5300,,'',0,14700,,'',0,10100,,'',0,9900,,'',0
-'577',2400,61000,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,14400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'578',2400,61000,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,14400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'579',2400,61000,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,14400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'580',2400,61000,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,14400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'581',2400,82300,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,14500,,'',0,10500,,'',0
-'582',2400,61000,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,14400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'583',2400,61000,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,14400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'584',2400,61000,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,14400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'585',2400,82300,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,14500,,'',0,10500,,'',0
+'586',2400,72800,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,5300,,'',0,14700,,'',0,10100,,'',0,9900,,'',0
+'587',2400,61000,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,14400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'588',2400,61000,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,14400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'589',2400,61000,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,14400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43352 b/src/main/res-current/raw/current_gtfs_schedule_stop_43352
index 54fe91d3f..22232f7f2 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43352
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43352
@@ -1,5 +1,5 @@
-'577',2601,72000,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'578',2601,72000,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'579',2601,72000,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'580',2601,72000,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'582',2601,72000,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'583',2601,72000,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'584',2601,72000,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'587',2601,72000,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'588',2601,72000,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'589',2601,72000,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43353 b/src/main/res-current/raw/current_gtfs_schedule_stop_43353
index f33b46568..c3851e75c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43353
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43353
@@ -1,5 +1,5 @@
-'577',2601,71900,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'578',2601,71900,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'579',2601,71900,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'580',2601,71900,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'582',2601,71900,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'583',2601,71900,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'584',2601,71900,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'587',2601,71900,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'588',2601,71900,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'589',2601,71900,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43354 b/src/main/res-current/raw/current_gtfs_schedule_stop_43354
index 1b5c2ecf7..36724bf03 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43354
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43354
@@ -1,5 +1,5 @@
-'577',2601,72100,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'578',2601,72100,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'579',2601,72100,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'580',2601,72100,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'582',2601,72100,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'583',2601,72100,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'584',2601,72100,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'587',2601,72100,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'588',2601,72100,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'589',2601,72100,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43355 b/src/main/res-current/raw/current_gtfs_schedule_stop_43355
index 08b31995e..73ca04680 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43355
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43355
@@ -1,7 +1,7 @@
-'576',2400,73300,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
-'577',2400,61500,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'578',2400,61500,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'579',2400,61500,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'580',2400,61500,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'581',2400,82800,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,10200,,'',0,14500,,'',0,10500,,'',0,10500,,'',0
-'582',2400,61500,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'583',2400,61500,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'584',2400,61500,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'585',2400,82800,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,10200,,'',0,14500,,'',0,10500,,'',0,10500,,'',0
+'586',2400,73300,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
+'587',2400,61500,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'588',2400,61500,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'589',2400,61500,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43356 b/src/main/res-current/raw/current_gtfs_schedule_stop_43356
index 08b31995e..73ca04680 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43356
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43356
@@ -1,7 +1,7 @@
-'576',2400,73300,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
-'577',2400,61500,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'578',2400,61500,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'579',2400,61500,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'580',2400,61500,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'581',2400,82800,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,10200,,'',0,14500,,'',0,10500,,'',0,10500,,'',0
-'582',2400,61500,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'583',2400,61500,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'584',2400,61500,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'585',2400,82800,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,10200,,'',0,14500,,'',0,10500,,'',0,10500,,'',0
+'586',2400,73300,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
+'587',2400,61500,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'588',2400,61500,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'589',2400,61500,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43357 b/src/main/res-current/raw/current_gtfs_schedule_stop_43357
index ec7e6817a..89670bae2 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43357
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43357
@@ -1,7 +1,7 @@
-'576',2400,72900,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,5300,,'',0,14700,,'',0,10100,,'',0,9900,,'',0
-'577',2400,61100,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,14400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'578',2400,61100,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,14400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'579',2400,61100,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,14400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'580',2400,61100,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,14400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'581',2400,82400,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,14500,,'',0,10500,,'',0
-'582',2400,61100,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,14400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'583',2400,61100,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,14400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'584',2400,61100,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,14400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'585',2400,82400,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,14500,,'',0,10500,,'',0
+'586',2400,72900,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,5300,,'',0,14700,,'',0,10100,,'',0,9900,,'',0
+'587',2400,61100,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,14400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'588',2400,61100,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,14400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'589',2400,61100,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,14400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_43358 b/src/main/res-current/raw/current_gtfs_schedule_stop_43358
index 13732e23e..8523703f0 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_43358
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_43358
@@ -1,5 +1,5 @@
-'577',2601,71500,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,14400,,'',0,10000,,'',0
-'578',2601,71500,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,14400,,'',0,10000,,'',0
-'579',2601,71500,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,14400,,'',0,10000,,'',0
-'580',2601,71500,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,14400,,'',0,10000,,'',0
-'582',2601,71500,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,14400,,'',0,10000,,'',0
+'583',2601,71500,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,14400,,'',0,10000,,'',0
+'584',2601,71500,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,14400,,'',0,10000,,'',0
+'587',2601,71500,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,14400,,'',0,10000,,'',0
+'588',2601,71500,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,14400,,'',0,10000,,'',0
+'589',2601,71500,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,14400,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_434 b/src/main/res-current/raw/current_gtfs_schedule_stop_434
index f17e4038d..2fd40a75f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_434
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_434
@@ -1,7 +1,7 @@
-'576',1501,83700,,'',0,20000,,'',0,40000,,'',0,27000,,'',0
-'577',1501,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'578',1501,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'579',1501,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'580',1501,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'581',1501,93800,,'',0,17000,,'',0,20000,,'',0,20000,,'',0,10200,,'',0,10000,,'',0
-'582',1501,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'583',1501,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'584',1501,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'585',1501,93800,,'',0,17000,,'',0,20000,,'',0,20000,,'',0,10200,,'',0,10000,,'',0
+'586',1501,83700,,'',0,20000,,'',0,40000,,'',0,27000,,'',0
+'587',1501,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'588',1501,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'589',1501,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_435 b/src/main/res-current/raw/current_gtfs_schedule_stop_435
index 665404cbd..9bd68fd92 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_435
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_435
@@ -1,12 +1,12 @@
-'576',1100,75700,,'',0,8300,0,'Orchard Pk',0,10900,,'',0,10000,,'',0,5500,0,'Orchard Pk',0,4500,,'',0,10000,0,'Orchard Pk',0,10000,,'',0,8500,0,'Orchard Pk',0,1500,,'',0,10000,,'',0,10000,,'',0,1000,0,'Orchard Pk',0,9000,,'',0,10000,,'',0,7500,0,'Orchard Pk',0,2500,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'577',1100,64100,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'578',1100,64100,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'579',1100,64100,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'580',1100,64100,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'581',1100,74400,,'',0,7600,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,1100,0,'Orchard Pk',0,5900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,8000,0,'Orchard Pk',0,6500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'582',1100,64100,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'577',1400,121400,,'',0,73700,,'',0
-'578',1400,121400,,'',0,73700,,'',0
-'579',1400,121400,,'',0,73700,,'',0
-'580',1400,121400,,'',0,73700,,'',0
-'582',1400,121400,,'',0,73700,,'',0
+'583',1100,64100,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'584',1100,64100,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'585',1100,74400,,'',0,7600,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,1100,0,'Orchard Pk',0,5900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,8000,0,'Orchard Pk',0,6500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'586',1100,75700,,'',0,8300,0,'Orchard Pk',0,10900,,'',0,10000,,'',0,5500,0,'Orchard Pk',0,4500,,'',0,10000,0,'Orchard Pk',0,10000,,'',0,8500,0,'Orchard Pk',0,1500,,'',0,10000,,'',0,10000,,'',0,1000,0,'Orchard Pk',0,9000,,'',0,10000,,'',0,7500,0,'Orchard Pk',0,2500,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'587',1100,64100,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'588',1100,64100,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'589',1100,64100,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'583',1400,121400,,'',0,73700,,'',0
+'584',1400,121400,,'',0,73700,,'',0
+'587',1400,121400,,'',0,73700,,'',0
+'588',1400,121400,,'',0,73700,,'',0
+'589',1400,121400,,'',0,73700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_436 b/src/main/res-current/raw/current_gtfs_schedule_stop_436
index 99f50c3a3..234d6c353 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_436
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_436
@@ -1,6 +1,6 @@
-'576',801,85800,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'581',801,72600,,'',0,8000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
-'576',1000,75600,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'North Rutland',0
-'581',1000,75300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'North Rutland',0
-'576',1100,75500,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'581',1100,74200,,'',0,7900,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'585',801,72600,,'',0,8000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
+'586',801,85800,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'585',1000,75300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'North Rutland',0
+'586',1000,75600,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'North Rutland',0
+'585',1100,74200,,'',0,7900,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'586',1100,75500,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_437 b/src/main/res-current/raw/current_gtfs_schedule_stop_437
index e11fd5635..da0eff2a7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_437
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_437
@@ -1,12 +1,12 @@
-'576',1101,81000,0,'Black Mtn',0,12500,,'',0,10000,0,'Black Mtn',0,10000,,'',0,8500,0,'Black Mtn',0,1500,,'',0,10000,,'',0,7000,0,'Black Mtn',0,3000,,'',0,10000,,'',0,9500,0,'Black Mtn',0,500,,'',0,10000,,'',0,10000,,'',0,2000,0,'Black Mtn',0,8000,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'577',1101,71200,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'578',1101,71200,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'579',1101,71200,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'580',1101,71200,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'581',1101,83000,,'',0,7000,,'',0,2300,0,'Black Mtn',0,700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2000,0,'Black Mtn',0,1000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2000,0,'Black Mtn',0,1000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,0,'Black Mtn',0,5500,,'',0,3000,,'',0,7000,,'',0,2000,0,'Black Mtn',0,1000,,'',0,11500,,'',0,6200,0,'Black Mtn',0,4300,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
-'582',1101,71200,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'577',1401,114700,,'',0,77900,,'',0
-'578',1401,114700,,'',0,77900,,'',0
-'579',1401,114700,,'',0,77900,,'',0
-'580',1401,114700,,'',0,77900,,'',0
-'582',1401,114700,,'',0,77900,,'',0
+'583',1101,71200,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'584',1101,71200,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'585',1101,83000,,'',0,7000,,'',0,2300,0,'Black Mtn',0,700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2000,0,'Black Mtn',0,1000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2000,0,'Black Mtn',0,1000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,0,'Black Mtn',0,5500,,'',0,3000,,'',0,7000,,'',0,2000,0,'Black Mtn',0,1000,,'',0,11500,,'',0,6200,0,'Black Mtn',0,4300,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
+'586',1101,81000,0,'Black Mtn',0,12500,,'',0,10000,0,'Black Mtn',0,10000,,'',0,8500,0,'Black Mtn',0,1500,,'',0,10000,,'',0,7000,0,'Black Mtn',0,3000,,'',0,10000,,'',0,9500,0,'Black Mtn',0,500,,'',0,10000,,'',0,10000,,'',0,2000,0,'Black Mtn',0,8000,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
+'587',1101,71200,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'588',1101,71200,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'589',1101,71200,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'583',1401,114700,,'',0,77900,,'',0
+'584',1401,114700,,'',0,77900,,'',0
+'587',1401,114700,,'',0,77900,,'',0
+'588',1401,114700,,'',0,77900,,'',0
+'589',1401,114700,,'',0,77900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_4371 b/src/main/res-current/raw/current_gtfs_schedule_stop_4371
index 1813aed2a..82a0cb6b0 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_4371
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_4371
@@ -1,5 +1,5 @@
-'577',1300,72200,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'578',1300,72200,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'579',1300,72200,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'580',1300,72200,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'582',1300,72200,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'583',1300,72200,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'584',1300,72200,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'587',1300,72200,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'588',1300,72200,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'589',1300,72200,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_438 b/src/main/res-current/raw/current_gtfs_schedule_stop_438
index 8593944f5..3f73cc323 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_438
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_438
@@ -1,14 +1,14 @@
-'576',800,72100,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
-'577',800,61900,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'578',800,61900,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'579',800,61900,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'580',800,61900,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'581',800,64400,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'582',800,61900,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'576',1001,90300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
-'577',1001,54100,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2100,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'578',1001,54100,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2100,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'579',1001,54100,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2100,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'580',1001,54100,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2100,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'581',1001,84000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',1001,54100,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2100,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'583',800,61900,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'584',800,61900,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'585',800,64400,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
+'586',800,72100,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
+'587',800,61900,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'588',800,61900,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'589',800,61900,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'583',1001,54100,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2100,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'584',1001,54100,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2100,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'585',1001,84000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',1001,90300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
+'587',1001,54100,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2100,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'588',1001,54100,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2100,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'589',1001,54100,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2100,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_439 b/src/main/res-current/raw/current_gtfs_schedule_stop_439
index efd4d51c7..c345ecaba 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_439
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_439
@@ -1,5 +1,5 @@
-'577',500,70700,,'',0,3800,,'',0,9800,,'',0,9400,,'',0,60600,,'',0,1500,,'',0,7700,,'',0,8900,,'',0,8000,,'',0
-'578',500,70700,,'',0,3800,,'',0,9800,,'',0,9400,,'',0,60600,,'',0,1500,,'',0,7700,,'',0,8900,,'',0,8000,,'',0
-'579',500,70700,,'',0,3800,,'',0,9800,,'',0,9400,,'',0,60600,,'',0,1500,,'',0,7700,,'',0,8900,,'',0,8000,,'',0
-'580',500,70700,,'',0,3800,,'',0,9800,,'',0,9400,,'',0,60600,,'',0,1500,,'',0,7700,,'',0,8900,,'',0,8000,,'',0
-'582',500,70700,,'',0,3800,,'',0,9800,,'',0,9400,,'',0,60600,,'',0,1500,,'',0,7700,,'',0,8900,,'',0,8000,,'',0
+'583',500,70700,,'',0,3800,,'',0,9800,,'',0,9400,,'',0,60600,,'',0,1500,,'',0,7700,,'',0,8900,,'',0,8000,,'',0
+'584',500,70700,,'',0,3800,,'',0,9800,,'',0,9400,,'',0,60600,,'',0,1500,,'',0,7700,,'',0,8900,,'',0,8000,,'',0
+'587',500,70700,,'',0,3800,,'',0,9800,,'',0,9400,,'',0,60600,,'',0,1500,,'',0,7700,,'',0,8900,,'',0,8000,,'',0
+'588',500,70700,,'',0,3800,,'',0,9800,,'',0,9400,,'',0,60600,,'',0,1500,,'',0,7700,,'',0,8900,,'',0,8000,,'',0
+'589',500,70700,,'',0,3800,,'',0,9800,,'',0,9400,,'',0,60600,,'',0,1500,,'',0,7700,,'',0,8900,,'',0,8000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_44 b/src/main/res-current/raw/current_gtfs_schedule_stop_44
index f28ddfb51..8dcb76745 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_44
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_44
@@ -1,7 +1,7 @@
-'576',300,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
-'577',300,73200,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'578',300,73200,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'579',300,73200,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'580',300,73200,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'581',300,81900,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'582',300,73200,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'583',300,73200,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'584',300,73200,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'585',300,81900,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
+'586',300,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
+'587',300,73200,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'588',300,73200,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'589',300,73200,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_440 b/src/main/res-current/raw/current_gtfs_schedule_stop_440
index a8a78c352..91becaf34 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_440
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_440
@@ -1,10 +1,10 @@
-'577',1400,121200,,'',0,73700,,'',0
-'577',1401,63700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'578',1400,121200,,'',0,73700,,'',0
-'578',1401,63700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'579',1400,121200,,'',0,73700,,'',0
-'579',1401,63700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'580',1400,121200,,'',0,73700,,'',0
-'580',1401,63700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'582',1400,121200,,'',0,73700,,'',0
-'582',1401,63700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'583',1400,121200,,'',0,73700,,'',0
+'583',1401,63700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'584',1400,121200,,'',0,73700,,'',0
+'584',1401,63700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'587',1400,121200,,'',0,73700,,'',0
+'587',1401,63700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'588',1400,121200,,'',0,73700,,'',0
+'588',1401,63700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'589',1400,121200,,'',0,73700,,'',0
+'589',1401,63700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_441 b/src/main/res-current/raw/current_gtfs_schedule_stop_441
index d4d3cbec8..0280b0649 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_441
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_441
@@ -1,14 +1,14 @@
-'576',800,72100,,'',0,10600,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
-'577',800,61900,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'578',800,61900,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'579',800,61900,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'580',800,61900,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'581',800,64400,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3300,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'582',800,61900,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'576',1001,90400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
-'577',1001,54200,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'578',1001,54200,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'579',1001,54200,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'580',1001,54200,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'581',1001,84000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',1001,54200,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'583',800,61900,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'584',800,61900,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'585',800,64400,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3300,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
+'586',800,72100,,'',0,10600,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
+'587',800,61900,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'588',800,61900,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'589',800,61900,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'583',1001,54200,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'584',1001,54200,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'585',1001,84000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',1001,90400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
+'587',1001,54200,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'588',1001,54200,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'589',1001,54200,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_442 b/src/main/res-current/raw/current_gtfs_schedule_stop_442
index f147e6e96..d3cbbdcd7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_442
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_442
@@ -1,21 +1,21 @@
-'576',801,85700,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'577',801,60400,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'578',801,60400,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'579',801,60400,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'580',801,60400,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'581',801,72500,,'',0,8000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
-'582',801,60400,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'576',1000,75500,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'North Rutland',0
-'577',1000,55500,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'578',1000,55500,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'579',1000,55500,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'580',1000,55500,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'581',1000,75200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'North Rutland',0
-'582',1000,55500,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'576',1100,75400,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'577',1100,63800,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'578',1100,63800,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'579',1100,63800,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'580',1100,63800,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'581',1100,74100,,'',0,7900,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'582',1100,63800,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'583',801,60400,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'584',801,60400,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'585',801,72500,,'',0,8000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
+'586',801,85700,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'587',801,60400,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'588',801,60400,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'589',801,60400,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'583',1000,55500,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'584',1000,55500,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'585',1000,75200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'North Rutland',0
+'586',1000,75500,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'North Rutland',0
+'587',1000,55500,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'588',1000,55500,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'589',1000,55500,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'583',1100,63800,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'584',1100,63800,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'585',1100,74100,,'',0,7900,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'586',1100,75400,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'587',1100,63800,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'588',1100,63800,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'589',1100,63800,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_443 b/src/main/res-current/raw/current_gtfs_schedule_stop_443
index 81ed02f7f..f807008af 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_443
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_443
@@ -1,9 +1,9 @@
-'576',1101,81200,4,'',0,22500,4,'',0,18500,4,'',0,18500,4,'',0,22500,4,'',0,22500,4,'',0
-'581',1101,92500,4,'',0,19700,4,'',0,30000,4,'',0,22500,4,'',0,17500,4,'',0,18700,4,'',0
-'576',1401,81500,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,22500,,'',0
-'577',1401,64000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'578',1401,64000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'579',1401,64000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'580',1401,64000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'581',1401,75300,,'',0,17500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
-'582',1401,64000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'585',1101,92500,4,'',0,19700,4,'',0,30000,4,'',0,22500,4,'',0,17500,4,'',0,18700,4,'',0
+'586',1101,81200,4,'',0,22500,4,'',0,18500,4,'',0,18500,4,'',0,22500,4,'',0,22500,4,'',0
+'583',1401,64000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'584',1401,64000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'585',1401,75300,,'',0,17500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
+'586',1401,81500,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,22500,,'',0
+'587',1401,64000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'588',1401,64000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'589',1401,64000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_4435 b/src/main/res-current/raw/current_gtfs_schedule_stop_4435
index 0c6c1b97c..178873931 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_4435
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_4435
@@ -1,7 +1,7 @@
-'576',1201,90400,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
-'577',1201,70000,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,35800,,'',0,8400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0,25500,,'',0
-'578',1201,70000,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,35800,,'',0,8400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0,25500,,'',0
-'579',1201,70000,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,35800,,'',0,8400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0,25500,,'',0
-'580',1201,70000,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,35800,,'',0,8400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0,25500,,'',0
-'581',1201,93100,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
-'582',1201,70000,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,35800,,'',0,8400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0,25500,,'',0
+'583',1201,70000,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,35800,,'',0,8400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0,25500,,'',0
+'584',1201,70000,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,35800,,'',0,8400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0,25500,,'',0
+'585',1201,93100,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
+'586',1201,90400,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
+'587',1201,70000,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,35800,,'',0,8400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0,25500,,'',0
+'588',1201,70000,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,35800,,'',0,8400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0,25500,,'',0
+'589',1201,70000,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,35800,,'',0,8400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0,25500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_444 b/src/main/res-current/raw/current_gtfs_schedule_stop_444
index 2886db90b..3c007f983 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_444
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_444
@@ -1,14 +1,14 @@
-'576',2501,101900,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
-'577',2501,80100,,'',0,5100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'578',2501,80100,,'',0,5100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'579',2501,80100,,'',0,5100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'580',2501,80100,,'',0,5100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'581',2501,93400,,'',0,17200,,'',0,13300,,'',0,17100,,'',0,40300,,'',0
-'582',2501,80100,,'',0,5100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'576',139000,110600,,'',0,22800,,'',0,29100,,'',0,30300,,'',0
-'577',139000,60300,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,17400,,'',0,4000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'578',139000,60300,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,17400,,'',0,4000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'579',139000,60300,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,17400,,'',0,4000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'580',139000,60300,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,17400,,'',0,4000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'581',139000,74000,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,17600,,'',0,12300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
-'582',139000,60300,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,17400,,'',0,4000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'583',2501,80100,,'',0,5100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'584',2501,80100,,'',0,5100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'585',2501,93400,,'',0,17200,,'',0,13300,,'',0,17100,,'',0,40300,,'',0
+'586',2501,101900,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
+'587',2501,80100,,'',0,5100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'588',2501,80100,,'',0,5100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'589',2501,80100,,'',0,5100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'583',139000,60300,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,17400,,'',0,4000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'584',139000,60300,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,17400,,'',0,4000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'585',139000,74000,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,17600,,'',0,12300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
+'586',139000,110600,,'',0,22800,,'',0,29100,,'',0,30300,,'',0
+'587',139000,60300,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,17400,,'',0,4000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'588',139000,60300,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,17400,,'',0,4000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'589',139000,60300,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,17400,,'',0,4000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_445 b/src/main/res-current/raw/current_gtfs_schedule_stop_445
index 070963819..caaa9492b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_445
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_445
@@ -1,21 +1,21 @@
-'576',801,85700,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'577',801,60400,,'',0,4500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'578',801,60400,,'',0,4500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'579',801,60400,,'',0,4500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'580',801,60400,,'',0,4500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'581',801,72500,,'',0,8000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
-'582',801,60400,,'',0,4500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'576',1000,75500,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'North Rutland',0
-'577',1000,55400,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'578',1000,55400,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'579',1000,55400,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'580',1000,55400,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'581',1000,75200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'North Rutland',0
-'582',1000,55400,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'576',1100,75300,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'577',1100,63700,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'578',1100,63700,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'579',1100,63700,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'580',1100,63700,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'581',1100,74000,,'',0,7900,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'582',1100,63700,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'583',801,60400,,'',0,4500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'584',801,60400,,'',0,4500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'585',801,72500,,'',0,8000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
+'586',801,85700,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'587',801,60400,,'',0,4500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'588',801,60400,,'',0,4500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'589',801,60400,,'',0,4500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'583',1000,55400,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'584',1000,55400,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'585',1000,75200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'North Rutland',0
+'586',1000,75500,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'North Rutland',0
+'587',1000,55400,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'588',1000,55400,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'589',1000,55400,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'583',1100,63700,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'584',1100,63700,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'585',1100,74000,,'',0,7900,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'586',1100,75300,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'587',1100,63700,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'588',1100,63700,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'589',1100,63700,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_446 b/src/main/res-current/raw/current_gtfs_schedule_stop_446
index 10566c9f2..ab545f24c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_446
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_446
@@ -1,14 +1,14 @@
-'576',2500,103100,,'',0,22800,,'',0,29100,,'',0,26900,,'',0
-'577',2500,71900,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'578',2500,71900,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'579',2500,71900,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'580',2500,71900,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'581',2500,94700,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
-'582',2500,71900,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'576',139001,71900,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
-'577',139001,61300,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
-'578',139001,61300,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
-'579',139001,61300,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
-'580',139001,61300,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
-'581',139001,73800,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
-'582',139001,61300,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
+'583',2500,71900,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'584',2500,71900,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'585',2500,94700,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
+'586',2500,103100,,'',0,22800,,'',0,29100,,'',0,26900,,'',0
+'587',2500,71900,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'588',2500,71900,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'589',2500,71900,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'583',139001,61300,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
+'584',139001,61300,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
+'585',139001,73800,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
+'586',139001,71900,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
+'587',139001,61300,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
+'588',139001,61300,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
+'589',139001,61300,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_447 b/src/main/res-current/raw/current_gtfs_schedule_stop_447
index ecabb8803..635005f78 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_447
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_447
@@ -1,21 +1,21 @@
-'576',801,85700,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'577',801,60400,,'',0,4500,,'',0,6400,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'578',801,60400,,'',0,4500,,'',0,6400,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'579',801,60400,,'',0,4500,,'',0,6400,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'580',801,60400,,'',0,4500,,'',0,6400,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'581',801,72500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
-'582',801,60400,,'',0,4500,,'',0,6400,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'576',1000,75500,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'North Rutland',0
-'577',1000,55400,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'578',1000,55400,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'579',1000,55400,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'580',1000,55400,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'581',1000,75200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'North Rutland',0
-'582',1000,55400,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'576',1100,75300,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'577',1100,63700,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'578',1100,63700,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'579',1100,63700,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'580',1100,63700,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'581',1100,74000,,'',0,7900,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'582',1100,63700,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'583',801,60400,,'',0,4500,,'',0,6400,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'584',801,60400,,'',0,4500,,'',0,6400,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'585',801,72500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
+'586',801,85700,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'587',801,60400,,'',0,4500,,'',0,6400,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'588',801,60400,,'',0,4500,,'',0,6400,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'589',801,60400,,'',0,4500,,'',0,6400,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'583',1000,55400,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'584',1000,55400,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'585',1000,75200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'North Rutland',0
+'586',1000,75500,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'North Rutland',0
+'587',1000,55400,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'588',1000,55400,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'589',1000,55400,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'583',1100,63700,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'584',1100,63700,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'585',1100,74000,,'',0,7900,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'586',1100,75300,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'587',1100,63700,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'588',1100,63700,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'589',1100,63700,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_448 b/src/main/res-current/raw/current_gtfs_schedule_stop_448
index ef77870e0..9e697ab00 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_448
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_448
@@ -1,7 +1,7 @@
-'576',1101,93600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'577',1101,71300,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'578',1101,71300,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'579',1101,71300,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'580',1101,71300,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'581',1101,83100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
-'582',1101,71300,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'583',1101,71300,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'584',1101,71300,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'585',1101,83100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
+'586',1101,93600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
+'587',1101,71300,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'588',1101,71300,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'589',1101,71300,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_449 b/src/main/res-current/raw/current_gtfs_schedule_stop_449
index 7b4151f7d..8b3344ccb 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_449
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_449
@@ -1,7 +1,7 @@
-'576',800,72300,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
-'577',800,62100,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'578',800,62100,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'579',800,62100,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'580',800,62100,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'581',800,64600,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
-'582',800,62100,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'583',800,62100,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'584',800,62100,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'585',800,64600,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
+'586',800,72300,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
+'587',800,62100,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'588',800,62100,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'589',800,62100,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_45 b/src/main/res-current/raw/current_gtfs_schedule_stop_45
index 7ba76fe78..af373c43d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_45
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_45
@@ -1,7 +1,7 @@
-'576',1001,83700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'577',1001,63200,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'578',1001,63200,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'579',1001,63200,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'580',1001,63200,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'581',1001,81100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',1001,63200,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'583',1001,63200,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'584',1001,63200,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'585',1001,81100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',1001,83700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'587',1001,63200,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'588',1001,63200,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'589',1001,63200,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_450 b/src/main/res-current/raw/current_gtfs_schedule_stop_450
index 0f1d34dee..7f2403238 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_450
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_450
@@ -1,14 +1,14 @@
-'576',801,85600,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'577',801,60300,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'578',801,60300,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'579',801,60300,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'580',801,60300,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'581',801,72400,,'',0,8000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
-'582',801,60300,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'576',1000,75400,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'North Rutland',0
-'577',1000,55300,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'578',1000,55300,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'579',1000,55300,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'580',1000,55300,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'581',1000,75100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'North Rutland',0
-'582',1000,55300,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'583',801,60300,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'584',801,60300,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'585',801,72400,,'',0,8000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
+'586',801,85600,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'587',801,60300,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'588',801,60300,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'589',801,60300,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'583',1000,55300,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'584',1000,55300,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'585',1000,75100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'North Rutland',0
+'586',1000,75400,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'North Rutland',0
+'587',1000,55300,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'588',1000,55300,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'589',1000,55300,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_451 b/src/main/res-current/raw/current_gtfs_schedule_stop_451
index 7c80c71ff..6c86e9076 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_451
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_451
@@ -1,7 +1,7 @@
-'576',1000,75300,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'North Rutland',0
-'577',1000,55200,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'578',1000,55200,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'579',1000,55200,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'580',1000,55200,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'581',1000,75000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'North Rutland',0
-'582',1000,55200,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'583',1000,55200,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'584',1000,55200,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'585',1000,75000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'North Rutland',0
+'586',1000,75300,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'North Rutland',0
+'587',1000,55200,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'588',1000,55200,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'589',1000,55200,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_452 b/src/main/res-current/raw/current_gtfs_schedule_stop_452
index 30f2631ad..497df37ee 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_452
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_452
@@ -1,7 +1,7 @@
-'576',2501,101600,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
-'577',2501,75800,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'578',2501,75800,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'579',2501,75800,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'580',2501,75800,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'581',2501,93100,,'',0,17200,,'',0,13300,,'',0,17100,,'',0,40300,,'',0
-'582',2501,75800,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'583',2501,75800,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'584',2501,75800,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'585',2501,93100,,'',0,17200,,'',0,13300,,'',0,17100,,'',0,40300,,'',0
+'586',2501,101600,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
+'587',2501,75800,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'588',2501,75800,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'589',2501,75800,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_453 b/src/main/res-current/raw/current_gtfs_schedule_stop_453
index d7a605584..8dfd02026 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_453
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_453
@@ -1,7 +1,7 @@
-'576',2500,103300,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
-'577',2500,72100,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
-'578',2500,72100,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
-'579',2500,72100,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
-'580',2500,72100,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
-'581',2500,94900,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
-'582',2500,72100,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
+'583',2500,72100,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
+'584',2500,72100,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
+'585',2500,94900,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
+'586',2500,103300,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
+'587',2500,72100,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
+'588',2500,72100,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
+'589',2500,72100,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_454 b/src/main/res-current/raw/current_gtfs_schedule_stop_454
index 61c5c1ce5..653ab8589 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_454
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_454
@@ -1,14 +1,14 @@
-'576',801,85600,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'577',801,60300,,'',0,4500,,'',0,6400,,'',0,2300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'578',801,60300,,'',0,4500,,'',0,6400,,'',0,2300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'579',801,60300,,'',0,4500,,'',0,6400,,'',0,2300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'580',801,60300,,'',0,4500,,'',0,6400,,'',0,2300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'581',801,72400,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
-'582',801,60300,,'',0,4500,,'',0,6400,,'',0,2300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'576',1000,75300,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'North Rutland',0
-'577',1000,55200,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'578',1000,55200,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'579',1000,55200,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'580',1000,55200,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'581',1000,75000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'North Rutland',0
-'582',1000,55200,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'583',801,60300,,'',0,4500,,'',0,6400,,'',0,2300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'584',801,60300,,'',0,4500,,'',0,6400,,'',0,2300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'585',801,72400,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
+'586',801,85600,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'587',801,60300,,'',0,4500,,'',0,6400,,'',0,2300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'588',801,60300,,'',0,4500,,'',0,6400,,'',0,2300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'589',801,60300,,'',0,4500,,'',0,6400,,'',0,2300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'583',1000,55200,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'584',1000,55200,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'585',1000,75000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'North Rutland',0
+'586',1000,75300,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'North Rutland',0
+'587',1000,55200,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'588',1000,55200,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'589',1000,55200,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2100,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_455 b/src/main/res-current/raw/current_gtfs_schedule_stop_455
index 5958d8f88..30ddbd426 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_455
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_455
@@ -1,7 +1,7 @@
-'576',139000,110500,,'',0,22800,,'',0,29100,,'',0,30300,,'',0
-'577',139000,60200,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,17400,,'',0,4000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'578',139000,60200,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,17400,,'',0,4000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'579',139000,60200,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,17400,,'',0,4000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'580',139000,60200,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,17400,,'',0,4000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'581',139000,73900,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,17600,,'',0,12300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
-'582',139000,60200,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,17400,,'',0,4000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'583',139000,60200,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,17400,,'',0,4000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'584',139000,60200,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,17400,,'',0,4000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'585',139000,73900,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,17600,,'',0,12300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
+'586',139000,110500,,'',0,22800,,'',0,29100,,'',0,30300,,'',0
+'587',139000,60200,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,17400,,'',0,4000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'588',139000,60200,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,17400,,'',0,4000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'589',139000,60200,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,17400,,'',0,4000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_456 b/src/main/res-current/raw/current_gtfs_schedule_stop_456
index 4477724fa..6bbed9dd1 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_456
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_456
@@ -1,7 +1,7 @@
-'576',139001,71900,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
-'577',139001,61400,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'578',139001,61400,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'579',139001,61400,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'580',139001,61400,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'581',139001,73800,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
-'582',139001,61400,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'583',139001,61400,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'584',139001,61400,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'585',139001,73800,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
+'586',139001,71900,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
+'587',139001,61400,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'588',139001,61400,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'589',139001,61400,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_457 b/src/main/res-current/raw/current_gtfs_schedule_stop_457
index 9ed641814..758e7bf34 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_457
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_457
@@ -1,9 +1,9 @@
-'576',1000,231900,0,'North Rutland',0
-'581',1000,250900,0,'North Rutland',0
-'576',1100,75200,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'577',1100,63600,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'578',1100,63600,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'579',1100,63600,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'580',1100,63600,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'581',1100,73900,,'',0,7900,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,0,'Orchard Pk',0
-'582',1100,63600,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'585',1000,250900,0,'North Rutland',0
+'586',1000,231900,0,'North Rutland',0
+'583',1100,63600,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'584',1100,63600,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'585',1100,73900,,'',0,7900,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,0,'Orchard Pk',0
+'586',1100,75200,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'587',1100,63600,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'588',1100,63600,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'589',1100,63600,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_458 b/src/main/res-current/raw/current_gtfs_schedule_stop_458
index 041b0904d..8a7cd3979 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_458
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_458
@@ -1,7 +1,7 @@
-'576',1200,91800,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
-'577',1200,71300,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'578',1200,71300,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'579',1200,71300,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'580',1200,71300,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'581',1200,94500,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
-'582',1200,71300,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'583',1200,71300,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'584',1200,71300,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'585',1200,94500,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
+'586',1200,91800,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
+'587',1200,71300,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'588',1200,71300,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'589',1200,71300,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_459 b/src/main/res-current/raw/current_gtfs_schedule_stop_459
index f17e4038d..2fd40a75f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_459
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_459
@@ -1,7 +1,7 @@
-'576',1501,83700,,'',0,20000,,'',0,40000,,'',0,27000,,'',0
-'577',1501,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'578',1501,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'579',1501,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'580',1501,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'581',1501,93800,,'',0,17000,,'',0,20000,,'',0,20000,,'',0,10200,,'',0,10000,,'',0
-'582',1501,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'583',1501,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'584',1501,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'585',1501,93800,,'',0,17000,,'',0,20000,,'',0,20000,,'',0,10200,,'',0,10000,,'',0
+'586',1501,83700,,'',0,20000,,'',0,40000,,'',0,27000,,'',0
+'587',1501,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'588',1501,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'589',1501,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_46 b/src/main/res-current/raw/current_gtfs_schedule_stop_46
index 90106b329..72f41cf58 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_46
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_46
@@ -1,14 +1,14 @@
-'576',700,90000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'577',700,71200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'578',700,71200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'579',700,71200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'580',700,71200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'581',700,82300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',700,71200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'576',1801,82600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'577',1801,64300,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
-'578',1801,64300,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
-'579',1801,64300,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
-'580',1801,64300,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
-'581',1801,75700,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'582',1801,64300,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
+'583',700,71200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'584',700,71200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'585',700,82300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',700,90000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'587',700,71200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'588',700,71200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'589',700,71200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'583',1801,64300,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
+'584',1801,64300,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
+'585',1801,75700,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'586',1801,82600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'587',1801,64300,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
+'588',1801,64300,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
+'589',1801,64300,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_460 b/src/main/res-current/raw/current_gtfs_schedule_stop_460
index 291fa436f..4f3f6cab8 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_460
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_460
@@ -1,7 +1,7 @@
-'576',2501,101500,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
-'577',2501,75700,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'578',2501,75700,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'579',2501,75700,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'580',2501,75700,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'581',2501,93000,,'',0,17200,,'',0,13300,,'',0,17100,,'',0,40300,,'',0
-'582',2501,75700,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'583',2501,75700,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'584',2501,75700,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'585',2501,93000,,'',0,17200,,'',0,13300,,'',0,17100,,'',0,40300,,'',0
+'586',2501,101500,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
+'587',2501,75700,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'588',2501,75700,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'589',2501,75700,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_461 b/src/main/res-current/raw/current_gtfs_schedule_stop_461
index e48526b28..d8bffe563 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_461
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_461
@@ -1,7 +1,7 @@
-'576',1101,93700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'577',1101,71400,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'578',1101,71400,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'579',1101,71400,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'580',1101,71400,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'581',1101,83200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
-'582',1101,71400,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'583',1101,71400,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'584',1101,71400,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'585',1101,83200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
+'586',1101,93700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
+'587',1101,71400,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'588',1101,71400,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'589',1101,71400,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_462 b/src/main/res-current/raw/current_gtfs_schedule_stop_462
index 0fe7062ed..1647d1820 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_462
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_462
@@ -1,7 +1,7 @@
-'576',1201,91200,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
-'577',1201,70700,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'578',1201,70700,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'579',1201,70700,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'580',1201,70700,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'581',1201,93900,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
-'582',1201,70700,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'583',1201,70700,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'584',1201,70700,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'585',1201,93900,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
+'586',1201,91200,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
+'587',1201,70700,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'588',1201,70700,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'589',1201,70700,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_463 b/src/main/res-current/raw/current_gtfs_schedule_stop_463
index f31492b5e..8d063ff6a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_463
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_463
@@ -1,7 +1,7 @@
-'576',2500,103400,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
-'577',2500,72200,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
-'578',2500,72200,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
-'579',2500,72200,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
-'580',2500,72200,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
-'581',2500,95000,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
-'582',2500,72200,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
+'583',2500,72200,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
+'584',2500,72200,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
+'585',2500,95000,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
+'586',2500,103400,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
+'587',2500,72200,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
+'588',2500,72200,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
+'589',2500,72200,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_464 b/src/main/res-current/raw/current_gtfs_schedule_stop_464
index ffb9f8ed6..c922f1249 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_464
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_464
@@ -1,7 +1,7 @@
-'576',1700,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',1700,61900,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,800,,'',0,6200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1700,61900,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,800,,'',0,6200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1700,61900,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,800,,'',0,6200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1700,61900,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,800,,'',0,6200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1700,84500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'582',1700,61900,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,800,,'',0,6200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1700,61900,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,800,,'',0,6200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1700,61900,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,800,,'',0,6200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1700,84500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'586',1700,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',1700,61900,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,800,,'',0,6200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1700,61900,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,800,,'',0,6200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1700,61900,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,800,,'',0,6200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_465 b/src/main/res-current/raw/current_gtfs_schedule_stop_465
index 55ca825bb..df83288bf 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_465
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_465
@@ -1,7 +1,7 @@
-'576',1101,93800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'577',1101,71500,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'578',1101,71500,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'579',1101,71500,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'580',1101,71500,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'581',1101,83300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
-'582',1101,71500,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'583',1101,71500,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'584',1101,71500,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'585',1101,83300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
+'586',1101,93800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
+'587',1101,71500,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'588',1101,71500,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'589',1101,71500,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_466 b/src/main/res-current/raw/current_gtfs_schedule_stop_466
index e48526b28..d8bffe563 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_466
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_466
@@ -1,7 +1,7 @@
-'576',1101,93700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'577',1101,71400,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'578',1101,71400,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'579',1101,71400,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'580',1101,71400,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'581',1101,83200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
-'582',1101,71400,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'583',1101,71400,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'584',1101,71400,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'585',1101,83200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
+'586',1101,93700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
+'587',1101,71400,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'588',1101,71400,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'589',1101,71400,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_467 b/src/main/res-current/raw/current_gtfs_schedule_stop_467
index 55ca825bb..df83288bf 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_467
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_467
@@ -1,7 +1,7 @@
-'576',1101,93800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'577',1101,71500,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'578',1101,71500,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'579',1101,71500,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'580',1101,71500,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'581',1101,83300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
-'582',1101,71500,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'583',1101,71500,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'584',1101,71500,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'585',1101,83300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
+'586',1101,93800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
+'587',1101,71500,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'588',1101,71500,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'589',1101,71500,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_468 b/src/main/res-current/raw/current_gtfs_schedule_stop_468
index 873aed3ab..a9945f119 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_468
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_468
@@ -1,7 +1,7 @@
-'576',1401,81600,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
-'577',1401,64100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'578',1401,64100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'579',1401,64100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'580',1401,64100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'581',1401,75400,,'',0,17500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
-'582',1401,64100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'583',1401,64100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'584',1401,64100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'585',1401,75400,,'',0,17500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
+'586',1401,81600,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
+'587',1401,64100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'588',1401,64100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'589',1401,64100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_469 b/src/main/res-current/raw/current_gtfs_schedule_stop_469
index c15faeb6d..22bce6cf3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_469
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_469
@@ -1,9 +1,9 @@
-'576',1000,231800,0,'North Rutland',0
-'581',1000,250800,0,'North Rutland',0
-'576',1100,75100,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'577',1100,63500,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'578',1100,63500,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'579',1100,63500,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'580',1100,63500,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'581',1100,73800,,'',0,7900,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,0,'Orchard Pk',0
-'582',1100,63500,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'585',1000,250800,0,'North Rutland',0
+'586',1000,231800,0,'North Rutland',0
+'583',1100,63500,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'584',1100,63500,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'585',1100,73800,,'',0,7900,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,0,'Orchard Pk',0
+'586',1100,75100,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'587',1100,63500,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'588',1100,63500,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'589',1100,63500,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_47 b/src/main/res-current/raw/current_gtfs_schedule_stop_47
index e76bc5e6e..f6317c1a6 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_47
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_47
@@ -1,14 +1,14 @@
-'576',700,90000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'577',700,71100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'578',700,71100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'579',700,71100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'580',700,71100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'581',700,82300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',700,71100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'576',1801,82600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'577',1801,64200,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
-'578',1801,64200,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
-'579',1801,64200,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
-'580',1801,64200,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
-'581',1801,75600,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'582',1801,64200,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
+'583',700,71100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'584',700,71100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'585',700,82300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',700,90000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'587',700,71100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'588',700,71100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'589',700,71100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'583',1801,64200,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
+'584',1801,64200,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
+'585',1801,75600,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'586',1801,82600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'587',1801,64200,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
+'588',1801,64200,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
+'589',1801,64200,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_470 b/src/main/res-current/raw/current_gtfs_schedule_stop_470
index f3eb8f07a..309317a3c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_470
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_470
@@ -1,7 +1,7 @@
-'576',2000,82400,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'577',2000,63300,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'578',2000,63300,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'579',2000,63300,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'580',2000,63300,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'581',2000,65500,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14900,,'',0,10000,,'',0
-'582',2000,63300,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'583',2000,63300,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'584',2000,63300,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'585',2000,65500,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14900,,'',0,10000,,'',0
+'586',2000,82400,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'587',2000,63300,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'588',2000,63300,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'589',2000,63300,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_471 b/src/main/res-current/raw/current_gtfs_schedule_stop_471
index 323ff2a27..d7c6bc710 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_471
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_471
@@ -1,7 +1,7 @@
-'576',2001,75300,,'',0,10300,,'',0,14400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'577',2001,63400,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'578',2001,63400,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'579',2001,63400,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'580',2001,63400,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'581',2001,75900,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,14400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'582',2001,63400,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'583',2001,63400,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'584',2001,63400,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'585',2001,75900,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,14400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'586',2001,75300,,'',0,10300,,'',0,14400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'587',2001,63400,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'588',2001,63400,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'589',2001,63400,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_472 b/src/main/res-current/raw/current_gtfs_schedule_stop_472
index b2363aa74..785cf2198 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_472
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_472
@@ -1,7 +1,7 @@
-'576',1200,91700,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
-'577',1200,71200,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'578',1200,71200,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'579',1200,71200,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'580',1200,71200,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'581',1200,94400,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
-'582',1200,71200,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'583',1200,71200,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'584',1200,71200,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'585',1200,94400,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
+'586',1200,91700,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
+'587',1200,71200,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'588',1200,71200,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'589',1200,71200,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_473 b/src/main/res-current/raw/current_gtfs_schedule_stop_473
index d4efbef5d..985da0a89 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_473
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_473
@@ -1,7 +1,7 @@
-'576',1201,91300,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
-'577',1201,70800,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'578',1201,70800,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'579',1201,70800,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'580',1201,70800,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'581',1201,94000,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
-'582',1201,70800,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'583',1201,70800,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'584',1201,70800,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'585',1201,94000,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
+'586',1201,91300,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
+'587',1201,70800,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'588',1201,70800,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'589',1201,70800,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_474 b/src/main/res-current/raw/current_gtfs_schedule_stop_474
index 29065c3fb..ce278400a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_474
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_474
@@ -1,7 +1,7 @@
-'576',1101,93900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'577',1101,71600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'578',1101,71600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'579',1101,71600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'580',1101,71600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'581',1101,83400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
-'582',1101,71600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'583',1101,71600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'584',1101,71600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'585',1101,83400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
+'586',1101,93900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
+'587',1101,71600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'588',1101,71600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'589',1101,71600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_475 b/src/main/res-current/raw/current_gtfs_schedule_stop_475
index ab49b9430..49e197e71 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_475
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_475
@@ -1,7 +1,7 @@
-'576',2501,101400,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
-'577',2501,75600,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'578',2501,75600,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'579',2501,75600,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'580',2501,75600,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'581',2501,92900,,'',0,17200,,'',0,13300,,'',0,17100,,'',0,40300,,'',0
-'582',2501,75600,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'583',2501,75600,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'584',2501,75600,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'585',2501,92900,,'',0,17200,,'',0,13300,,'',0,17100,,'',0,40300,,'',0
+'586',2501,101400,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
+'587',2501,75600,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'588',2501,75600,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'589',2501,75600,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_476 b/src/main/res-current/raw/current_gtfs_schedule_stop_476
index 0a55ccffd..420829119 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_476
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_476
@@ -1,7 +1,7 @@
-'576',1501,83800,,'',0,20000,,'',0,40000,,'',0,27000,,'',0
-'577',1501,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'578',1501,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'579',1501,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'580',1501,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'581',1501,93900,,'',0,17000,,'',0,20000,,'',0,20000,,'',0,10200,,'',0,10000,,'',0
-'582',1501,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'583',1501,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'584',1501,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'585',1501,93900,,'',0,17000,,'',0,20000,,'',0,20000,,'',0,10200,,'',0,10000,,'',0
+'586',1501,83800,,'',0,20000,,'',0,40000,,'',0,27000,,'',0
+'587',1501,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'588',1501,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'589',1501,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_477 b/src/main/res-current/raw/current_gtfs_schedule_stop_477
index aa9c13e66..6de4b32a9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_477
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_477
@@ -1,7 +1,7 @@
-'576',1501,84200,,'',0,20000,,'',0,40000,,'',0,27000,,'',0
-'577',1501,71200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'578',1501,71200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'579',1501,71200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'580',1501,71200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'581',1501,94300,,'',0,17000,,'',0,20000,,'',0,20000,,'',0,10200,,'',0,10000,,'',0
-'582',1501,71200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'583',1501,71200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'584',1501,71200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'585',1501,94300,,'',0,17000,,'',0,20000,,'',0,20000,,'',0,10200,,'',0,10000,,'',0
+'586',1501,84200,,'',0,20000,,'',0,40000,,'',0,27000,,'',0
+'587',1501,71200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'588',1501,71200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'589',1501,71200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_478 b/src/main/res-current/raw/current_gtfs_schedule_stop_478
index f0391a593..7f8ad0bd1 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_478
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_478
@@ -1,7 +1,7 @@
-'576',1101,94100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,,'',0,11500,,'',0
-'577',1101,71800,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'578',1101,71800,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'579',1101,71800,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'580',1101,71800,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'581',1101,83600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
-'582',1101,71800,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'583',1101,71800,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'584',1101,71800,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'585',1101,83600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
+'586',1101,94100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,,'',0,11500,,'',0
+'587',1101,71800,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'588',1101,71800,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'589',1101,71800,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_479 b/src/main/res-current/raw/current_gtfs_schedule_stop_479
index f31492b5e..8d063ff6a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_479
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_479
@@ -1,7 +1,7 @@
-'576',2500,103400,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
-'577',2500,72200,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
-'578',2500,72200,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
-'579',2500,72200,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
-'580',2500,72200,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
-'581',2500,95000,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
-'582',2500,72200,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
+'583',2500,72200,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
+'584',2500,72200,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
+'585',2500,95000,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
+'586',2500,103400,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
+'587',2500,72200,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
+'588',2500,72200,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
+'589',2500,72200,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_48 b/src/main/res-current/raw/current_gtfs_schedule_stop_48
index b8e7ddad6..e626d8c85 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_48
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_48
@@ -1,7 +1,7 @@
-'576',1100,82000,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9400,,'',0,10000,,'',0,10000,,'',0
-'577',1100,70200,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'578',1100,70200,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'579',1100,70200,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'580',1100,70200,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'581',1100,80700,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
-'582',1100,70200,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'583',1100,70200,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'584',1100,70200,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'585',1100,80700,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
+'586',1100,82000,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9400,,'',0,10000,,'',0,10000,,'',0
+'587',1100,70200,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'588',1100,70200,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'589',1100,70200,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_480 b/src/main/res-current/raw/current_gtfs_schedule_stop_480
index 985463163..5c221be03 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_480
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_480
@@ -1,7 +1,7 @@
-'576',1101,94000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,,'',0,11500,,'',0
-'577',1101,71700,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'578',1101,71700,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'579',1101,71700,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'580',1101,71700,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'581',1101,83500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
-'582',1101,71700,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'583',1101,71700,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'584',1101,71700,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'585',1101,83500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
+'586',1101,94000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,,'',0,11500,,'',0
+'587',1101,71700,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'588',1101,71700,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'589',1101,71700,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_481 b/src/main/res-current/raw/current_gtfs_schedule_stop_481
index c36972681..5d5c3ad0d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_481
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_481
@@ -1,7 +1,7 @@
-'576',1101,94200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,,'',0,11500,,'',0
-'577',1101,72000,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'578',1101,72000,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'579',1101,72000,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'580',1101,72000,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'581',1101,83700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
-'582',1101,72000,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'583',1101,72000,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'584',1101,72000,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'585',1101,83700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
+'586',1101,94200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,,'',0,11500,,'',0
+'587',1101,72000,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'588',1101,72000,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'589',1101,72000,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_482 b/src/main/res-current/raw/current_gtfs_schedule_stop_482
index 6e3227ac0..5fc69eb91 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_482
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_482
@@ -1,16 +1,16 @@
-'576',1000,231800,0,'North Rutland',0
-'581',1000,250800,0,'North Rutland',0
-'576',1100,75100,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'576',1101,94300,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,16000,4,'',0,11500,4,'',0
-'577',1100,63500,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'577',1101,72100,4,'',0,3200,4,'',0,5500,4,'',0,1500,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1500,4,'',0,7000,4,'',0,2900,4,'',0,6800,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,8000,4,'',0,7000,4,'',0,10000,4,'',0,12000,4,'',0
-'578',1100,63500,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'578',1101,72100,4,'',0,3200,4,'',0,5500,4,'',0,1500,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1500,4,'',0,7000,4,'',0,2900,4,'',0,6800,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,8000,4,'',0,7000,4,'',0,10000,4,'',0,12000,4,'',0
-'579',1100,63500,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'579',1101,72100,4,'',0,3200,4,'',0,5500,4,'',0,1500,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1500,4,'',0,7000,4,'',0,2900,4,'',0,6800,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,8000,4,'',0,7000,4,'',0,10000,4,'',0,12000,4,'',0
-'580',1100,63500,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'580',1101,72100,4,'',0,3200,4,'',0,5500,4,'',0,1500,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1500,4,'',0,7000,4,'',0,2900,4,'',0,6800,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,8000,4,'',0,7000,4,'',0,10000,4,'',0,12000,4,'',0
-'581',1100,73800,,'',0,7900,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,0,'Orchard Pk',0
-'581',1101,83800,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,11500,4,'',0,10500,4,'',0,10000,4,'',0,10000,4,'',0,15000,4,'',0,10000,4,'',0
-'582',1100,63500,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'582',1101,72100,4,'',0,3200,4,'',0,5500,4,'',0,1500,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1500,4,'',0,7000,4,'',0,2900,4,'',0,6800,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,8000,4,'',0,7000,4,'',0,10000,4,'',0,12000,4,'',0
+'585',1000,250800,0,'North Rutland',0
+'586',1000,231800,0,'North Rutland',0
+'583',1100,63500,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'583',1101,72100,4,'',0,3200,4,'',0,5500,4,'',0,1500,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1500,4,'',0,7000,4,'',0,2900,4,'',0,6800,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,8000,4,'',0,7000,4,'',0,10000,4,'',0,12000,4,'',0
+'584',1100,63500,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'584',1101,72100,4,'',0,3200,4,'',0,5500,4,'',0,1500,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1500,4,'',0,7000,4,'',0,2900,4,'',0,6800,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,8000,4,'',0,7000,4,'',0,10000,4,'',0,12000,4,'',0
+'585',1100,73800,,'',0,7900,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,0,'Orchard Pk',0
+'585',1101,83800,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,11500,4,'',0,10500,4,'',0,10000,4,'',0,10000,4,'',0,15000,4,'',0,10000,4,'',0
+'586',1100,75100,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'586',1101,94300,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,16000,4,'',0,11500,4,'',0
+'587',1100,63500,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'587',1101,72100,4,'',0,3200,4,'',0,5500,4,'',0,1500,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1500,4,'',0,7000,4,'',0,2900,4,'',0,6800,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,8000,4,'',0,7000,4,'',0,10000,4,'',0,12000,4,'',0
+'588',1100,63500,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'588',1101,72100,4,'',0,3200,4,'',0,5500,4,'',0,1500,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1500,4,'',0,7000,4,'',0,2900,4,'',0,6800,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,8000,4,'',0,7000,4,'',0,10000,4,'',0,12000,4,'',0
+'589',1100,63500,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'589',1101,72100,4,'',0,3200,4,'',0,5500,4,'',0,1500,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1500,4,'',0,7000,4,'',0,2900,4,'',0,6800,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,8000,4,'',0,7000,4,'',0,10000,4,'',0,12000,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_483 b/src/main/res-current/raw/current_gtfs_schedule_stop_483
index 13a0204ee..dc1cde015 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_483
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_483
@@ -1,7 +1,7 @@
-'576',1601,90600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
-'577',1601,60600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1601,60600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1601,60600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1601,60600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1601,80700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
-'582',1601,60600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1601,60600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1601,60600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1601,80700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
+'586',1601,90600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
+'587',1601,60600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1601,60600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1601,60600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_484 b/src/main/res-current/raw/current_gtfs_schedule_stop_484
index b2363aa74..785cf2198 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_484
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_484
@@ -1,7 +1,7 @@
-'576',1200,91700,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
-'577',1200,71200,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'578',1200,71200,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'579',1200,71200,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'580',1200,71200,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'581',1200,94400,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
-'582',1200,71200,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'583',1200,71200,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'584',1200,71200,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'585',1200,94400,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
+'586',1200,91700,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
+'587',1200,71200,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'588',1200,71200,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'589',1200,71200,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_485 b/src/main/res-current/raw/current_gtfs_schedule_stop_485
index a33250b52..af50e23b1 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_485
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_485
@@ -1,7 +1,7 @@
-'576',139000,110300,,'',0,22800,,'',0,29100,,'',0,30300,,'',0
-'577',139000,60000,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'578',139000,60000,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'579',139000,60000,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'580',139000,60000,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'581',139000,73700,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,17600,,'',0,12300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
-'582',139000,60000,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'583',139000,60000,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'584',139000,60000,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'585',139000,73700,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,17600,,'',0,12300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
+'586',139000,110300,,'',0,22800,,'',0,29100,,'',0,30300,,'',0
+'587',139000,60000,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'588',139000,60000,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'589',139000,60000,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_486 b/src/main/res-current/raw/current_gtfs_schedule_stop_486
index a98b517c8..f2fed82f8 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_486
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_486
@@ -1,7 +1,7 @@
-'576',139001,72100,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
-'577',139001,61600,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'578',139001,61600,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'579',139001,61600,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'580',139001,61600,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'581',139001,74000,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
-'582',139001,61600,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'583',139001,61600,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'584',139001,61600,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'585',139001,74000,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
+'586',139001,72100,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
+'587',139001,61600,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'588',139001,61600,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'589',139001,61600,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_487 b/src/main/res-current/raw/current_gtfs_schedule_stop_487
index d4efbef5d..985da0a89 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_487
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_487
@@ -1,7 +1,7 @@
-'576',1201,91300,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
-'577',1201,70800,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'578',1201,70800,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'579',1201,70800,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'580',1201,70800,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'581',1201,94000,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
-'582',1201,70800,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'583',1201,70800,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'584',1201,70800,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'585',1201,94000,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
+'586',1201,91300,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
+'587',1201,70800,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'588',1201,70800,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'589',1201,70800,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_488 b/src/main/res-current/raw/current_gtfs_schedule_stop_488
index 6ea463ad7..df6736fbd 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_488
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_488
@@ -1,7 +1,7 @@
-'576',1700,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',1700,61800,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1700,61800,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1700,61800,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1700,61800,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1700,84300,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'582',1700,61800,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1700,61800,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1700,61800,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1700,84300,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'586',1700,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',1700,61800,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1700,61800,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1700,61800,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_489 b/src/main/res-current/raw/current_gtfs_schedule_stop_489
index ce1a1f00a..810f34db3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_489
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_489
@@ -1,7 +1,7 @@
-'576',1501,84100,,'',0,20000,,'',0,40000,,'',0,27000,,'',0
-'577',1501,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'578',1501,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'579',1501,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'580',1501,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'581',1501,94200,,'',0,17000,,'',0,20000,,'',0,20000,,'',0,10200,,'',0,10000,,'',0
-'582',1501,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'583',1501,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'584',1501,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'585',1501,94200,,'',0,17000,,'',0,20000,,'',0,20000,,'',0,10200,,'',0,10000,,'',0
+'586',1501,84100,,'',0,20000,,'',0,40000,,'',0,27000,,'',0
+'587',1501,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'588',1501,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'589',1501,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_49 b/src/main/res-current/raw/current_gtfs_schedule_stop_49
index 2a25c8897..979a63b07 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_49
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_49
@@ -1,7 +1,7 @@
-'576',901,115000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',901,90500,,'',0,22000,,'',0,38000,,'',0
-'578',901,90500,,'',0,22000,,'',0,38000,,'',0
-'579',901,90500,,'',0,22000,,'',0,38000,,'',0
-'580',901,90500,,'',0,22000,,'',0,38000,,'',0
-'581',901,115000,,'',0,8500,,'',0,29000,,'',0,8500,,'',0
-'582',901,90500,,'',0,22000,,'',0,38000,,'',0
+'583',901,90500,,'',0,22000,,'',0,38000,,'',0
+'584',901,90500,,'',0,22000,,'',0,38000,,'',0
+'585',901,115000,,'',0,8500,,'',0,29000,,'',0,8500,,'',0
+'586',901,115000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',901,90500,,'',0,22000,,'',0,38000,,'',0
+'588',901,90500,,'',0,22000,,'',0,38000,,'',0
+'589',901,90500,,'',0,22000,,'',0,38000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_490 b/src/main/res-current/raw/current_gtfs_schedule_stop_490
index fd26e8042..0378777ab 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_490
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_490
@@ -1,7 +1,7 @@
-'576',1501,83900,,'',0,20000,,'',0,40000,,'',0,27000,,'',0
-'577',1501,70900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'578',1501,70900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'579',1501,70900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'580',1501,70900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'581',1501,94000,,'',0,17000,,'',0,20000,,'',0,20000,,'',0,10200,,'',0,10000,,'',0
-'582',1501,70900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'583',1501,70900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'584',1501,70900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'585',1501,94000,,'',0,17000,,'',0,20000,,'',0,20000,,'',0,10200,,'',0,10000,,'',0
+'586',1501,83900,,'',0,20000,,'',0,40000,,'',0,27000,,'',0
+'587',1501,70900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'588',1501,70900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'589',1501,70900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_491 b/src/main/res-current/raw/current_gtfs_schedule_stop_491
index fd26e8042..0378777ab 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_491
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_491
@@ -1,7 +1,7 @@
-'576',1501,83900,,'',0,20000,,'',0,40000,,'',0,27000,,'',0
-'577',1501,70900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'578',1501,70900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'579',1501,70900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'580',1501,70900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'581',1501,94000,,'',0,17000,,'',0,20000,,'',0,20000,,'',0,10200,,'',0,10000,,'',0
-'582',1501,70900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'583',1501,70900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'584',1501,70900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'585',1501,94000,,'',0,17000,,'',0,20000,,'',0,20000,,'',0,10200,,'',0,10000,,'',0
+'586',1501,83900,,'',0,20000,,'',0,40000,,'',0,27000,,'',0
+'587',1501,70900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'588',1501,70900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'589',1501,70900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_49153 b/src/main/res-current/raw/current_gtfs_schedule_stop_49153
index f603426e8..009a16e93 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_49153
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_49153
@@ -1,10 +1,10 @@
-'577',2600,64500,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'577',2601,73200,4,'',0,9300,4,'',0,69800,4,'',0,9000,4,'',0,10400,4,'',0,10000,4,'',0
-'578',2600,64500,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'578',2601,73200,4,'',0,9300,4,'',0,69800,4,'',0,9000,4,'',0,10400,4,'',0,10000,4,'',0
-'579',2600,64500,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'579',2601,73200,4,'',0,9300,4,'',0,69800,4,'',0,9000,4,'',0,10400,4,'',0,10000,4,'',0
-'580',2600,64500,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'580',2601,73200,4,'',0,9300,4,'',0,69800,4,'',0,9000,4,'',0,10400,4,'',0,10000,4,'',0
-'582',2600,64500,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
-'582',2601,73200,4,'',0,9300,4,'',0,69800,4,'',0,9000,4,'',0,10400,4,'',0,10000,4,'',0
+'583',2600,64500,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'583',2601,73200,4,'',0,9300,4,'',0,69800,4,'',0,9000,4,'',0,10400,4,'',0,10000,4,'',0
+'584',2600,64500,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'584',2601,73200,4,'',0,9300,4,'',0,69800,4,'',0,9000,4,'',0,10400,4,'',0,10000,4,'',0
+'587',2600,64500,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'587',2601,73200,4,'',0,9300,4,'',0,69800,4,'',0,9000,4,'',0,10400,4,'',0,10000,4,'',0
+'588',2600,64500,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'588',2601,73200,4,'',0,9300,4,'',0,69800,4,'',0,9000,4,'',0,10400,4,'',0,10000,4,'',0
+'589',2600,64500,,'',0,9500,,'',0,8600,,'',0,70200,,'',0,9800,,'',0,9400,,'',0
+'589',2601,73200,4,'',0,9300,4,'',0,69800,4,'',0,9000,4,'',0,10400,4,'',0,10000,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_49154 b/src/main/res-current/raw/current_gtfs_schedule_stop_49154
index 398befff5..35f6fb8ff 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_49154
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_49154
@@ -1,7 +1,7 @@
-'576',800,72200,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
-'577',800,62000,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'578',800,62000,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'579',800,62000,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'580',800,62000,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'581',800,64500,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
-'582',800,62000,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'583',800,62000,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'584',800,62000,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'585',800,64500,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
+'586',800,72200,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
+'587',800,62000,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'588',800,62000,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'589',800,62000,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_492 b/src/main/res-current/raw/current_gtfs_schedule_stop_492
index 110464986..2edfa9f15 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_492
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_492
@@ -1,7 +1,7 @@
-'576',1601,90700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
-'577',1601,60700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1601,60700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1601,60700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1601,60700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1601,80800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
-'582',1601,60700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1601,60700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1601,60700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1601,80800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
+'586',1601,90700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
+'587',1601,60700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1601,60700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1601,60700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_4925 b/src/main/res-current/raw/current_gtfs_schedule_stop_4925
index ebe701a40..8b332edb3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_4925
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_4925
@@ -1,12 +1,12 @@
-'576',1100,75900,,'',0,8400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'577',1100,64300,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'578',1100,64300,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'579',1100,64300,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'580',1100,64300,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'581',1100,74600,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,1100,0,'Orchard Pk',0,5900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'582',1100,64300,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'577',1400,121600,,'',0,73700,,'',0
-'578',1400,121600,,'',0,73700,,'',0
-'579',1400,121600,,'',0,73700,,'',0
-'580',1400,121600,,'',0,73700,,'',0
-'582',1400,121600,,'',0,73700,,'',0
+'583',1100,64300,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'584',1100,64300,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'585',1100,74600,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,1100,0,'Orchard Pk',0,5900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'586',1100,75900,,'',0,8400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'587',1100,64300,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'588',1100,64300,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'589',1100,64300,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'583',1400,121600,,'',0,73700,,'',0
+'584',1400,121600,,'',0,73700,,'',0
+'587',1400,121600,,'',0,73700,,'',0
+'588',1400,121600,,'',0,73700,,'',0
+'589',1400,121600,,'',0,73700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_493 b/src/main/res-current/raw/current_gtfs_schedule_stop_493
index b305d128e..5241d13ce 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_493
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_493
@@ -1,7 +1,7 @@
-'576',1401,81800,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
-'577',1401,64300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'578',1401,64300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'579',1401,64300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'580',1401,64300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'581',1401,75600,,'',0,17500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
-'582',1401,64300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'583',1401,64300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'584',1401,64300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'585',1401,75600,,'',0,17500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
+'586',1401,81800,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
+'587',1401,64300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'588',1401,64300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'589',1401,64300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_494 b/src/main/res-current/raw/current_gtfs_schedule_stop_494
index 58f7fc931..a241148bf 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_494
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_494
@@ -1,7 +1,7 @@
-'576',2501,101200,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
-'577',2501,75400,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'578',2501,75400,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'579',2501,75400,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'580',2501,75400,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'581',2501,92700,,'',0,13200,,'',0,17300,,'',0,17100,,'',0,40300,,'',0
-'582',2501,75400,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'583',2501,75400,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'584',2501,75400,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'585',2501,92700,,'',0,13200,,'',0,17300,,'',0,17100,,'',0,40300,,'',0
+'586',2501,101200,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
+'587',2501,75400,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'588',2501,75400,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'589',2501,75400,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_495 b/src/main/res-current/raw/current_gtfs_schedule_stop_495
index 670483bff..737c5b848 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_495
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_495
@@ -1,7 +1,7 @@
-'576',1400,83200,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
-'577',1400,65700,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
-'578',1400,65700,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
-'579',1400,65700,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
-'580',1400,65700,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
-'581',1400,81000,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
-'582',1400,65700,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'583',1400,65700,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'584',1400,65700,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'585',1400,81000,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
+'586',1400,83200,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
+'587',1400,65700,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'588',1400,65700,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'589',1400,65700,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_496 b/src/main/res-current/raw/current_gtfs_schedule_stop_496
index 6e50420c7..d445133d0 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_496
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_496
@@ -1,7 +1,7 @@
-'576',2500,103600,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
-'577',2500,72400,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
-'578',2500,72400,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
-'579',2500,72400,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
-'580',2500,72400,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
-'581',2500,95200,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
-'582',2500,72400,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
+'583',2500,72400,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
+'584',2500,72400,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
+'585',2500,95200,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
+'586',2500,103600,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
+'587',2500,72400,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
+'588',2500,72400,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
+'589',2500,72400,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_497 b/src/main/res-current/raw/current_gtfs_schedule_stop_497
index f8f9db34c..212e56161 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_497
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_497
@@ -1,7 +1,7 @@
-'576',1700,84000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',1700,61600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1700,61600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1700,61600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1700,61600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1700,84100,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'582',1700,61600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1700,61600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1700,61600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1700,84100,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'586',1700,84000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',1700,61600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1700,61600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1700,61600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_498 b/src/main/res-current/raw/current_gtfs_schedule_stop_498
index 154fe6547..e10f4ed87 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_498
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_498
@@ -1,7 +1,7 @@
-'576',2001,75200,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'577',2001,63300,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'578',2001,63300,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'579',2001,63300,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'580',2001,63300,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'581',2001,75800,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'582',2001,63300,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'583',2001,63300,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'584',2001,63300,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'585',2001,75800,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'586',2001,75200,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'587',2001,63300,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'588',2001,63300,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'589',2001,63300,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_499 b/src/main/res-current/raw/current_gtfs_schedule_stop_499
index 801d34e44..bf9f580c8 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_499
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_499
@@ -1,10 +1,10 @@
-'577',500,64700,,'',0,7700,,'',0,9700,,'',0,69700,,'',0,1500,,'',0,7900,,'',0,9000,,'',0,4000,,'',0
-'578',500,64700,,'',0,7700,,'',0,9700,,'',0,69700,,'',0,1500,,'',0,7900,,'',0,9000,,'',0,4000,,'',0
-'579',500,64700,,'',0,7700,,'',0,9700,,'',0,69700,,'',0,1500,,'',0,7900,,'',0,9000,,'',0,4000,,'',0
-'580',500,64700,,'',0,7700,,'',0,9700,,'',0,69700,,'',0,1500,,'',0,7900,,'',0,9000,,'',0,4000,,'',0
-'582',500,64700,,'',0,7700,,'',0,9700,,'',0,69700,,'',0,1500,,'',0,7900,,'',0,9000,,'',0,4000,,'',0
-'577',1201,65700,,'',0,8100,,'',0,8000,,'',0,63500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4600,,'',0
-'578',1201,65700,,'',0,8100,,'',0,8000,,'',0,63500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4600,,'',0
-'579',1201,65700,,'',0,8100,,'',0,8000,,'',0,63500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4600,,'',0
-'580',1201,65700,,'',0,8100,,'',0,8000,,'',0,63500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4600,,'',0
-'582',1201,65700,,'',0,8100,,'',0,8000,,'',0,63500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4600,,'',0
+'583',500,64700,,'',0,7700,,'',0,9700,,'',0,69700,,'',0,1500,,'',0,7900,,'',0,9000,,'',0,4000,,'',0
+'584',500,64700,,'',0,7700,,'',0,9700,,'',0,69700,,'',0,1500,,'',0,7900,,'',0,9000,,'',0,4000,,'',0
+'587',500,64700,,'',0,7700,,'',0,9700,,'',0,69700,,'',0,1500,,'',0,7900,,'',0,9000,,'',0,4000,,'',0
+'588',500,64700,,'',0,7700,,'',0,9700,,'',0,69700,,'',0,1500,,'',0,7900,,'',0,9000,,'',0,4000,,'',0
+'589',500,64700,,'',0,7700,,'',0,9700,,'',0,69700,,'',0,1500,,'',0,7900,,'',0,9000,,'',0,4000,,'',0
+'583',1201,65700,,'',0,8100,,'',0,8000,,'',0,63500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4600,,'',0
+'584',1201,65700,,'',0,8100,,'',0,8000,,'',0,63500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4600,,'',0
+'587',1201,65700,,'',0,8100,,'',0,8000,,'',0,63500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4600,,'',0
+'588',1201,65700,,'',0,8100,,'',0,8000,,'',0,63500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4600,,'',0
+'589',1201,65700,,'',0,8100,,'',0,8000,,'',0,63500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_5 b/src/main/res-current/raw/current_gtfs_schedule_stop_5
index 893470e9b..ea68b43e8 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_5
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_5
@@ -1,21 +1,21 @@
-'576',700,90500,4,'',0,12000,4,'',0,12000,4,'',0,16000,4,'',0,12000,4,'',0,12000,4,'',0,16000,4,'',0,12000,4,'',0
-'576',701,80000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'577',700,71700,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,11000,4,'',0,11000,4,'',0,15000,4,'',0,11200,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7300,4,'',0,3500,4,'',0,15000,4,'',0,11000,4,'',0
-'577',701,61500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
-'578',700,71700,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,11000,4,'',0,11000,4,'',0,15000,4,'',0,11200,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7300,4,'',0,3500,4,'',0,15000,4,'',0,11000,4,'',0
-'578',701,61500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
-'579',700,71700,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,11000,4,'',0,11000,4,'',0,15000,4,'',0,11200,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7300,4,'',0,3500,4,'',0,15000,4,'',0,11000,4,'',0
-'579',701,61500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
-'580',700,71700,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,11000,4,'',0,11000,4,'',0,15000,4,'',0,11200,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7300,4,'',0,3500,4,'',0,15000,4,'',0,11000,4,'',0
-'580',701,61500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
-'581',700,82800,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'581',701,80500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',700,71700,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,11000,4,'',0,11000,4,'',0,15000,4,'',0,11200,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7300,4,'',0,3500,4,'',0,15000,4,'',0,11000,4,'',0
-'582',701,61500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
-'576',1800,73000,,'',0,10100,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11400,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'577',1800,61500,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
-'578',1800,61500,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
-'579',1800,61500,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
-'580',1800,61500,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
-'581',1800,73000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'582',1800,61500,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
+'583',700,71700,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,11000,4,'',0,11000,4,'',0,15000,4,'',0,11200,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7300,4,'',0,3500,4,'',0,15000,4,'',0,11000,4,'',0
+'583',701,61500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
+'584',700,71700,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,11000,4,'',0,11000,4,'',0,15000,4,'',0,11200,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7300,4,'',0,3500,4,'',0,15000,4,'',0,11000,4,'',0
+'584',701,61500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
+'585',700,82800,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'585',701,80500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',700,90500,4,'',0,12000,4,'',0,12000,4,'',0,16000,4,'',0,12000,4,'',0,12000,4,'',0,16000,4,'',0,12000,4,'',0
+'586',701,80000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'587',700,71700,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,11000,4,'',0,11000,4,'',0,15000,4,'',0,11200,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7300,4,'',0,3500,4,'',0,15000,4,'',0,11000,4,'',0
+'587',701,61500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
+'588',700,71700,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,11000,4,'',0,11000,4,'',0,15000,4,'',0,11200,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7300,4,'',0,3500,4,'',0,15000,4,'',0,11000,4,'',0
+'588',701,61500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
+'589',700,71700,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,11000,4,'',0,11000,4,'',0,15000,4,'',0,11200,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7300,4,'',0,3500,4,'',0,15000,4,'',0,11000,4,'',0
+'589',701,61500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
+'583',1800,61500,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
+'584',1800,61500,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
+'585',1800,73000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'586',1800,73000,,'',0,10100,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11400,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'587',1800,61500,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
+'588',1800,61500,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
+'589',1800,61500,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_50 b/src/main/res-current/raw/current_gtfs_schedule_stop_50
index b9938a790..0caa4f9e1 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_50
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_50
@@ -1,14 +1,14 @@
-'576',701,80300,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'577',701,61800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
-'578',701,61800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
-'579',701,61800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
-'580',701,61800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
-'581',701,80800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',701,61800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
-'576',1800,73300,,'',0,10100,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11400,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'577',1800,61800,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
-'578',1800,61800,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
-'579',1800,61800,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
-'580',1800,61800,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
-'581',1800,73300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'582',1800,61800,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
+'583',701,61800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
+'584',701,61800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
+'585',701,80800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',701,80300,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'587',701,61800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
+'588',701,61800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
+'589',701,61800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
+'583',1800,61800,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
+'584',1800,61800,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
+'585',1800,73300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'586',1800,73300,,'',0,10100,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11400,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'587',1800,61800,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
+'588',1800,61800,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
+'589',1800,61800,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_500 b/src/main/res-current/raw/current_gtfs_schedule_stop_500
index ba07e4851..942b96fa3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_500
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_500
@@ -1,7 +1,7 @@
-'576',1201,91400,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
-'577',1201,70900,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'578',1201,70900,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'579',1201,70900,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'580',1201,70900,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'581',1201,94100,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
-'582',1201,70900,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'583',1201,70900,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'584',1201,70900,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'585',1201,94100,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
+'586',1201,91400,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
+'587',1201,70900,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'588',1201,70900,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'589',1201,70900,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_501 b/src/main/res-current/raw/current_gtfs_schedule_stop_501
index c3248e60b..498dfd4e8 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_501
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_501
@@ -1,7 +1,7 @@
-'576',139000,110100,,'',0,22800,,'',0,29100,,'',0,30300,,'',0
-'577',139000,55800,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'578',139000,55800,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'579',139000,55800,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'580',139000,55800,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'581',139000,73500,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
-'582',139000,55800,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'583',139000,55800,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'584',139000,55800,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'585',139000,73500,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
+'586',139000,110100,,'',0,22800,,'',0,29100,,'',0,30300,,'',0
+'587',139000,55800,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'588',139000,55800,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'589',139000,55800,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_502 b/src/main/res-current/raw/current_gtfs_schedule_stop_502
index 1e51f5dd3..92c7a14db 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_502
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_502
@@ -1,7 +1,7 @@
-'576',2000,82500,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'577',2000,63400,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'578',2000,63400,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'579',2000,63400,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'580',2000,63400,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'581',2000,65600,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14900,,'',0,10000,,'',0
-'582',2000,63400,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'583',2000,63400,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'584',2000,63400,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'585',2000,65600,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14900,,'',0,10000,,'',0
+'586',2000,82500,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'587',2000,63400,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'588',2000,63400,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'589',2000,63400,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_503 b/src/main/res-current/raw/current_gtfs_schedule_stop_503
index 6a9fbe65a..6f7dd5068 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_503
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_503
@@ -1,7 +1,7 @@
-'576',1200,91600,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
-'577',1200,71100,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'578',1200,71100,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'579',1200,71100,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'580',1200,71100,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'581',1200,94300,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
-'582',1200,71100,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'583',1200,71100,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'584',1200,71100,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'585',1200,94300,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
+'586',1200,91600,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
+'587',1200,71100,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'588',1200,71100,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'589',1200,71100,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_504 b/src/main/res-current/raw/current_gtfs_schedule_stop_504
index 6bc30cf43..2bb6d2221 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_504
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_504
@@ -1,7 +1,7 @@
-'576',139001,72200,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
-'577',139001,61700,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'578',139001,61700,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'579',139001,61700,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'580',139001,61700,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'581',139001,74100,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
-'582',139001,61700,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'583',139001,61700,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'584',139001,61700,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'585',139001,74100,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
+'586',139001,72200,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
+'587',139001,61700,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'588',139001,61700,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'589',139001,61700,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_505 b/src/main/res-current/raw/current_gtfs_schedule_stop_505
index e69beed45..907474205 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_505
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_505
@@ -1,7 +1,7 @@
-'576',2501,101000,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
-'577',2501,75200,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'578',2501,75200,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'579',2501,75200,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'580',2501,75200,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'581',2501,92500,,'',0,13200,,'',0,17300,,'',0,17100,,'',0,40300,,'',0
-'582',2501,75200,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'583',2501,75200,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'584',2501,75200,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'585',2501,92500,,'',0,13200,,'',0,17300,,'',0,17100,,'',0,40300,,'',0
+'586',2501,101000,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
+'587',2501,75200,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'588',2501,75200,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'589',2501,75200,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_506 b/src/main/res-current/raw/current_gtfs_schedule_stop_506
index 2c641b8e0..d3e1c5073 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_506
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_506
@@ -1,7 +1,7 @@
-'576',1501,84000,,'',0,20000,,'',0,40000,,'',0,27000,,'',0
-'577',1501,71000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'578',1501,71000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'579',1501,71000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'580',1501,71000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'581',1501,94100,,'',0,17000,,'',0,20000,,'',0,20000,,'',0,10200,,'',0,10000,,'',0
-'582',1501,71000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'583',1501,71000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'584',1501,71000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'585',1501,94100,,'',0,17000,,'',0,20000,,'',0,20000,,'',0,10200,,'',0,10000,,'',0
+'586',1501,84000,,'',0,20000,,'',0,40000,,'',0,27000,,'',0
+'587',1501,71000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'588',1501,71000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'589',1501,71000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_507 b/src/main/res-current/raw/current_gtfs_schedule_stop_507
index dbeb293cb..4f8482cea 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_507
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_507
@@ -1,7 +1,7 @@
-'576',2500,103800,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
-'577',2500,72600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'578',2500,72600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'579',2500,72600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'580',2500,72600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'581',2500,95400,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
-'582',2500,72600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'583',2500,72600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'584',2500,72600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'585',2500,95400,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
+'586',2500,103800,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
+'587',2500,72600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'588',2500,72600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'589',2500,72600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_508 b/src/main/res-current/raw/current_gtfs_schedule_stop_508
index f4872d324..cb07e1ebd 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_508
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_508
@@ -1,7 +1,7 @@
-'576',2001,75100,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'577',2001,63200,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'578',2001,63200,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'579',2001,63200,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'580',2001,63200,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'581',2001,75700,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'582',2001,63200,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'583',2001,63200,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'584',2001,63200,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'585',2001,75700,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'586',2001,75100,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'587',2001,63200,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'588',2001,63200,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'589',2001,63200,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_509 b/src/main/res-current/raw/current_gtfs_schedule_stop_509
index be380c6f3..cbb52a0fe 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_509
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_509
@@ -1,7 +1,7 @@
-'576',2400,73400,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
-'577',2400,61600,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'578',2400,61600,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'579',2400,61600,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'580',2400,61600,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'581',2400,82900,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,10200,,'',0,14500,,'',0,10500,,'',0,10500,,'',0
-'582',2400,61600,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'583',2400,61600,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'584',2400,61600,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'585',2400,82900,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,10200,,'',0,14500,,'',0,10500,,'',0,10500,,'',0
+'586',2400,73400,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
+'587',2400,61600,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'588',2400,61600,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'589',2400,61600,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_51 b/src/main/res-current/raw/current_gtfs_schedule_stop_51
index 91e2aae08..c5a5249d7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_51
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_51
@@ -1,14 +1,14 @@
-'576',900,121700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',900,93400,,'',0,31200,,'',0,28800,,'',0
-'578',900,93400,,'',0,31200,,'',0,28800,,'',0
-'579',900,93400,,'',0,31200,,'',0,28800,,'',0
-'580',900,93400,,'',0,31200,,'',0,28800,,'',0
-'581',900,121700,,'',0,8500,,'',0,20500,,'',0,4500,,'',0
-'582',900,93400,,'',0,31200,,'',0,28800,,'',0
-'576',1000,82200,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
-'577',1000,62100,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8200,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'578',1000,62100,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8200,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'579',1000,62100,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8200,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'580',1000,62100,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8200,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'581',1000,82100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
-'582',1000,62100,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8200,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'583',900,93400,,'',0,31200,,'',0,28800,,'',0
+'584',900,93400,,'',0,31200,,'',0,28800,,'',0
+'585',900,121700,,'',0,8500,,'',0,20500,,'',0,4500,,'',0
+'586',900,121700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',900,93400,,'',0,31200,,'',0,28800,,'',0
+'588',900,93400,,'',0,31200,,'',0,28800,,'',0
+'589',900,93400,,'',0,31200,,'',0,28800,,'',0
+'583',1000,62100,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8200,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'584',1000,62100,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8200,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'585',1000,82100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'586',1000,82200,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
+'587',1000,62100,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8200,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'588',1000,62100,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8200,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'589',1000,62100,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8200,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_510 b/src/main/res-current/raw/current_gtfs_schedule_stop_510
index ce1a1f00a..810f34db3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_510
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_510
@@ -1,7 +1,7 @@
-'576',1501,84100,,'',0,20000,,'',0,40000,,'',0,27000,,'',0
-'577',1501,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'578',1501,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'579',1501,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'580',1501,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'581',1501,94200,,'',0,17000,,'',0,20000,,'',0,20000,,'',0,10200,,'',0,10000,,'',0
-'582',1501,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'583',1501,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'584',1501,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'585',1501,94200,,'',0,17000,,'',0,20000,,'',0,20000,,'',0,10200,,'',0,10000,,'',0
+'586',1501,84100,,'',0,20000,,'',0,40000,,'',0,27000,,'',0
+'587',1501,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'588',1501,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'589',1501,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_511 b/src/main/res-current/raw/current_gtfs_schedule_stop_511
index be380c6f3..cbb52a0fe 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_511
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_511
@@ -1,7 +1,7 @@
-'576',2400,73400,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
-'577',2400,61600,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'578',2400,61600,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'579',2400,61600,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'580',2400,61600,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'581',2400,82900,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,10200,,'',0,14500,,'',0,10500,,'',0,10500,,'',0
-'582',2400,61600,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'583',2400,61600,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'584',2400,61600,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'585',2400,82900,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,10200,,'',0,14500,,'',0,10500,,'',0,10500,,'',0
+'586',2400,73400,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
+'587',2400,61600,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'588',2400,61600,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'589',2400,61600,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_512 b/src/main/res-current/raw/current_gtfs_schedule_stop_512
index 28544fecb..fed041d4c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_512
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_512
@@ -1,12 +1,12 @@
-'576',2300,80800,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,5500,,'',0,9400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
-'577',2300,52800,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
-'578',2300,52800,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
-'579',2300,52800,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
-'580',2300,52800,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
-'581',2300,71400,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,5100,,'',0,14400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'582',2300,52800,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
-'577',2800,65700,4,'',0,4800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,47300,,'',0,2700,4,'',0,4800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0
-'578',2800,65700,4,'',0,4800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,47300,,'',0,2700,4,'',0,4800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0
-'579',2800,65700,4,'',0,4800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,47300,,'',0,2700,4,'',0,4800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0
-'580',2800,65700,4,'',0,4800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,47300,,'',0,2700,4,'',0,4800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0
-'582',2800,65700,4,'',0,4800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,47300,,'',0,2700,4,'',0,4800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0
+'583',2300,52800,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
+'584',2300,52800,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
+'585',2300,71400,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,5100,,'',0,14400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'586',2300,80800,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,5500,,'',0,9400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
+'587',2300,52800,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
+'588',2300,52800,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
+'589',2300,52800,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
+'583',2800,65700,4,'',0,4800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,47300,,'',0,2700,4,'',0,4800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0
+'584',2800,65700,4,'',0,4800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,47300,,'',0,2700,4,'',0,4800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0
+'587',2800,65700,4,'',0,4800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,47300,,'',0,2700,4,'',0,4800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0
+'588',2800,65700,4,'',0,4800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,47300,,'',0,2700,4,'',0,4800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0
+'589',2800,65700,4,'',0,4800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,47300,,'',0,2700,4,'',0,4800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_513 b/src/main/res-current/raw/current_gtfs_schedule_stop_513
index af1999daa..11b173cd3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_513
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_513
@@ -1,7 +1,7 @@
-'576',139000,110000,,'',0,22800,,'',0,29100,,'',0,30300,,'',0
-'577',139000,55700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'578',139000,55700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'579',139000,55700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'580',139000,55700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'581',139000,73400,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
-'582',139000,55700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'583',139000,55700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'584',139000,55700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'585',139000,73400,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
+'586',139000,110000,,'',0,22800,,'',0,29100,,'',0,30300,,'',0
+'587',139000,55700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'588',139000,55700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'589',139000,55700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_514 b/src/main/res-current/raw/current_gtfs_schedule_stop_514
index 911443ce9..54dfaf8e9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_514
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_514
@@ -1,7 +1,7 @@
-'576',2000,82600,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,14100,,'',0
-'577',2000,63500,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'578',2000,63500,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'579',2000,63500,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'580',2000,63500,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'581',2000,65700,,'',0,14300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14900,,'',0,10000,,'',0
-'582',2000,63500,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'583',2000,63500,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'584',2000,63500,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'585',2000,65700,,'',0,14300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14900,,'',0,10000,,'',0
+'586',2000,82600,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,14100,,'',0
+'587',2000,63500,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'588',2000,63500,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'589',2000,63500,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_516 b/src/main/res-current/raw/current_gtfs_schedule_stop_516
index 359625bfd..a576e139f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_516
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_516
@@ -1,7 +1,7 @@
-'576',1400,83400,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
-'577',1400,65900,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
-'578',1400,65900,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
-'579',1400,65900,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
-'580',1400,65900,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
-'581',1400,81200,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
-'582',1400,65900,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'583',1400,65900,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'584',1400,65900,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'585',1400,81200,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
+'586',1400,83400,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
+'587',1400,65900,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'588',1400,65900,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'589',1400,65900,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_517 b/src/main/res-current/raw/current_gtfs_schedule_stop_517
index 21151b7ff..9af912ae6 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_517
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_517
@@ -1,6 +1,6 @@
-'577',2301,74800,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
-'578',2301,74800,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
-'579',2301,74800,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
-'580',2301,74800,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
-'581',2301,101200,0,'Old Vernon Rd',0
-'582',2301,74800,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'583',2301,74800,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'584',2301,74800,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'585',2301,101200,0,'Old Vernon Rd',0
+'587',2301,74800,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'588',2301,74800,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'589',2301,74800,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_518 b/src/main/res-current/raw/current_gtfs_schedule_stop_518
index 9a43bdd75..64939b3fd 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_518
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_518
@@ -1,6 +1,6 @@
-'577',2300,143700,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
-'578',2300,143700,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
-'579',2300,143700,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
-'580',2300,143700,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
-'581',2300,141900,0,'Old Vernon Rd',0
-'582',2300,143700,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'583',2300,143700,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'584',2300,143700,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'585',2300,141900,0,'Old Vernon Rd',0
+'587',2300,143700,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'588',2300,143700,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'589',2300,143700,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_519 b/src/main/res-current/raw/current_gtfs_schedule_stop_519
index 7db7beeb8..9ef3b8b61 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_519
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_519
@@ -1,7 +1,7 @@
-'576',2400,73500,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
-'577',2400,61700,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'578',2400,61700,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'579',2400,61700,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'580',2400,61700,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'581',2400,83000,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,10200,,'',0,14500,,'',0,10500,,'',0,10500,,'',0
-'582',2400,61700,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'583',2400,61700,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'584',2400,61700,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'585',2400,83000,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,10200,,'',0,14500,,'',0,10500,,'',0,10500,,'',0
+'586',2400,73500,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
+'587',2400,61700,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'588',2400,61700,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'589',2400,61700,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_52 b/src/main/res-current/raw/current_gtfs_schedule_stop_52
index b4d4f839f..6cf5986ad 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_52
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_52
@@ -1,7 +1,7 @@
-'576',200,82200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
-'577',200,61700,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'578',200,61700,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'579',200,61700,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'580',200,61700,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'581',200,82100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'582',200,61700,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'583',200,61700,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'584',200,61700,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'585',200,82100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
+'586',200,82200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
+'587',200,61700,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'588',200,61700,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'589',200,61700,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_520 b/src/main/res-current/raw/current_gtfs_schedule_stop_520
index 43b3482c1..c23798493 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_520
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_520
@@ -1,7 +1,7 @@
-'576',1400,83500,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
-'577',1400,70000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,30900,,'',0,32100,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,21700,,'',0
-'578',1400,70000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,30900,,'',0,32100,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,21700,,'',0
-'579',1400,70000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,30900,,'',0,32100,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,21700,,'',0
-'580',1400,70000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,30900,,'',0,32100,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,21700,,'',0
-'581',1400,81300,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
-'582',1400,70000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,30900,,'',0,32100,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,21700,,'',0
+'583',1400,70000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,30900,,'',0,32100,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,21700,,'',0
+'584',1400,70000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,30900,,'',0,32100,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,21700,,'',0
+'585',1400,81300,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
+'586',1400,83500,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
+'587',1400,70000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,30900,,'',0,32100,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,21700,,'',0
+'588',1400,70000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,30900,,'',0,32100,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,21700,,'',0
+'589',1400,70000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,30900,,'',0,32100,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,21700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_521 b/src/main/res-current/raw/current_gtfs_schedule_stop_521
index bdef79db3..acb5ed14e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_521
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_521
@@ -1,7 +1,7 @@
-'576',2501,100800,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
-'577',2501,75000,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'578',2501,75000,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'579',2501,75000,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'580',2501,75000,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'581',2501,92300,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,44300,,'',0
-'582',2501,75000,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'583',2501,75000,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'584',2501,75000,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'585',2501,92300,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,44300,,'',0
+'586',2501,100800,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
+'587',2501,75000,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'588',2501,75000,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'589',2501,75000,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_522 b/src/main/res-current/raw/current_gtfs_schedule_stop_522
index f4872d324..cb07e1ebd 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_522
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_522
@@ -1,7 +1,7 @@
-'576',2001,75100,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'577',2001,63200,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'578',2001,63200,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'579',2001,63200,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'580',2001,63200,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'581',2001,75700,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'582',2001,63200,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'583',2001,63200,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'584',2001,63200,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'585',2001,75700,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'586',2001,75100,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'587',2001,63200,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'588',2001,63200,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'589',2001,63200,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_523 b/src/main/res-current/raw/current_gtfs_schedule_stop_523
index a59f8701e..23974b451 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_523
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_523
@@ -1,7 +1,7 @@
-'576',2500,103900,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
-'577',2500,72700,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'578',2500,72700,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'579',2500,72700,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'580',2500,72700,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'581',2500,95500,,'',0,17200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
-'582',2500,72700,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'583',2500,72700,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'584',2500,72700,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'585',2500,95500,,'',0,17200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
+'586',2500,103900,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
+'587',2500,72700,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'588',2500,72700,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'589',2500,72700,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_524 b/src/main/res-current/raw/current_gtfs_schedule_stop_524
index aad0186b8..8c3474175 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_524
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_524
@@ -1,7 +1,7 @@
-'576',2000,82700,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,14300,,'',0,10100,,'',0
-'577',2000,63600,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
-'578',2000,63600,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
-'579',2000,63600,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
-'580',2000,63600,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
-'581',2000,65800,,'',0,14300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14800,,'',0,10000,,'',0
-'582',2000,63600,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
+'583',2000,63600,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
+'584',2000,63600,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
+'585',2000,65800,,'',0,14300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14800,,'',0,10000,,'',0
+'586',2000,82700,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,14300,,'',0,10100,,'',0
+'587',2000,63600,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
+'588',2000,63600,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
+'589',2000,63600,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_525 b/src/main/res-current/raw/current_gtfs_schedule_stop_525
index 613b87970..52422a11f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_525
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_525
@@ -1,14 +1,14 @@
-'576',1200,91500,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
-'576',1201,91500,4,'',0,3700,4,'',0,18900,4,'',0,18700,4,'',0,18300,4,'',0,4000,4,'',0,18800,4,'',0,8100,4,'',0
-'577',1200,71000,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'577',1201,71000,4,'',0,4100,4,'',0,8000,4,'',0,28000,4,'',0,39800,4,'',0,4400,4,'',0,8400,4,'',0,8200,4,'',0,8600,4,'',0,21600,4,'',0
-'578',1200,71000,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'578',1201,71000,4,'',0,4100,4,'',0,8000,4,'',0,28000,4,'',0,39800,4,'',0,4400,4,'',0,8400,4,'',0,8200,4,'',0,8600,4,'',0,21600,4,'',0
-'579',1200,71000,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'579',1201,71000,4,'',0,4100,4,'',0,8000,4,'',0,28000,4,'',0,39800,4,'',0,4400,4,'',0,8400,4,'',0,8200,4,'',0,8600,4,'',0,21600,4,'',0
-'580',1200,71000,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'580',1201,71000,4,'',0,4100,4,'',0,8000,4,'',0,28000,4,'',0,39800,4,'',0,4400,4,'',0,8400,4,'',0,8200,4,'',0,8600,4,'',0,21600,4,'',0
-'581',1200,94200,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
-'581',1201,94200,4,'',0,7600,4,'',0,21300,4,'',0,30000,4,'',0,8000,4,'',0,4000,4,'',0,46500,4,'',0
-'582',1200,71000,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'582',1201,71000,4,'',0,4100,4,'',0,8000,4,'',0,28000,4,'',0,39800,4,'',0,4400,4,'',0,8400,4,'',0,8200,4,'',0,8600,4,'',0,21600,4,'',0
+'583',1200,71000,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'583',1201,71000,4,'',0,4100,4,'',0,8000,4,'',0,28000,4,'',0,39800,4,'',0,4400,4,'',0,8400,4,'',0,8200,4,'',0,8600,4,'',0,21600,4,'',0
+'584',1200,71000,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'584',1201,71000,4,'',0,4100,4,'',0,8000,4,'',0,28000,4,'',0,39800,4,'',0,4400,4,'',0,8400,4,'',0,8200,4,'',0,8600,4,'',0,21600,4,'',0
+'585',1200,94200,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
+'585',1201,94200,4,'',0,7600,4,'',0,21300,4,'',0,30000,4,'',0,8000,4,'',0,4000,4,'',0,46500,4,'',0
+'586',1200,91500,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
+'586',1201,91500,4,'',0,3700,4,'',0,18900,4,'',0,18700,4,'',0,18300,4,'',0,4000,4,'',0,18800,4,'',0,8100,4,'',0
+'587',1200,71000,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'587',1201,71000,4,'',0,4100,4,'',0,8000,4,'',0,28000,4,'',0,39800,4,'',0,4400,4,'',0,8400,4,'',0,8200,4,'',0,8600,4,'',0,21600,4,'',0
+'588',1200,71000,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'588',1201,71000,4,'',0,4100,4,'',0,8000,4,'',0,28000,4,'',0,39800,4,'',0,4400,4,'',0,8400,4,'',0,8200,4,'',0,8600,4,'',0,21600,4,'',0
+'589',1200,71000,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'589',1201,71000,4,'',0,4100,4,'',0,8000,4,'',0,28000,4,'',0,39800,4,'',0,4400,4,'',0,8400,4,'',0,8200,4,'',0,8600,4,'',0,21600,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_526 b/src/main/res-current/raw/current_gtfs_schedule_stop_526
index f12c49ee8..6ab4ff6bd 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_526
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_526
@@ -1,7 +1,7 @@
-'576',1401,82000,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
-'577',1401,64500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'578',1401,64500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'579',1401,64500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'580',1401,64500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'581',1401,75800,,'',0,17500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
-'582',1401,64500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'583',1401,64500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'584',1401,64500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'585',1401,75800,,'',0,17500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
+'586',1401,82000,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
+'587',1401,64500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'588',1401,64500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'589',1401,64500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_527 b/src/main/res-current/raw/current_gtfs_schedule_stop_527
index c5025ae32..f6aa3205d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_527
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_527
@@ -1,7 +1,7 @@
-'576',2000,82700,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,14300,,'',0,10100,,'',0
-'577',2000,63600,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'578',2000,63600,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'579',2000,63600,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'580',2000,63600,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'581',2000,65800,,'',0,14300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14900,,'',0,10000,,'',0
-'582',2000,63600,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'583',2000,63600,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'584',2000,63600,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'585',2000,65800,,'',0,14300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14900,,'',0,10000,,'',0
+'586',2000,82700,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,14300,,'',0,10100,,'',0
+'587',2000,63600,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'588',2000,63600,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'589',2000,63600,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_528 b/src/main/res-current/raw/current_gtfs_schedule_stop_528
index 2a38086cf..f74d1c970 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_528
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_528
@@ -1,7 +1,7 @@
-'576',2001,75000,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'577',2001,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'578',2001,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'579',2001,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'580',2001,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'581',2001,75600,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'582',2001,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'583',2001,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'584',2001,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'585',2001,75600,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'586',2001,75000,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'587',2001,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'588',2001,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'589',2001,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_529 b/src/main/res-current/raw/current_gtfs_schedule_stop_529
index 9e33b27fb..4ff3655be 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_529
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_529
@@ -1,7 +1,7 @@
-'576',2401,81200,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
-'577',2401,55100,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'578',2401,55100,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'579',2401,55100,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'580',2401,55100,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'581',2401,72000,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'582',2401,55100,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'583',2401,55100,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'584',2401,55100,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'585',2401,72000,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'586',2401,81200,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
+'587',2401,55100,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'588',2401,55100,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'589',2401,55100,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_53 b/src/main/res-current/raw/current_gtfs_schedule_stop_53
index f28ddfb51..8dcb76745 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_53
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_53
@@ -1,7 +1,7 @@
-'576',300,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
-'577',300,73200,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'578',300,73200,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'579',300,73200,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'580',300,73200,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'581',300,81900,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'582',300,73200,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'583',300,73200,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'584',300,73200,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'585',300,81900,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
+'586',300,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
+'587',300,73200,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'588',300,73200,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'589',300,73200,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_530 b/src/main/res-current/raw/current_gtfs_schedule_stop_530
index 4325e45da..d5dbc5a72 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_530
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_530
@@ -1,7 +1,7 @@
-'576',2400,73600,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
-'577',2400,61800,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'578',2400,61800,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'579',2400,61800,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'580',2400,61800,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'581',2400,83100,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,10200,,'',0,14500,,'',0,10500,,'',0,10500,,'',0
-'582',2400,61800,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'583',2400,61800,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'584',2400,61800,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'585',2400,83100,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,10200,,'',0,14500,,'',0,10500,,'',0,10500,,'',0
+'586',2400,73600,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
+'587',2400,61800,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'588',2400,61800,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'589',2400,61800,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_531 b/src/main/res-current/raw/current_gtfs_schedule_stop_531
index 1c7db149f..345172058 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_531
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_531
@@ -1,7 +1,7 @@
-'576',2500,104200,,'',0,26800,,'',0,29100,,'',0,22900,,'',0
-'577',2500,73000,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'578',2500,73000,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'579',2500,73000,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'580',2500,73000,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'581',2500,95800,,'',0,17200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
-'582',2500,73000,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'583',2500,73000,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'584',2500,73000,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'585',2500,95800,,'',0,17200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
+'586',2500,104200,,'',0,26800,,'',0,29100,,'',0,22900,,'',0
+'587',2500,73000,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'588',2500,73000,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'589',2500,73000,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_532 b/src/main/res-current/raw/current_gtfs_schedule_stop_532
index 2a38086cf..f74d1c970 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_532
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_532
@@ -1,7 +1,7 @@
-'576',2001,75000,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'577',2001,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'578',2001,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'579',2001,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'580',2001,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'581',2001,75600,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'582',2001,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'583',2001,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'584',2001,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'585',2001,75600,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'586',2001,75000,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'587',2001,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'588',2001,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'589',2001,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_533 b/src/main/res-current/raw/current_gtfs_schedule_stop_533
index f41b0e206..14befb030 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_533
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_533
@@ -1,7 +1,7 @@
-'576',1400,83000,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
-'577',1400,65500,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
-'578',1400,65500,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
-'579',1400,65500,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
-'580',1400,65500,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
-'581',1400,80800,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
-'582',1400,65500,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'583',1400,65500,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'584',1400,65500,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'585',1400,80800,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
+'586',1400,83000,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
+'587',1400,65500,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'588',1400,65500,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'589',1400,65500,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_534 b/src/main/res-current/raw/current_gtfs_schedule_stop_534
index 4f9f40bd3..84b3e91d8 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_534
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_534
@@ -1,7 +1,7 @@
-'576',139000,105900,,'',0,26800,,'',0,29100,,'',0,30300,,'',0
-'577',139000,55600,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'578',139000,55600,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'579',139000,55600,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'580',139000,55600,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'581',139000,73300,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
-'582',139000,55600,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'583',139000,55600,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'584',139000,55600,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'585',139000,73300,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
+'586',139000,105900,,'',0,26800,,'',0,29100,,'',0,30300,,'',0
+'587',139000,55600,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'588',139000,55600,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'589',139000,55600,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_535 b/src/main/res-current/raw/current_gtfs_schedule_stop_535
index 0e0fffcd7..b3b7a3d1e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_535
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_535
@@ -1,6 +1,6 @@
-'577',2301,74700,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
-'578',2301,74700,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
-'579',2301,74700,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
-'580',2301,74700,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
-'581',2301,101100,0,'Old Vernon Rd',0
-'582',2301,74700,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'583',2301,74700,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'584',2301,74700,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'585',2301,101100,0,'Old Vernon Rd',0
+'587',2301,74700,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'588',2301,74700,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'589',2301,74700,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_536 b/src/main/res-current/raw/current_gtfs_schedule_stop_536
index b52426347..7e2f8da9d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_536
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_536
@@ -1,7 +1,7 @@
-'576',139001,72400,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
-'577',139001,61900,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'578',139001,61900,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'579',139001,61900,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'580',139001,61900,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'581',139001,74300,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
-'582',139001,61900,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'583',139001,61900,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'584',139001,61900,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'585',139001,74300,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
+'586',139001,72400,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
+'587',139001,61900,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'588',139001,61900,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'589',139001,61900,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_537 b/src/main/res-current/raw/current_gtfs_schedule_stop_537
index 2fc3f2637..a9afbb1a0 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_537
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_537
@@ -1,6 +1,6 @@
-'577',2300,143800,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
-'578',2300,143800,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
-'579',2300,143800,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
-'580',2300,143800,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
-'581',2300,141900,0,'Old Vernon Rd',0
-'582',2300,143800,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'583',2300,143800,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'584',2300,143800,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'585',2300,141900,0,'Old Vernon Rd',0
+'587',2300,143800,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'588',2300,143800,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'589',2300,143800,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_538 b/src/main/res-current/raw/current_gtfs_schedule_stop_538
index 43c3e2e87..d76bda795 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_538
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_538
@@ -1,5 +1,5 @@
-'577',500,65500,,'',0,7800,,'',0,9800,,'',0,9400,,'',0,60400,,'',0,1500,,'',0,7700,,'',0,9000,,'',0,4000,,'',0
-'578',500,65500,,'',0,7800,,'',0,9800,,'',0,9400,,'',0,60400,,'',0,1500,,'',0,7700,,'',0,9000,,'',0,4000,,'',0
-'579',500,65500,,'',0,7800,,'',0,9800,,'',0,9400,,'',0,60400,,'',0,1500,,'',0,7700,,'',0,9000,,'',0,4000,,'',0
-'580',500,65500,,'',0,7800,,'',0,9800,,'',0,9400,,'',0,60400,,'',0,1500,,'',0,7700,,'',0,9000,,'',0,4000,,'',0
-'582',500,65500,,'',0,7800,,'',0,9800,,'',0,9400,,'',0,60400,,'',0,1500,,'',0,7700,,'',0,9000,,'',0,4000,,'',0
+'583',500,65500,,'',0,7800,,'',0,9800,,'',0,9400,,'',0,60400,,'',0,1500,,'',0,7700,,'',0,9000,,'',0,4000,,'',0
+'584',500,65500,,'',0,7800,,'',0,9800,,'',0,9400,,'',0,60400,,'',0,1500,,'',0,7700,,'',0,9000,,'',0,4000,,'',0
+'587',500,65500,,'',0,7800,,'',0,9800,,'',0,9400,,'',0,60400,,'',0,1500,,'',0,7700,,'',0,9000,,'',0,4000,,'',0
+'588',500,65500,,'',0,7800,,'',0,9800,,'',0,9400,,'',0,60400,,'',0,1500,,'',0,7700,,'',0,9000,,'',0,4000,,'',0
+'589',500,65500,,'',0,7800,,'',0,9800,,'',0,9400,,'',0,60400,,'',0,1500,,'',0,7700,,'',0,9000,,'',0,4000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_539 b/src/main/res-current/raw/current_gtfs_schedule_stop_539
index bdef79db3..acb5ed14e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_539
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_539
@@ -1,7 +1,7 @@
-'576',2501,100800,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
-'577',2501,75000,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'578',2501,75000,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'579',2501,75000,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'580',2501,75000,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'581',2501,92300,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,44300,,'',0
-'582',2501,75000,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'583',2501,75000,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'584',2501,75000,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'585',2501,92300,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,44300,,'',0
+'586',2501,100800,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
+'587',2501,75000,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'588',2501,75000,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'589',2501,75000,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_54 b/src/main/res-current/raw/current_gtfs_schedule_stop_54
index 8b81eea3e..643405efc 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_54
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_54
@@ -1,7 +1,7 @@
-'576',1101,74400,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
-'577',1101,65100,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'578',1101,65100,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'579',1101,65100,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'580',1101,65100,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'581',1101,80500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'582',1101,65100,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'583',1101,65100,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'584',1101,65100,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'585',1101,80500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'586',1101,74400,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
+'587',1101,65100,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'588',1101,65100,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'589',1101,65100,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_540 b/src/main/res-current/raw/current_gtfs_schedule_stop_540
index a59f8701e..23974b451 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_540
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_540
@@ -1,7 +1,7 @@
-'576',2500,103900,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
-'577',2500,72700,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'578',2500,72700,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'579',2500,72700,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'580',2500,72700,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'581',2500,95500,,'',0,17200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
-'582',2500,72700,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'583',2500,72700,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'584',2500,72700,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'585',2500,95500,,'',0,17200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
+'586',2500,103900,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
+'587',2500,72700,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'588',2500,72700,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'589',2500,72700,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_541 b/src/main/res-current/raw/current_gtfs_schedule_stop_541
index 59014897d..c5cdeb2ff 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_541
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_541
@@ -1,7 +1,7 @@
-'576',2000,82800,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,14300,,'',0,10100,,'',0
-'577',2000,63700,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
-'578',2000,63700,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
-'579',2000,63700,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
-'580',2000,63700,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
-'581',2000,65900,,'',0,14300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14800,,'',0,10000,,'',0
-'582',2000,63700,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
+'583',2000,63700,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
+'584',2000,63700,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
+'585',2000,65900,,'',0,14300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14800,,'',0,10000,,'',0
+'586',2000,82800,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,14300,,'',0,10100,,'',0
+'587',2000,63700,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
+'588',2000,63700,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
+'589',2000,63700,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_542 b/src/main/res-current/raw/current_gtfs_schedule_stop_542
index 5ac30b124..3fbe4e3f1 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_542
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_542
@@ -1,7 +1,7 @@
-'576',2500,104300,,'',0,26800,,'',0,29100,,'',0,22900,,'',0
-'577',2500,73100,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'578',2500,73100,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'579',2500,73100,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'580',2500,73100,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'581',2500,95900,,'',0,17200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
-'582',2500,73100,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'583',2500,73100,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'584',2500,73100,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'585',2500,95900,,'',0,17200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
+'586',2500,104300,,'',0,26800,,'',0,29100,,'',0,22900,,'',0
+'587',2500,73100,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'588',2500,73100,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'589',2500,73100,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_543 b/src/main/res-current/raw/current_gtfs_schedule_stop_543
index e07bac67b..9e95b78d8 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_543
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_543
@@ -1,5 +1,5 @@
-'577',501,62500,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,59500,4,'',0,12000,,'',0,8800,,'',0,7600,,'',0,9000,,'',0,10000,4,'',0,12500,4,'',0,19500,4,'',0,10000,4,'',0,18700,4,'',0
-'578',501,62500,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,59500,4,'',0,12000,,'',0,8800,,'',0,7600,,'',0,9000,,'',0,10000,4,'',0,12500,4,'',0,19500,4,'',0,10000,4,'',0,18700,4,'',0
-'579',501,62500,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,59500,4,'',0,12000,,'',0,8800,,'',0,7600,,'',0,9000,,'',0,10000,4,'',0,12500,4,'',0,19500,4,'',0,10000,4,'',0,18700,4,'',0
-'580',501,62500,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,59500,4,'',0,12000,,'',0,8800,,'',0,7600,,'',0,9000,,'',0,10000,4,'',0,12500,4,'',0,19500,4,'',0,10000,4,'',0,18700,4,'',0
-'582',501,62500,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,59500,4,'',0,12000,,'',0,8800,,'',0,7600,,'',0,9000,,'',0,10000,4,'',0,12500,4,'',0,19500,4,'',0,10000,4,'',0,18700,4,'',0
+'583',501,62500,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,59500,4,'',0,12000,,'',0,8800,,'',0,7600,,'',0,9000,,'',0,10000,4,'',0,12500,4,'',0,19500,4,'',0,10000,4,'',0,18700,4,'',0
+'584',501,62500,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,59500,4,'',0,12000,,'',0,8800,,'',0,7600,,'',0,9000,,'',0,10000,4,'',0,12500,4,'',0,19500,4,'',0,10000,4,'',0,18700,4,'',0
+'587',501,62500,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,59500,4,'',0,12000,,'',0,8800,,'',0,7600,,'',0,9000,,'',0,10000,4,'',0,12500,4,'',0,19500,4,'',0,10000,4,'',0,18700,4,'',0
+'588',501,62500,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,59500,4,'',0,12000,,'',0,8800,,'',0,7600,,'',0,9000,,'',0,10000,4,'',0,12500,4,'',0,19500,4,'',0,10000,4,'',0,18700,4,'',0
+'589',501,62500,,'',0,7800,,'',0,4700,,'',0,8500,,'',0,59500,4,'',0,12000,,'',0,8800,,'',0,7600,,'',0,9000,,'',0,10000,4,'',0,12500,4,'',0,19500,4,'',0,10000,4,'',0,18700,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_544 b/src/main/res-current/raw/current_gtfs_schedule_stop_544
index 97513dc63..27084c187 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_544
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_544
@@ -1,7 +1,7 @@
-'576',2400,73700,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,14100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
-'577',2400,61800,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'578',2400,61800,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'579',2400,61800,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'580',2400,61800,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'581',2400,83100,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,10200,,'',0,14500,,'',0,10500,,'',0,10500,,'',0
-'582',2400,61800,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'583',2400,61800,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'584',2400,61800,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'585',2400,83100,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,10200,,'',0,14500,,'',0,10500,,'',0,10500,,'',0
+'586',2400,73700,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,14100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
+'587',2400,61800,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'588',2400,61800,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'589',2400,61800,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_545 b/src/main/res-current/raw/current_gtfs_schedule_stop_545
index e301a5e36..067510b5f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_545
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_545
@@ -1,7 +1,7 @@
-'576',1401,82100,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
-'577',1401,64600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'578',1401,64600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'579',1401,64600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'580',1401,64600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'581',1401,75900,,'',0,17500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
-'582',1401,64600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'583',1401,64600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'584',1401,64600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'585',1401,75900,,'',0,17500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
+'586',1401,82100,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
+'587',1401,64600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'588',1401,64600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'589',1401,64600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_546 b/src/main/res-current/raw/current_gtfs_schedule_stop_546
index fd1a90c6e..82663472a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_546
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_546
@@ -1,7 +1,7 @@
-'576',2401,81100,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
-'577',2401,55000,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'578',2401,55000,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'579',2401,55000,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'580',2401,55000,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'581',2401,71900,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'582',2401,55000,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'583',2401,55000,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'584',2401,55000,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'585',2401,71900,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'586',2401,81100,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
+'587',2401,55000,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'588',2401,55000,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'589',2401,55000,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_547 b/src/main/res-current/raw/current_gtfs_schedule_stop_547
index 019512bff..aceee1c91 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_547
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_547
@@ -1,7 +1,7 @@
-'576',2000,82800,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,14300,,'',0,10100,,'',0
-'577',2000,63700,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'578',2000,63700,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'579',2000,63700,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'580',2000,63700,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'581',2000,65900,,'',0,14300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14900,,'',0,10000,,'',0
-'582',2000,63700,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'583',2000,63700,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'584',2000,63700,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'585',2000,65900,,'',0,14300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14900,,'',0,10000,,'',0
+'586',2000,82800,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,14300,,'',0,10100,,'',0
+'587',2000,63700,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'588',2000,63700,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'589',2000,63700,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_548 b/src/main/res-current/raw/current_gtfs_schedule_stop_548
index 2a38086cf..f74d1c970 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_548
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_548
@@ -1,7 +1,7 @@
-'576',2001,75000,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'577',2001,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'578',2001,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'579',2001,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'580',2001,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'581',2001,75600,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'582',2001,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'583',2001,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'584',2001,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'585',2001,75600,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'586',2001,75000,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'587',2001,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'588',2001,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'589',2001,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_549 b/src/main/res-current/raw/current_gtfs_schedule_stop_549
index 5ece87ad6..bfa6b5b75 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_549
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_549
@@ -1,7 +1,7 @@
-'576',1601,91000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
-'577',1601,61000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1601,61000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1601,61000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1601,61000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1601,81100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
-'582',1601,61000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1601,61000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1601,61000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1601,81100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
+'586',1601,91000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
+'587',1601,61000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1601,61000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1601,61000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_55 b/src/main/res-current/raw/current_gtfs_schedule_stop_55
index 32180de85..cf31f6bff 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_55
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_55
@@ -1,7 +1,7 @@
-'576',300,83700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11600,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
-'577',300,73500,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'578',300,73500,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'579',300,73500,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'580',300,73500,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'581',300,82200,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'582',300,73500,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'583',300,73500,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'584',300,73500,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'585',300,82200,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
+'586',300,83700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11600,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
+'587',300,73500,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'588',300,73500,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'589',300,73500,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_550 b/src/main/res-current/raw/current_gtfs_schedule_stop_550
index ef009834c..fcb6f7044 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_550
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_550
@@ -1,7 +1,7 @@
-'576',1400,82900,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
-'577',1400,65400,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
-'578',1400,65400,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
-'579',1400,65400,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
-'580',1400,65400,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
-'581',1400,80700,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
-'582',1400,65400,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'583',1400,65400,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'584',1400,65400,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'585',1400,80700,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
+'586',1400,82900,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
+'587',1400,65400,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'588',1400,65400,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'589',1400,65400,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_551 b/src/main/res-current/raw/current_gtfs_schedule_stop_551
index 80477f816..6dbc21b7e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_551
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_551
@@ -1,7 +1,7 @@
-'576',1601,91600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
-'577',1601,61600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7700,,'',0,2400,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1601,61600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7700,,'',0,2400,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1601,61600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7700,,'',0,2400,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1601,61600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7700,,'',0,2400,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1601,81700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
-'582',1601,61600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7700,,'',0,2400,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1601,61600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7700,,'',0,2400,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1601,61600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7700,,'',0,2400,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1601,81700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
+'586',1601,91600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
+'587',1601,61600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7700,,'',0,2400,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1601,61600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7700,,'',0,2400,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1601,61600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7700,,'',0,2400,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_552 b/src/main/res-current/raw/current_gtfs_schedule_stop_552
index a74752a99..9d95df42f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_552
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_552
@@ -1,7 +1,7 @@
-'576',1601,91100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
-'577',1601,61100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1601,61100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1601,61100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1601,61100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1601,81200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
-'582',1601,61100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1601,61100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1601,61100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1601,81200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
+'586',1601,91100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
+'587',1601,61100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1601,61100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1601,61100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_553 b/src/main/res-current/raw/current_gtfs_schedule_stop_553
index 53a3afebc..b99066e4a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_553
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_553
@@ -1,7 +1,7 @@
-'576',1401,82200,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
-'577',1401,64700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'578',1401,64700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'579',1401,64700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'580',1401,64700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'581',1401,80000,,'',0,13500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
-'582',1401,64700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'583',1401,64700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'584',1401,64700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'585',1401,80000,,'',0,13500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
+'586',1401,82200,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
+'587',1401,64700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'588',1401,64700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'589',1401,64700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_554 b/src/main/res-current/raw/current_gtfs_schedule_stop_554
index 503a86e5b..fc96a9119 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_554
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_554
@@ -1,7 +1,7 @@
-'576',2500,104000,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
-'577',2500,72800,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'578',2500,72800,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'579',2500,72800,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'580',2500,72800,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'581',2500,95600,,'',0,17200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
-'582',2500,72800,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'583',2500,72800,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'584',2500,72800,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'585',2500,95600,,'',0,17200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
+'586',2500,104000,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
+'587',2500,72800,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'588',2500,72800,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'589',2500,72800,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_555 b/src/main/res-current/raw/current_gtfs_schedule_stop_555
index a860d5c86..2457af8fc 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_555
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_555
@@ -1,7 +1,7 @@
-'576',1400,82800,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
-'577',1400,65300,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
-'578',1400,65300,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
-'579',1400,65300,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
-'580',1400,65300,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
-'581',1400,80600,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
-'582',1400,65300,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'583',1400,65300,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'584',1400,65300,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'585',1400,80600,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
+'586',1400,82800,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
+'587',1400,65300,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'588',1400,65300,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'589',1400,65300,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_556 b/src/main/res-current/raw/current_gtfs_schedule_stop_556
index ef44fa824..d6b6803f5 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_556
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_556
@@ -1,7 +1,7 @@
-'576',2501,100700,,'',0,22800,,'',0,29500,,'',0,22900,,'',0
-'577',2501,74900,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'578',2501,74900,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'579',2501,74900,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'580',2501,74900,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'581',2501,92200,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,44300,,'',0
-'582',2501,74900,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'583',2501,74900,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'584',2501,74900,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'585',2501,92200,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,44300,,'',0
+'586',2501,100700,,'',0,22800,,'',0,29500,,'',0,22900,,'',0
+'587',2501,74900,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'588',2501,74900,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'589',2501,74900,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_557 b/src/main/res-current/raw/current_gtfs_schedule_stop_557
index e4cefb4cc..92d826f0d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_557
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_557
@@ -1,7 +1,7 @@
-'576',139000,105800,,'',0,26800,,'',0,29100,,'',0,30300,,'',0
-'577',139000,55500,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'578',139000,55500,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'579',139000,55500,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'580',139000,55500,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'581',139000,73200,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
-'582',139000,55500,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'583',139000,55500,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'584',139000,55500,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'585',139000,73200,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
+'586',139000,105800,,'',0,26800,,'',0,29100,,'',0,30300,,'',0
+'587',139000,55500,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'588',139000,55500,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'589',139000,55500,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_558 b/src/main/res-current/raw/current_gtfs_schedule_stop_558
index 2a38086cf..f74d1c970 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_558
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_558
@@ -1,7 +1,7 @@
-'576',2001,75000,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'577',2001,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'578',2001,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'579',2001,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'580',2001,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'581',2001,75600,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'582',2001,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'583',2001,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'584',2001,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'585',2001,75600,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'586',2001,75000,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'587',2001,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'588',2001,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'589',2001,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_559 b/src/main/res-current/raw/current_gtfs_schedule_stop_559
index e301a5e36..067510b5f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_559
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_559
@@ -1,7 +1,7 @@
-'576',1401,82100,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
-'577',1401,64600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'578',1401,64600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'579',1401,64600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'580',1401,64600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'581',1401,75900,,'',0,17500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
-'582',1401,64600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'583',1401,64600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'584',1401,64600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'585',1401,75900,,'',0,17500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
+'586',1401,82100,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
+'587',1401,64600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'588',1401,64600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'589',1401,64600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_56 b/src/main/res-current/raw/current_gtfs_schedule_stop_56
index 80ec72408..3dcfbf2c7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_56
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_56
@@ -1,14 +1,14 @@
-'576',201,74400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',201,60300,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'578',201,60300,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'579',201,60300,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'580',201,60300,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'581',201,80900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
-'582',201,60300,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'576',801,64700,,'',0,27400,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
-'577',801,62700,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'578',801,62700,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'579',801,62700,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'580',801,62700,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'581',801,64700,,'',0,10200,,'',0,8000,,'',0,7600,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'582',801,62700,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'583',201,60300,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'584',201,60300,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'585',201,80900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
+'586',201,74400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',201,60300,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'588',201,60300,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'589',201,60300,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'583',801,62700,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'584',801,62700,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'585',801,64700,,'',0,10200,,'',0,8000,,'',0,7600,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
+'586',801,64700,,'',0,27400,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
+'587',801,62700,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'588',801,62700,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'589',801,62700,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_560 b/src/main/res-current/raw/current_gtfs_schedule_stop_560
index 9c5521329..df15d1e61 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_560
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_560
@@ -1,7 +1,7 @@
-'576',2000,82900,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,14800,,'',0,5900,,'',0,10000,,'',0,14300,,'',0,10100,,'',0
-'577',2000,63800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
-'578',2000,63800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
-'579',2000,63800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
-'580',2000,63800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
-'581',2000,70000,,'',0,10300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14800,,'',0,10000,,'',0
-'582',2000,63800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
+'583',2000,63800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
+'584',2000,63800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
+'585',2000,70000,,'',0,10300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14800,,'',0,10000,,'',0
+'586',2000,82900,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,14800,,'',0,5900,,'',0,10000,,'',0,14300,,'',0,10100,,'',0
+'587',2000,63800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
+'588',2000,63800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
+'589',2000,63800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_561 b/src/main/res-current/raw/current_gtfs_schedule_stop_561
index 09414a663..d04092b91 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_561
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_561
@@ -1,7 +1,7 @@
-'576',1601,91100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
-'577',1601,61100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1601,61100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1601,61100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1601,61100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1601,81200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
-'582',1601,61100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1601,61100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1601,61100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1601,81200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
+'586',1601,91100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
+'587',1601,61100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1601,61100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1601,61100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_562 b/src/main/res-current/raw/current_gtfs_schedule_stop_562
index c24a52dc9..d35f2eb69 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_562
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_562
@@ -1,7 +1,7 @@
-'576',2500,104400,,'',0,26800,,'',0,29100,,'',0,22900,,'',0
-'577',2500,73200,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'578',2500,73200,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'579',2500,73200,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'580',2500,73200,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'581',2500,100000,,'',0,13200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
-'582',2500,73200,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'583',2500,73200,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'584',2500,73200,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'585',2500,100000,,'',0,13200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
+'586',2500,104400,,'',0,26800,,'',0,29100,,'',0,22900,,'',0
+'587',2500,73200,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'588',2500,73200,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'589',2500,73200,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_563 b/src/main/res-current/raw/current_gtfs_schedule_stop_563
index 2c364b34f..4a60e6d26 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_563
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_563
@@ -1,7 +1,7 @@
-'576',2501,100400,,'',0,22800,,'',0,29500,,'',0,22900,,'',0
-'577',2501,74600,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'578',2501,74600,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'579',2501,74600,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'580',2501,74600,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'581',2501,91900,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,40300,,'',0
-'582',2501,74600,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'583',2501,74600,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'584',2501,74600,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'585',2501,91900,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,40300,,'',0
+'586',2501,100400,,'',0,22800,,'',0,29500,,'',0,22900,,'',0
+'587',2501,74600,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'588',2501,74600,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'589',2501,74600,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_564 b/src/main/res-current/raw/current_gtfs_schedule_stop_564
index b5b0ca4ae..82c06d664 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_564
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_564
@@ -1,7 +1,7 @@
-'576',1401,82600,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
-'577',1401,65100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,34900,,'',0,32100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'578',1401,65100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,34900,,'',0,32100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'579',1401,65100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,34900,,'',0,32100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'580',1401,65100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,34900,,'',0,32100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'581',1401,80400,,'',0,13500,,'',0,19700,,'',0,30000,,'',0,26500,,'',0,13500,,'',0,18700,,'',0
-'582',1401,65100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,34900,,'',0,32100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'583',1401,65100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,34900,,'',0,32100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'584',1401,65100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,34900,,'',0,32100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'585',1401,80400,,'',0,13500,,'',0,19700,,'',0,30000,,'',0,26500,,'',0,13500,,'',0,18700,,'',0
+'586',1401,82600,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
+'587',1401,65100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,34900,,'',0,32100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'588',1401,65100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,34900,,'',0,32100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'589',1401,65100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,34900,,'',0,32100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_565 b/src/main/res-current/raw/current_gtfs_schedule_stop_565
index e8cb289fe..4908eb643 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_565
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_565
@@ -1,7 +1,7 @@
-'576',1401,82300,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
-'577',1401,64800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'578',1401,64800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'579',1401,64800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'580',1401,64800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'581',1401,80100,,'',0,13500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
-'582',1401,64800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'583',1401,64800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'584',1401,64800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'585',1401,80100,,'',0,13500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
+'586',1401,82300,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
+'587',1401,64800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'588',1401,64800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'589',1401,64800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_566 b/src/main/res-current/raw/current_gtfs_schedule_stop_566
index 925888792..ce26f1f43 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_566
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_566
@@ -1,7 +1,7 @@
-'576',1601,91200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
-'577',1601,61200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1601,61200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1601,61200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1601,61200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1601,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
-'582',1601,61200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1601,61200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1601,61200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1601,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
+'586',1601,91200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
+'587',1601,61200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1601,61200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1601,61200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_567 b/src/main/res-current/raw/current_gtfs_schedule_stop_567
index 744538560..7c0ecb719 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_567
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_567
@@ -1,14 +1,14 @@
-'576',2401,81000,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
-'577',2401,54900,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'578',2401,54900,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'579',2401,54900,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'580',2401,54900,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'581',2401,71800,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'582',2401,54900,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'576',139000,105700,,'',0,26800,,'',0,29100,,'',0,30300,,'',0
-'577',139000,55400,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'578',139000,55400,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'579',139000,55400,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'580',139000,55400,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'581',139000,73100,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
-'582',139000,55400,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'583',2401,54900,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'584',2401,54900,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'585',2401,71800,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'586',2401,81000,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
+'587',2401,54900,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'588',2401,54900,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'589',2401,54900,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'583',139000,55400,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'584',139000,55400,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'585',139000,73100,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
+'586',139000,105700,,'',0,26800,,'',0,29100,,'',0,30300,,'',0
+'587',139000,55400,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'588',139000,55400,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'589',139000,55400,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_568 b/src/main/res-current/raw/current_gtfs_schedule_stop_568
index 77bca9537..451d59c13 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_568
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_568
@@ -1,14 +1,14 @@
-'576',2400,73800,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,14800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
-'577',2400,61900,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'578',2400,61900,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'579',2400,61900,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'580',2400,61900,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'581',2400,83200,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,14200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'582',2400,61900,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'576',139001,72500,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
-'577',139001,62000,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'578',139001,62000,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'579',139001,62000,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'580',139001,62000,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'581',139001,74400,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,7000,,'',0,13500,,'',0
-'582',139001,62000,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'583',2400,61900,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'584',2400,61900,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'585',2400,83200,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,14200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'586',2400,73800,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,14800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
+'587',2400,61900,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'588',2400,61900,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'589',2400,61900,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'583',139001,62000,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'584',139001,62000,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'585',139001,74400,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,7000,,'',0,13500,,'',0
+'586',139001,72500,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
+'587',139001,62000,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'588',139001,62000,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'589',139001,62000,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_569 b/src/main/res-current/raw/current_gtfs_schedule_stop_569
index 69a6411ae..8a339a9b2 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_569
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_569
@@ -1,6 +1,6 @@
-'577',2301,74500,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
-'578',2301,74500,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
-'579',2301,74500,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
-'580',2301,74500,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
-'581',2301,100800,0,'Old Vernon Rd',0
-'582',2301,74500,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'583',2301,74500,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'584',2301,74500,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'585',2301,100800,0,'Old Vernon Rd',0
+'587',2301,74500,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'588',2301,74500,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'589',2301,74500,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_57 b/src/main/res-current/raw/current_gtfs_schedule_stop_57
index 611db0868..af9515997 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_57
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_57
@@ -1,7 +1,7 @@
-'576',1001,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'577',1001,63300,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'578',1001,63300,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'579',1001,63300,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'580',1001,63300,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'581',1001,81200,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',1001,63300,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'583',1001,63300,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'584',1001,63300,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'585',1001,81200,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',1001,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'587',1001,63300,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'588',1001,63300,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'589',1001,63300,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_570 b/src/main/res-current/raw/current_gtfs_schedule_stop_570
index 2f5d0f29b..879c782c4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_570
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_570
@@ -1,6 +1,6 @@
-'577',2300,144000,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
-'578',2300,144000,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
-'579',2300,144000,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
-'580',2300,144000,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
-'581',2300,142200,0,'Old Vernon Rd',0
-'582',2300,144000,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'583',2300,144000,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'584',2300,144000,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'585',2300,142200,0,'Old Vernon Rd',0
+'587',2300,144000,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'588',2300,144000,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'589',2300,144000,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_571 b/src/main/res-current/raw/current_gtfs_schedule_stop_571
index 8bcb72377..db490e3b5 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_571
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_571
@@ -1,7 +1,7 @@
-'576',1401,82400,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
-'577',1401,64900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'578',1401,64900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'579',1401,64900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'580',1401,64900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'581',1401,80200,,'',0,13500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
-'582',1401,64900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'583',1401,64900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'584',1401,64900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'585',1401,80200,,'',0,13500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
+'586',1401,82400,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
+'587',1401,64900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'588',1401,64900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'589',1401,64900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_572 b/src/main/res-current/raw/current_gtfs_schedule_stop_572
index fba0c3c38..5b7b765bc 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_572
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_572
@@ -1,14 +1,14 @@
-'576',2401,80900,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
-'577',2401,54800,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'578',2401,54800,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'579',2401,54800,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'580',2401,54800,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'581',2401,71700,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'582',2401,54800,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'576',139000,105700,,'',0,26800,,'',0,29100,,'',0,30300,,'',0
-'577',139000,55400,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'578',139000,55400,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'579',139000,55400,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'580',139000,55400,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'581',139000,73100,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
-'582',139000,55400,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'583',2401,54800,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'584',2401,54800,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'585',2401,71700,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'586',2401,80900,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
+'587',2401,54800,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'588',2401,54800,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'589',2401,54800,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'583',139000,55400,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'584',139000,55400,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'585',139000,73100,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
+'586',139000,105700,,'',0,26800,,'',0,29100,,'',0,30300,,'',0
+'587',139000,55400,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'588',139000,55400,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'589',139000,55400,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_573 b/src/main/res-current/raw/current_gtfs_schedule_stop_573
index d830ab231..f108ec38a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_573
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_573
@@ -1,14 +1,14 @@
-'576',2400,73800,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,14800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
-'577',2400,62000,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'578',2400,62000,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'579',2400,62000,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'580',2400,62000,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'581',2400,83300,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,14200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'582',2400,62000,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'576',139001,72600,,'',0,7400,,'',0,32400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
-'577',139001,62100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'578',139001,62100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'579',139001,62100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'580',139001,62100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'581',139001,74500,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,7000,,'',0,13500,,'',0
-'582',139001,62100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'583',2400,62000,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'584',2400,62000,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'585',2400,83300,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,14200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'586',2400,73800,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,14800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
+'587',2400,62000,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'588',2400,62000,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'589',2400,62000,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'583',139001,62100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'584',139001,62100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'585',139001,74500,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,7000,,'',0,13500,,'',0
+'586',139001,72600,,'',0,7400,,'',0,32400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
+'587',139001,62100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'588',139001,62100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'589',139001,62100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_574 b/src/main/res-current/raw/current_gtfs_schedule_stop_574
index d37c647a6..8ebf95139 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_574
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_574
@@ -1,7 +1,7 @@
-'576',2000,82900,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,14800,,'',0,5900,,'',0,10000,,'',0,14300,,'',0,10100,,'',0
-'577',2000,63800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'578',2000,63800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'579',2000,63800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'580',2000,63800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'581',2000,70000,,'',0,10300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14900,,'',0,10000,,'',0
-'582',2000,63800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'583',2000,63800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'584',2000,63800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'585',2000,70000,,'',0,10300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14900,,'',0,10000,,'',0
+'586',2000,82900,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,14800,,'',0,5900,,'',0,10000,,'',0,14300,,'',0,10100,,'',0
+'587',2000,63800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'588',2000,63800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'589',2000,63800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_575 b/src/main/res-current/raw/current_gtfs_schedule_stop_575
index 390647ccf..42f5ee7e7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_575
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_575
@@ -1,7 +1,7 @@
-'576',1400,82700,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
-'577',1400,65200,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
-'578',1400,65200,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
-'579',1400,65200,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
-'580',1400,65200,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
-'581',1400,80500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
-'582',1400,65200,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'583',1400,65200,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'584',1400,65200,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'585',1400,80500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
+'586',1400,82700,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
+'587',1400,65200,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'588',1400,65200,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'589',1400,65200,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_576 b/src/main/res-current/raw/current_gtfs_schedule_stop_576
index ee7553776..8d0c78d0d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_576
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_576
@@ -1,14 +1,14 @@
-'576',2400,73900,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,14800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
-'577',2400,62000,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'578',2400,62000,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'579',2400,62000,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'580',2400,62000,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'581',2400,83300,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,14200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'582',2400,62000,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'576',139001,72600,,'',0,7400,,'',0,32400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
-'577',139001,62100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'578',139001,62100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'579',139001,62100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'580',139001,62100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'581',139001,74500,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,7000,,'',0,13500,,'',0
-'582',139001,62100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'583',2400,62000,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'584',2400,62000,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'585',2400,83300,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,14200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'586',2400,73900,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,14800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
+'587',2400,62000,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'588',2400,62000,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'589',2400,62000,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'583',139001,62100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'584',139001,62100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'585',139001,74500,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,7000,,'',0,13500,,'',0
+'586',139001,72600,,'',0,7400,,'',0,32400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
+'587',139001,62100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'588',139001,62100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'589',139001,62100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_577 b/src/main/res-current/raw/current_gtfs_schedule_stop_577
index d3bf7a181..3caeb64a8 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_577
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_577
@@ -1,14 +1,14 @@
-'576',1400,82700,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
-'576',1401,82700,4,'',0,22400,4,'',0,18500,4,'',0,18500,4,'',0,22500,4,'',0,26500,4,'',0
-'577',1400,65200,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
-'577',1401,65200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,34900,4,'',0,32100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,21700,4,'',0
-'578',1400,65200,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
-'578',1401,65200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,34900,4,'',0,32100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,21700,4,'',0
-'579',1400,65200,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
-'579',1401,65200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,34900,4,'',0,32100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,21700,4,'',0
-'580',1400,65200,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
-'580',1401,65200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,34900,4,'',0,32100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,21700,4,'',0
-'581',1400,80500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
-'581',1401,80500,4,'',0,13500,4,'',0,19700,4,'',0,30000,4,'',0,26500,4,'',0,13500,4,'',0,18700,4,'',0
-'582',1400,65200,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
-'582',1401,65200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,34900,4,'',0,32100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,21700,4,'',0
+'583',1400,65200,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'583',1401,65200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,34900,4,'',0,32100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,21700,4,'',0
+'584',1400,65200,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'584',1401,65200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,34900,4,'',0,32100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,21700,4,'',0
+'585',1400,80500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
+'585',1401,80500,4,'',0,13500,4,'',0,19700,4,'',0,30000,4,'',0,26500,4,'',0,13500,4,'',0,18700,4,'',0
+'586',1400,82700,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
+'586',1401,82700,4,'',0,22400,4,'',0,18500,4,'',0,18500,4,'',0,22500,4,'',0,26500,4,'',0
+'587',1400,65200,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'587',1401,65200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,34900,4,'',0,32100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,21700,4,'',0
+'588',1400,65200,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'588',1401,65200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,34900,4,'',0,32100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,21700,4,'',0
+'589',1400,65200,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'589',1401,65200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,34900,4,'',0,32100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,21700,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_578 b/src/main/res-current/raw/current_gtfs_schedule_stop_578
index 159854961..4aeda14e3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_578
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_578
@@ -1,6 +1,6 @@
-'577',2300,144100,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
-'578',2300,144100,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
-'579',2300,144100,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
-'580',2300,144100,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
-'581',2300,142200,0,'Old Vernon Rd',0
-'582',2300,144100,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'583',2300,144100,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'584',2300,144100,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'585',2300,142200,0,'Old Vernon Rd',0
+'587',2300,144100,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'588',2300,144100,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'589',2300,144100,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_579 b/src/main/res-current/raw/current_gtfs_schedule_stop_579
index 925888792..ce26f1f43 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_579
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_579
@@ -1,7 +1,7 @@
-'576',1601,91200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
-'577',1601,61200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1601,61200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1601,61200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1601,61200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1601,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
-'582',1601,61200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1601,61200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1601,61200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1601,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
+'586',1601,91200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
+'587',1601,61200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1601,61200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1601,61200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_58 b/src/main/res-current/raw/current_gtfs_schedule_stop_58
index e1e38d91f..265fdd067 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_58
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_58
@@ -1,7 +1,7 @@
-'576',901,115100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',901,90600,,'',0,22000,,'',0,38000,,'',0
-'578',901,90600,,'',0,22000,,'',0,38000,,'',0
-'579',901,90600,,'',0,22000,,'',0,38000,,'',0
-'580',901,90600,,'',0,22000,,'',0,38000,,'',0
-'581',901,115100,,'',0,8500,,'',0,29000,,'',0,8500,,'',0
-'582',901,90600,,'',0,22000,,'',0,38000,,'',0
+'583',901,90600,,'',0,22000,,'',0,38000,,'',0
+'584',901,90600,,'',0,22000,,'',0,38000,,'',0
+'585',901,115100,,'',0,8500,,'',0,29000,,'',0,8500,,'',0
+'586',901,115100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',901,90600,,'',0,22000,,'',0,38000,,'',0
+'588',901,90600,,'',0,22000,,'',0,38000,,'',0
+'589',901,90600,,'',0,22000,,'',0,38000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_580 b/src/main/res-current/raw/current_gtfs_schedule_stop_580
index 156b97794..6d6b5b104 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_580
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_580
@@ -1,14 +1,14 @@
-'576',2401,80800,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
-'577',2401,54700,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'578',2401,54700,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'579',2401,54700,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'580',2401,54700,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'581',2401,71600,,'',0,10000,,'',0,14300,,'',0,15000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'582',2401,54700,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'576',139000,105600,,'',0,26800,,'',0,29100,,'',0,30300,,'',0
-'577',139000,55300,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'578',139000,55300,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'579',139000,55300,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'580',139000,55300,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'581',139000,73000,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
-'582',139000,55300,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'583',2401,54700,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'584',2401,54700,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'585',2401,71600,,'',0,10000,,'',0,14300,,'',0,15000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'586',2401,80800,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
+'587',2401,54700,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'588',2401,54700,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'589',2401,54700,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'583',139000,55300,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'584',139000,55300,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'585',139000,73000,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
+'586',139000,105600,,'',0,26800,,'',0,29100,,'',0,30300,,'',0
+'587',139000,55300,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'588',139000,55300,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'589',139000,55300,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_581 b/src/main/res-current/raw/current_gtfs_schedule_stop_581
index ac885bb9f..942bacf5d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_581
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_581
@@ -1,6 +1,6 @@
-'577',2301,74400,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
-'578',2301,74400,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
-'579',2301,74400,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
-'580',2301,74400,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
-'581',2301,100800,0,'Old Vernon Rd',0
-'582',2301,74400,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'583',2301,74400,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'584',2301,74400,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'585',2301,100800,0,'Old Vernon Rd',0
+'587',2301,74400,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'588',2301,74400,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'589',2301,74400,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_582 b/src/main/res-current/raw/current_gtfs_schedule_stop_582
index 8df73f070..160365943 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_582
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_582
@@ -1,21 +1,21 @@
-'576',2400,73900,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,14800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
-'577',2400,62100,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'578',2400,62100,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'579',2400,62100,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'580',2400,62100,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'581',2400,83400,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'582',2400,62100,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'576',2500,104600,,'',0,26800,,'',0,29100,,'',0,22900,,'',0
-'577',2500,73400,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'578',2500,73400,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'579',2500,73400,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'580',2500,73400,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'581',2500,100200,,'',0,13200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
-'582',2500,73400,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'576',139001,72700,,'',0,7400,,'',0,32400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
-'577',139001,62200,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'578',139001,62200,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'579',139001,62200,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'580',139001,62200,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'581',139001,74600,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,7000,,'',0,13500,,'',0
-'582',139001,62200,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'583',2400,62100,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'584',2400,62100,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'585',2400,83400,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'586',2400,73900,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,14800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
+'587',2400,62100,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'588',2400,62100,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'589',2400,62100,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'583',2500,73400,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'584',2500,73400,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'585',2500,100200,,'',0,13200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
+'586',2500,104600,,'',0,26800,,'',0,29100,,'',0,22900,,'',0
+'587',2500,73400,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'588',2500,73400,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'589',2500,73400,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'583',139001,62200,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'584',139001,62200,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'585',139001,74600,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,7000,,'',0,13500,,'',0
+'586',139001,72700,,'',0,7400,,'',0,32400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
+'587',139001,62200,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'588',139001,62200,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'589',139001,62200,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_583 b/src/main/res-current/raw/current_gtfs_schedule_stop_583
index 2227391f6..8367f8731 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_583
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_583
@@ -1,7 +1,7 @@
-'576',2000,83000,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,14800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'577',2000,63900,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'578',2000,63900,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'579',2000,63900,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'580',2000,63900,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'581',2000,70100,,'',0,10300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14900,,'',0,10000,,'',0
-'582',2000,63900,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'583',2000,63900,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'584',2000,63900,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'585',2000,70100,,'',0,10300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14900,,'',0,10000,,'',0
+'586',2000,83000,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,14800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'587',2000,63900,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'588',2000,63900,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'589',2000,63900,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_584 b/src/main/res-current/raw/current_gtfs_schedule_stop_584
index 90b1e910a..038c9a7eb 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_584
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_584
@@ -1,6 +1,6 @@
-'577',2300,55600,,'',0,7500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
-'578',2300,55600,,'',0,7500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
-'579',2300,55600,,'',0,7500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
-'580',2300,55600,,'',0,7500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
-'581',2300,70500,,'',0,10000,,'',0,9800,,'',0,10100,,'',0,55100,,'',0,9700,,'',0,10100,,'',0,29800,,'',0
-'582',2300,55600,,'',0,7500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
+'583',2300,55600,,'',0,7500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
+'584',2300,55600,,'',0,7500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
+'585',2300,70500,,'',0,10000,,'',0,9800,,'',0,10100,,'',0,55100,,'',0,9700,,'',0,10100,,'',0,29800,,'',0
+'587',2300,55600,,'',0,7500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
+'588',2300,55600,,'',0,7500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
+'589',2300,55600,,'',0,7500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_585 b/src/main/res-current/raw/current_gtfs_schedule_stop_585
index a5692fac3..68c1fb29b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_585
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_585
@@ -1,5 +1,5 @@
-'577',2601,72800,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'578',2601,72800,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'579',2601,72800,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'580',2601,72800,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'582',2601,72800,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'583',2601,72800,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'584',2601,72800,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'587',2601,72800,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'588',2601,72800,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'589',2601,72800,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_586 b/src/main/res-current/raw/current_gtfs_schedule_stop_586
index e2e32227f..cfaaede65 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_586
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_586
@@ -1,6 +1,6 @@
-'577',2301,55700,,'',0,7700,,'',0,7600,,'',0,4900,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'578',2301,55700,,'',0,7700,,'',0,7600,,'',0,4900,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'579',2301,55700,,'',0,7700,,'',0,7600,,'',0,4900,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'580',2301,55700,,'',0,7700,,'',0,7600,,'',0,4900,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'581',2301,94200,,'',0,10100,,'',0,8900,,'',0,22100,,'',0,24700,,'',0,3400,,'',0,9700,,'',0,10000,,'',0,19400,,'',0
-'582',2301,55700,,'',0,7700,,'',0,7600,,'',0,4900,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'583',2301,55700,,'',0,7700,,'',0,7600,,'',0,4900,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'584',2301,55700,,'',0,7700,,'',0,7600,,'',0,4900,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'585',2301,94200,,'',0,10100,,'',0,8900,,'',0,22100,,'',0,24700,,'',0,3400,,'',0,9700,,'',0,10000,,'',0,19400,,'',0
+'587',2301,55700,,'',0,7700,,'',0,7600,,'',0,4900,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'588',2301,55700,,'',0,7700,,'',0,7600,,'',0,4900,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'589',2301,55700,,'',0,7700,,'',0,7600,,'',0,4900,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_587 b/src/main/res-current/raw/current_gtfs_schedule_stop_587
index dcc3c5d38..3e54af24a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_587
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_587
@@ -1,21 +1,21 @@
-'576',2400,74000,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,14800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
-'577',2400,62100,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'578',2400,62100,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'579',2400,62100,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'580',2400,62100,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'581',2400,83400,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'582',2400,62100,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'576',2500,104600,,'',0,26800,,'',0,29100,,'',0,22900,,'',0
-'577',2500,73400,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'578',2500,73400,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'579',2500,73400,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'580',2500,73400,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'581',2500,100200,,'',0,13200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
-'582',2500,73400,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'576',139001,72700,,'',0,7400,,'',0,32400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
-'577',139001,62200,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'578',139001,62200,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'579',139001,62200,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'580',139001,62200,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'581',139001,74600,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,7000,,'',0,13500,,'',0
-'582',139001,62200,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'583',2400,62100,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'584',2400,62100,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'585',2400,83400,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'586',2400,74000,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,14800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
+'587',2400,62100,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'588',2400,62100,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'589',2400,62100,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'583',2500,73400,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'584',2500,73400,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'585',2500,100200,,'',0,13200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
+'586',2500,104600,,'',0,26800,,'',0,29100,,'',0,22900,,'',0
+'587',2500,73400,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'588',2500,73400,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'589',2500,73400,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'583',139001,62200,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'584',139001,62200,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'585',139001,74600,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,7000,,'',0,13500,,'',0
+'586',139001,72700,,'',0,7400,,'',0,32400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
+'587',139001,62200,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'588',139001,62200,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'589',139001,62200,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_588 b/src/main/res-current/raw/current_gtfs_schedule_stop_588
index 786d63bee..c6f91d1d9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_588
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_588
@@ -1,6 +1,6 @@
-'577',2300,144100,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
-'578',2300,144100,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
-'579',2300,144100,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
-'580',2300,144100,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
-'581',2300,142300,0,'Old Vernon Rd',0
-'582',2300,144100,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'583',2300,144100,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'584',2300,144100,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'585',2300,142300,0,'Old Vernon Rd',0
+'587',2300,144100,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'588',2300,144100,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'589',2300,144100,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_589 b/src/main/res-current/raw/current_gtfs_schedule_stop_589
index aa4bc5d5a..786613594 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_589
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_589
@@ -1,6 +1,6 @@
-'577',2301,74400,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
-'578',2301,74400,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
-'579',2301,74400,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
-'580',2301,74400,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
-'581',2301,100700,0,'Old Vernon Rd',0
-'582',2301,74400,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'583',2301,74400,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'584',2301,74400,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'585',2301,100700,0,'Old Vernon Rd',0
+'587',2301,74400,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'588',2301,74400,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'589',2301,74400,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_59 b/src/main/res-current/raw/current_gtfs_schedule_stop_59
index f96fae20a..b818775ee 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_59
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_59
@@ -1,7 +1,7 @@
-'576',1100,81900,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9400,,'',0,10000,,'',0,10000,,'',0
-'577',1100,70100,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'578',1100,70100,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'579',1100,70100,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'580',1100,70100,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'581',1100,80600,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
-'582',1100,70100,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'583',1100,70100,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'584',1100,70100,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'585',1100,80600,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
+'586',1100,81900,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9400,,'',0,10000,,'',0,10000,,'',0
+'587',1100,70100,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'588',1100,70100,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'589',1100,70100,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_590 b/src/main/res-current/raw/current_gtfs_schedule_stop_590
index 6de95e48a..59bb59dc7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_590
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_590
@@ -1,7 +1,7 @@
-'576',2000,83300,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,14800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'577',2000,64200,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,14200,,'',0,10600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
-'578',2000,64200,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,14200,,'',0,10600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
-'579',2000,64200,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,14200,,'',0,10600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
-'580',2000,64200,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,14200,,'',0,10600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
-'581',2000,70400,,'',0,10300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,15000,,'',0,10800,,'',0,10000,,'',0
-'582',2000,64200,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,14200,,'',0,10600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
+'583',2000,64200,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,14200,,'',0,10600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
+'584',2000,64200,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,14200,,'',0,10600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
+'585',2000,70400,,'',0,10300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,15000,,'',0,10800,,'',0,10000,,'',0
+'586',2000,83300,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,14800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'587',2000,64200,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,14200,,'',0,10600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
+'588',2000,64200,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,14200,,'',0,10600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
+'589',2000,64200,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,14200,,'',0,10600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_591 b/src/main/res-current/raw/current_gtfs_schedule_stop_591
index 09a6731a1..e7c30519c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_591
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_591
@@ -1,7 +1,7 @@
-'576',2001,74700,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'577',2001,62800,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
-'578',2001,62800,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
-'579',2001,62800,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
-'580',2001,62800,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
-'581',2001,75300,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'582',2001,62800,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
+'583',2001,62800,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
+'584',2001,62800,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
+'585',2001,75300,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'586',2001,74700,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'587',2001,62800,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
+'588',2001,62800,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
+'589',2001,62800,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_592 b/src/main/res-current/raw/current_gtfs_schedule_stop_592
index 09a6731a1..e7c30519c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_592
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_592
@@ -1,7 +1,7 @@
-'576',2001,74700,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'577',2001,62800,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
-'578',2001,62800,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
-'579',2001,62800,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
-'580',2001,62800,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
-'581',2001,75300,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'582',2001,62800,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
+'583',2001,62800,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
+'584',2001,62800,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
+'585',2001,75300,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'586',2001,74700,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'587',2001,62800,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
+'588',2001,62800,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
+'589',2001,62800,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_593 b/src/main/res-current/raw/current_gtfs_schedule_stop_593
index e2a000e80..e1b6faf2e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_593
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_593
@@ -1,7 +1,7 @@
-'576',2000,83200,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,14800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'577',2000,64100,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
-'578',2000,64100,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
-'579',2000,64100,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
-'580',2000,64100,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
-'581',2000,70300,,'',0,10300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14800,,'',0,10000,,'',0
-'582',2000,64100,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
+'583',2000,64100,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
+'584',2000,64100,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
+'585',2000,70300,,'',0,10300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14800,,'',0,10000,,'',0
+'586',2000,83200,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,14800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'587',2000,64100,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
+'588',2000,64100,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
+'589',2000,64100,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_594 b/src/main/res-current/raw/current_gtfs_schedule_stop_594
index 4b219ffcf..a77cea22e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_594
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_594
@@ -1,21 +1,21 @@
-'576',2401,80700,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
-'577',2401,54600,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,11100,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'578',2401,54600,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,11100,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'579',2401,54600,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,11100,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'580',2401,54600,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,11100,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'581',2401,71500,,'',0,10000,,'',0,14300,,'',0,15000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,12100,,'',0,6500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'582',2401,54600,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,11100,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'576',2501,100200,,'',0,22800,,'',0,29500,,'',0,22900,,'',0
-'577',2501,74400,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'578',2501,74400,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'579',2501,74400,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'580',2501,74400,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'581',2501,91700,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,40300,,'',0
-'582',2501,74400,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'576',139000,105500,,'',0,26800,,'',0,29100,,'',0,30300,,'',0
-'577',139000,55200,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'578',139000,55200,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'579',139000,55200,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'580',139000,55200,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'581',139000,72900,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
-'582',139000,55200,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'583',2401,54600,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,11100,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'584',2401,54600,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,11100,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'585',2401,71500,,'',0,10000,,'',0,14300,,'',0,15000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,12100,,'',0,6500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'586',2401,80700,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
+'587',2401,54600,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,11100,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'588',2401,54600,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,11100,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'589',2401,54600,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,11100,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'583',2501,74400,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'584',2501,74400,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'585',2501,91700,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,40300,,'',0
+'586',2501,100200,,'',0,22800,,'',0,29500,,'',0,22900,,'',0
+'587',2501,74400,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'588',2501,74400,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'589',2501,74400,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'583',139000,55200,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'584',139000,55200,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'585',139000,72900,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
+'586',139000,105500,,'',0,26800,,'',0,29100,,'',0,30300,,'',0
+'587',139000,55200,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'588',139000,55200,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'589',139000,55200,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_595 b/src/main/res-current/raw/current_gtfs_schedule_stop_595
index a5692fac3..68c1fb29b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_595
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_595
@@ -1,5 +1,5 @@
-'577',2601,72800,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'578',2601,72800,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'579',2601,72800,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'580',2601,72800,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'582',2601,72800,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'583',2601,72800,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'584',2601,72800,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'587',2601,72800,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'588',2601,72800,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'589',2601,72800,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_596 b/src/main/res-current/raw/current_gtfs_schedule_stop_596
index 11fe7fe8b..a5f8c0d1a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_596
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_596
@@ -1,7 +1,7 @@
-'576',2001,74800,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'577',2001,62900,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
-'578',2001,62900,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
-'579',2001,62900,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
-'580',2001,62900,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
-'581',2001,75400,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'582',2001,62900,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
+'583',2001,62900,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
+'584',2001,62900,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
+'585',2001,75400,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'586',2001,74800,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'587',2001,62900,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
+'588',2001,62900,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
+'589',2001,62900,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_598 b/src/main/res-current/raw/current_gtfs_schedule_stop_598
index 597141041..19c6c0747 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_598
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_598
@@ -1,5 +1,5 @@
-'577',2601,72700,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'578',2601,72700,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'579',2601,72700,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'580',2601,72700,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'582',2601,72700,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'583',2601,72700,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'584',2601,72700,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'587',2601,72700,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'588',2601,72700,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'589',2601,72700,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_599 b/src/main/res-current/raw/current_gtfs_schedule_stop_599
index 9c7b281e4..f09d5f080 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_599
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_599
@@ -1,7 +1,7 @@
-'576',2000,83100,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,14800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'577',2000,64000,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
-'578',2000,64000,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
-'579',2000,64000,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
-'580',2000,64000,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
-'581',2000,70200,,'',0,10300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14800,,'',0,10000,,'',0
-'582',2000,64000,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
+'583',2000,64000,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
+'584',2000,64000,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
+'585',2000,70200,,'',0,10300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14800,,'',0,10000,,'',0
+'586',2000,83100,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,14800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'587',2000,64000,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
+'588',2000,64000,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
+'589',2000,64000,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_6 b/src/main/res-current/raw/current_gtfs_schedule_stop_6
index dae24b176..afa6d3703 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_6
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_6
@@ -1,7 +1,7 @@
-'576',1801,83100,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11400,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0
-'577',1801,64700,4,'',0,7500,4,'',0,2800,4,'',0,6600,4,'',0,2600,4,'',0,6900,4,'',0,2800,4,'',0,6700,4,'',0,4000,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,8100,4,'',0,4000,4,'',0,6800,4,'',0,2800,4,'',0,6800,4,'',0,2800,4,'',0,6900,4,'',0,2700,4,'',0,7000,4,'',0,2800,4,'',0,9500,4,'',0,7700,4,'',0,4000,4,'',0,16000,4,'',0,10900,4,'',0
-'578',1801,64700,4,'',0,7500,4,'',0,2800,4,'',0,6600,4,'',0,2600,4,'',0,6900,4,'',0,2800,4,'',0,6700,4,'',0,4000,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,8100,4,'',0,4000,4,'',0,6800,4,'',0,2800,4,'',0,6800,4,'',0,2800,4,'',0,6900,4,'',0,2700,4,'',0,7000,4,'',0,2800,4,'',0,9500,4,'',0,7700,4,'',0,4000,4,'',0,16000,4,'',0,10900,4,'',0
-'579',1801,64700,4,'',0,7500,4,'',0,2800,4,'',0,6600,4,'',0,2600,4,'',0,6900,4,'',0,2800,4,'',0,6700,4,'',0,4000,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,8100,4,'',0,4000,4,'',0,6800,4,'',0,2800,4,'',0,6800,4,'',0,2800,4,'',0,6900,4,'',0,2700,4,'',0,7000,4,'',0,2800,4,'',0,9500,4,'',0,7700,4,'',0,4000,4,'',0,16000,4,'',0,10900,4,'',0
-'580',1801,64700,4,'',0,7500,4,'',0,2800,4,'',0,6600,4,'',0,2600,4,'',0,6900,4,'',0,2800,4,'',0,6700,4,'',0,4000,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,8100,4,'',0,4000,4,'',0,6800,4,'',0,2800,4,'',0,6800,4,'',0,2800,4,'',0,6900,4,'',0,2700,4,'',0,7000,4,'',0,2800,4,'',0,9500,4,'',0,7700,4,'',0,4000,4,'',0,16000,4,'',0,10900,4,'',0
-'581',1801,80100,4,'',0,10300,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,12600,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0
-'582',1801,64700,4,'',0,7500,4,'',0,2800,4,'',0,6600,4,'',0,2600,4,'',0,6900,4,'',0,2800,4,'',0,6700,4,'',0,4000,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,8100,4,'',0,4000,4,'',0,6800,4,'',0,2800,4,'',0,6800,4,'',0,2800,4,'',0,6900,4,'',0,2700,4,'',0,7000,4,'',0,2800,4,'',0,9500,4,'',0,7700,4,'',0,4000,4,'',0,16000,4,'',0,10900,4,'',0
+'583',1801,64700,4,'',0,7500,4,'',0,2800,4,'',0,6600,4,'',0,2600,4,'',0,6900,4,'',0,2800,4,'',0,6700,4,'',0,4000,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,8100,4,'',0,4000,4,'',0,6800,4,'',0,2800,4,'',0,6800,4,'',0,2800,4,'',0,6900,4,'',0,2700,4,'',0,7000,4,'',0,2800,4,'',0,9500,4,'',0,7700,4,'',0,4000,4,'',0,16000,4,'',0,10900,4,'',0
+'584',1801,64700,4,'',0,7500,4,'',0,2800,4,'',0,6600,4,'',0,2600,4,'',0,6900,4,'',0,2800,4,'',0,6700,4,'',0,4000,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,8100,4,'',0,4000,4,'',0,6800,4,'',0,2800,4,'',0,6800,4,'',0,2800,4,'',0,6900,4,'',0,2700,4,'',0,7000,4,'',0,2800,4,'',0,9500,4,'',0,7700,4,'',0,4000,4,'',0,16000,4,'',0,10900,4,'',0
+'585',1801,80100,4,'',0,10300,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,12600,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0
+'586',1801,83100,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11400,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0
+'587',1801,64700,4,'',0,7500,4,'',0,2800,4,'',0,6600,4,'',0,2600,4,'',0,6900,4,'',0,2800,4,'',0,6700,4,'',0,4000,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,8100,4,'',0,4000,4,'',0,6800,4,'',0,2800,4,'',0,6800,4,'',0,2800,4,'',0,6900,4,'',0,2700,4,'',0,7000,4,'',0,2800,4,'',0,9500,4,'',0,7700,4,'',0,4000,4,'',0,16000,4,'',0,10900,4,'',0
+'588',1801,64700,4,'',0,7500,4,'',0,2800,4,'',0,6600,4,'',0,2600,4,'',0,6900,4,'',0,2800,4,'',0,6700,4,'',0,4000,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,8100,4,'',0,4000,4,'',0,6800,4,'',0,2800,4,'',0,6800,4,'',0,2800,4,'',0,6900,4,'',0,2700,4,'',0,7000,4,'',0,2800,4,'',0,9500,4,'',0,7700,4,'',0,4000,4,'',0,16000,4,'',0,10900,4,'',0
+'589',1801,64700,4,'',0,7500,4,'',0,2800,4,'',0,6600,4,'',0,2600,4,'',0,6900,4,'',0,2800,4,'',0,6700,4,'',0,4000,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,8100,4,'',0,4000,4,'',0,6800,4,'',0,2800,4,'',0,6800,4,'',0,2800,4,'',0,6900,4,'',0,2700,4,'',0,7000,4,'',0,2800,4,'',0,9500,4,'',0,7700,4,'',0,4000,4,'',0,16000,4,'',0,10900,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_60 b/src/main/res-current/raw/current_gtfs_schedule_stop_60
index 0939bce8b..3d78c0d5c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_60
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_60
@@ -1,7 +1,7 @@
-'576',900,121600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',900,93300,,'',0,31200,,'',0,28800,,'',0
-'578',900,93300,,'',0,31200,,'',0,28800,,'',0
-'579',900,93300,,'',0,31200,,'',0,28800,,'',0
-'580',900,93300,,'',0,31200,,'',0,28800,,'',0
-'581',900,121600,,'',0,8500,,'',0,20500,,'',0,4500,,'',0
-'582',900,93300,,'',0,31200,,'',0,28800,,'',0
+'583',900,93300,,'',0,31200,,'',0,28800,,'',0
+'584',900,93300,,'',0,31200,,'',0,28800,,'',0
+'585',900,121600,,'',0,8500,,'',0,20500,,'',0,4500,,'',0
+'586',900,121600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',900,93300,,'',0,31200,,'',0,28800,,'',0
+'588',900,93300,,'',0,31200,,'',0,28800,,'',0
+'589',900,93300,,'',0,31200,,'',0,28800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_600 b/src/main/res-current/raw/current_gtfs_schedule_stop_600
index bf16d24fe..ee5914286 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_600
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_600
@@ -1,21 +1,21 @@
-'576',2400,74100,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,14800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
-'577',2400,62200,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'578',2400,62200,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'579',2400,62200,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'580',2400,62200,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'581',2400,83500,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'582',2400,62200,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'576',2500,104700,,'',0,26800,,'',0,29100,,'',0,22900,,'',0
-'577',2500,73500,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'578',2500,73500,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'579',2500,73500,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'580',2500,73500,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'581',2500,100300,,'',0,13200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
-'582',2500,73500,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'576',139001,72800,,'',0,7400,,'',0,32400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
-'577',139001,62300,,'',0,7700,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'578',139001,62300,,'',0,7700,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'579',139001,62300,,'',0,7700,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'580',139001,62300,,'',0,7700,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'581',139001,74700,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,7000,,'',0,13500,,'',0
-'582',139001,62300,,'',0,7700,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'583',2400,62200,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'584',2400,62200,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'585',2400,83500,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'586',2400,74100,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,14800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
+'587',2400,62200,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'588',2400,62200,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'589',2400,62200,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'583',2500,73500,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'584',2500,73500,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'585',2500,100300,,'',0,13200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
+'586',2500,104700,,'',0,26800,,'',0,29100,,'',0,22900,,'',0
+'587',2500,73500,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'588',2500,73500,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'589',2500,73500,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'583',139001,62300,,'',0,7700,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'584',139001,62300,,'',0,7700,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'585',139001,74700,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,7000,,'',0,13500,,'',0
+'586',139001,72800,,'',0,7400,,'',0,32400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
+'587',139001,62300,,'',0,7700,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'588',139001,62300,,'',0,7700,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'589',139001,62300,,'',0,7700,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_601 b/src/main/res-current/raw/current_gtfs_schedule_stop_601
index 6adfce6ac..e9a31e412 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_601
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_601
@@ -1,5 +1,5 @@
-'577',2601,73000,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'578',2601,73000,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'579',2601,73000,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'580',2601,73000,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'582',2601,73000,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'583',2601,73000,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'584',2601,73000,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'587',2601,73000,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'588',2601,73000,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'589',2601,73000,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_602 b/src/main/res-current/raw/current_gtfs_schedule_stop_602
index 07b2b1e7c..2d2cf08a2 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_602
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_602
@@ -1,21 +1,21 @@
-'576',2401,80600,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
-'577',2401,54500,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,11100,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'578',2401,54500,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,11100,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'579',2401,54500,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,11100,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'580',2401,54500,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,11100,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'581',2401,71400,,'',0,10000,,'',0,14300,,'',0,15000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,12100,,'',0,6500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'582',2401,54500,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,11100,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'576',2501,100100,,'',0,22800,,'',0,29500,,'',0,22900,,'',0
-'577',2501,74300,,'',0,9100,,'',0,9000,,'',0,13500,,'',0,17300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'578',2501,74300,,'',0,9100,,'',0,9000,,'',0,13500,,'',0,17300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'579',2501,74300,,'',0,9100,,'',0,9000,,'',0,13500,,'',0,17300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'580',2501,74300,,'',0,9100,,'',0,9000,,'',0,13500,,'',0,17300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'581',2501,91600,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,40300,,'',0
-'582',2501,74300,,'',0,9100,,'',0,9000,,'',0,13500,,'',0,17300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'576',139000,105400,,'',0,26800,,'',0,29100,,'',0,30300,,'',0
-'577',139000,55100,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'578',139000,55100,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'579',139000,55100,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'580',139000,55100,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'581',139000,72800,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
-'582',139000,55100,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'583',2401,54500,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,11100,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'584',2401,54500,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,11100,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'585',2401,71400,,'',0,10000,,'',0,14300,,'',0,15000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,12100,,'',0,6500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'586',2401,80600,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
+'587',2401,54500,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,11100,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'588',2401,54500,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,11100,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'589',2401,54500,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,11100,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'583',2501,74300,,'',0,9100,,'',0,9000,,'',0,13500,,'',0,17300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'584',2501,74300,,'',0,9100,,'',0,9000,,'',0,13500,,'',0,17300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'585',2501,91600,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,40300,,'',0
+'586',2501,100100,,'',0,22800,,'',0,29500,,'',0,22900,,'',0
+'587',2501,74300,,'',0,9100,,'',0,9000,,'',0,13500,,'',0,17300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'588',2501,74300,,'',0,9100,,'',0,9000,,'',0,13500,,'',0,17300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'589',2501,74300,,'',0,9100,,'',0,9000,,'',0,13500,,'',0,17300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'583',139000,55100,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'584',139000,55100,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'585',139000,72800,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
+'586',139000,105400,,'',0,26800,,'',0,29100,,'',0,30300,,'',0
+'587',139000,55100,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'588',139000,55100,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'589',139000,55100,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_603 b/src/main/res-current/raw/current_gtfs_schedule_stop_603
index be1f53716..17d976cd2 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_603
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_603
@@ -1,7 +1,7 @@
-'576',2001,74600,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'577',2001,62700,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
-'578',2001,62700,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
-'579',2001,62700,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
-'580',2001,62700,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
-'581',2001,75200,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'582',2001,62700,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
+'583',2001,62700,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
+'584',2001,62700,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
+'585',2001,75200,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'586',2001,74600,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'587',2001,62700,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
+'588',2001,62700,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
+'589',2001,62700,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_604 b/src/main/res-current/raw/current_gtfs_schedule_stop_604
index 3118e9d59..2395d2dd7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_604
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_604
@@ -1,28 +1,28 @@
-'576',2000,83400,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,14800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'577',2000,64300,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,14200,,'',0,10600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,15600,,'',0,11600,,'',0
-'578',2000,64300,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,14200,,'',0,10600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,15600,,'',0,11600,,'',0
-'579',2000,64300,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,14200,,'',0,10600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,15600,,'',0,11600,,'',0
-'580',2000,64300,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,14200,,'',0,10600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,15600,,'',0,11600,,'',0
-'581',2000,70500,,'',0,10300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,15000,,'',0,10800,,'',0,10000,,'',0
-'582',2000,64300,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,14200,,'',0,10600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,15600,,'',0,11600,,'',0
-'576',2400,74100,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,14800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
-'577',2400,62200,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'578',2400,62200,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'579',2400,62200,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'580',2400,62200,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'581',2400,83500,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'582',2400,62200,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'576',2500,104800,,'',0,26800,,'',0,29100,,'',0,22900,,'',0
-'577',2500,73600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'578',2500,73600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'579',2500,73600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'580',2500,73600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'581',2500,100400,,'',0,13200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
-'582',2500,73600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'576',139001,72800,,'',0,7400,,'',0,32400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
-'577',139001,62300,,'',0,7700,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'578',139001,62300,,'',0,7700,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'579',139001,62300,,'',0,7700,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'580',139001,62300,,'',0,7700,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'581',139001,74700,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,7000,,'',0,13500,,'',0
-'582',139001,62300,,'',0,7700,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'583',2000,64300,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,14200,,'',0,10600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,15600,,'',0,11600,,'',0
+'584',2000,64300,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,14200,,'',0,10600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,15600,,'',0,11600,,'',0
+'585',2000,70500,,'',0,10300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,15000,,'',0,10800,,'',0,10000,,'',0
+'586',2000,83400,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,14800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'587',2000,64300,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,14200,,'',0,10600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,15600,,'',0,11600,,'',0
+'588',2000,64300,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,14200,,'',0,10600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,15600,,'',0,11600,,'',0
+'589',2000,64300,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,14200,,'',0,10600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,15600,,'',0,11600,,'',0
+'583',2400,62200,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'584',2400,62200,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'585',2400,83500,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'586',2400,74100,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,14800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
+'587',2400,62200,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'588',2400,62200,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'589',2400,62200,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'583',2500,73600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'584',2500,73600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'585',2500,100400,,'',0,13200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
+'586',2500,104800,,'',0,26800,,'',0,29100,,'',0,22900,,'',0
+'587',2500,73600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'588',2500,73600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'589',2500,73600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'583',139001,62300,,'',0,7700,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'584',139001,62300,,'',0,7700,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'585',139001,74700,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,7000,,'',0,13500,,'',0
+'586',139001,72800,,'',0,7400,,'',0,32400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
+'587',139001,62300,,'',0,7700,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'588',139001,62300,,'',0,7700,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'589',139001,62300,,'',0,7700,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_605 b/src/main/res-current/raw/current_gtfs_schedule_stop_605
index 6adfce6ac..e9a31e412 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_605
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_605
@@ -1,5 +1,5 @@
-'577',2601,73000,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'578',2601,73000,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'579',2601,73000,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'580',2601,73000,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'582',2601,73000,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'583',2601,73000,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'584',2601,73000,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'587',2601,73000,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'588',2601,73000,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'589',2601,73000,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_606 b/src/main/res-current/raw/current_gtfs_schedule_stop_606
index 27b077876..8f20b10f1 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_606
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_606
@@ -1,6 +1,6 @@
-'577',2301,74300,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
-'578',2301,74300,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
-'579',2301,74300,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
-'580',2301,74300,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
-'581',2301,100600,0,'Old Vernon Rd',0
-'582',2301,74300,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'583',2301,74300,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'584',2301,74300,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'585',2301,100600,0,'Old Vernon Rd',0
+'587',2301,74300,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'588',2301,74300,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'589',2301,74300,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_6061 b/src/main/res-current/raw/current_gtfs_schedule_stop_6061
index 8eb285eea..d45ac075d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_6061
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_6061
@@ -1,7 +1,7 @@
-'576',2300,80000,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,9400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
-'577',2300,55800,,'',0,7500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3700,0,'Old Vernon Rd',0,5400,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1600,0,'Old Vernon Rd',0,1400,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,9800,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
-'578',2300,55800,,'',0,7500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3700,0,'Old Vernon Rd',0,5400,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1600,0,'Old Vernon Rd',0,1400,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,9800,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
-'579',2300,55800,,'',0,7500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3700,0,'Old Vernon Rd',0,5400,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1600,0,'Old Vernon Rd',0,1400,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,9800,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
-'580',2300,55800,,'',0,7500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3700,0,'Old Vernon Rd',0,5400,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1600,0,'Old Vernon Rd',0,1400,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,9800,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
-'581',2300,70700,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7100,,'',0,2500,,'',0,7600,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8100,0,'Old Vernon Rd',0,1900,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,2800,,'',0,6800,,'',0,3300,,'',0,10200,,'',0,9100,,'',0,10500,,'',0,15100,,'',0,10800,,'',0,11000,,'',0
-'582',2300,55800,,'',0,7500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3700,0,'Old Vernon Rd',0,5400,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1600,0,'Old Vernon Rd',0,1400,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,9800,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
+'583',2300,55800,,'',0,7500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3700,0,'Old Vernon Rd',0,5400,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1600,0,'Old Vernon Rd',0,1400,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,9800,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
+'584',2300,55800,,'',0,7500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3700,0,'Old Vernon Rd',0,5400,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1600,0,'Old Vernon Rd',0,1400,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,9800,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
+'585',2300,70700,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7100,,'',0,2500,,'',0,7600,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8100,0,'Old Vernon Rd',0,1900,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,2800,,'',0,6800,,'',0,3300,,'',0,10200,,'',0,9100,,'',0,10500,,'',0,15100,,'',0,10800,,'',0,11000,,'',0
+'586',2300,80000,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,9400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
+'587',2300,55800,,'',0,7500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3700,0,'Old Vernon Rd',0,5400,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1600,0,'Old Vernon Rd',0,1400,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,9800,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
+'588',2300,55800,,'',0,7500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3700,0,'Old Vernon Rd',0,5400,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1600,0,'Old Vernon Rd',0,1400,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,9800,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
+'589',2300,55800,,'',0,7500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3700,0,'Old Vernon Rd',0,5400,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1600,0,'Old Vernon Rd',0,1400,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,9800,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_607 b/src/main/res-current/raw/current_gtfs_schedule_stop_607
index a87c1d0e9..0e6373ea9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_607
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_607
@@ -1,6 +1,6 @@
-'577',2300,144200,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
-'578',2300,144200,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
-'579',2300,144200,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
-'580',2300,144200,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
-'581',2300,142400,0,'Old Vernon Rd',0
-'582',2300,144200,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'583',2300,144200,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'584',2300,144200,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'585',2300,142400,0,'Old Vernon Rd',0
+'587',2300,144200,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'588',2300,144200,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'589',2300,144200,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_608 b/src/main/res-current/raw/current_gtfs_schedule_stop_608
index c37c2c308..53a699f9e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_608
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_608
@@ -1,5 +1,5 @@
-'577',2601,73100,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'578',2601,73100,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'579',2601,73100,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'580',2601,73100,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'582',2601,73100,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'583',2601,73100,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'584',2601,73100,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'587',2601,73100,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'588',2601,73100,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'589',2601,73100,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_609 b/src/main/res-current/raw/current_gtfs_schedule_stop_609
index a409fc71b..4dd3adf78 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_609
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_609
@@ -1,6 +1,6 @@
-'577',2300,55700,,'',0,7500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
-'578',2300,55700,,'',0,7500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
-'579',2300,55700,,'',0,7500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
-'580',2300,55700,,'',0,7500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
-'581',2300,70600,,'',0,10000,,'',0,9800,,'',0,10100,,'',0,55100,,'',0,9700,,'',0,10100,,'',0,29800,,'',0
-'582',2300,55700,,'',0,7500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
+'583',2300,55700,,'',0,7500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
+'584',2300,55700,,'',0,7500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
+'585',2300,70600,,'',0,10000,,'',0,9800,,'',0,10100,,'',0,55100,,'',0,9700,,'',0,10100,,'',0,29800,,'',0
+'587',2300,55700,,'',0,7500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
+'588',2300,55700,,'',0,7500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
+'589',2300,55700,,'',0,7500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_61 b/src/main/res-current/raw/current_gtfs_schedule_stop_61
index f28ddfb51..8dcb76745 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_61
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_61
@@ -1,7 +1,7 @@
-'576',300,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
-'577',300,73200,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'578',300,73200,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'579',300,73200,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'580',300,73200,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'581',300,81900,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'582',300,73200,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'583',300,73200,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'584',300,73200,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'585',300,81900,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
+'586',300,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
+'587',300,73200,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'588',300,73200,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'589',300,73200,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_610 b/src/main/res-current/raw/current_gtfs_schedule_stop_610
index 144bc0c0b..7b673c16f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_610
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_610
@@ -1,6 +1,6 @@
-'577',2301,55600,,'',0,7700,,'',0,7600,,'',0,4900,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'578',2301,55600,,'',0,7700,,'',0,7600,,'',0,4900,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'579',2301,55600,,'',0,7700,,'',0,7600,,'',0,4900,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'580',2301,55600,,'',0,7700,,'',0,7600,,'',0,4900,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'581',2301,94100,,'',0,10100,,'',0,8900,,'',0,22100,,'',0,20700,,'',0,7400,,'',0,9600,,'',0,10000,,'',0,19400,,'',0
-'582',2301,55600,,'',0,7700,,'',0,7600,,'',0,4900,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'583',2301,55600,,'',0,7700,,'',0,7600,,'',0,4900,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'584',2301,55600,,'',0,7700,,'',0,7600,,'',0,4900,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'585',2301,94100,,'',0,10100,,'',0,8900,,'',0,22100,,'',0,20700,,'',0,7400,,'',0,9600,,'',0,10000,,'',0,19400,,'',0
+'587',2301,55600,,'',0,7700,,'',0,7600,,'',0,4900,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'588',2301,55600,,'',0,7700,,'',0,7600,,'',0,4900,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'589',2301,55600,,'',0,7700,,'',0,7600,,'',0,4900,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_611 b/src/main/res-current/raw/current_gtfs_schedule_stop_611
index e59161c20..e46b1de29 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_611
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_611
@@ -1,7 +1,7 @@
-'576',2101,73300,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,5200,,'',0,15000,,'',0,10000,,'',0,10400,,'',0
-'577',2101,55000,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'578',2101,55000,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'579',2101,55000,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'580',2101,55000,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'581',2101,63100,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,10900,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,9200,,'',0,3400,,'',0,14500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'582',2101,55000,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'583',2101,55000,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'584',2101,55000,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'585',2101,63100,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,10900,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,9200,,'',0,3400,,'',0,14500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'586',2101,73300,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,5200,,'',0,15000,,'',0,10000,,'',0,10400,,'',0
+'587',2101,55000,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'588',2101,55000,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'589',2101,55000,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_612 b/src/main/res-current/raw/current_gtfs_schedule_stop_612
index 144bc0c0b..7b673c16f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_612
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_612
@@ -1,6 +1,6 @@
-'577',2301,55600,,'',0,7700,,'',0,7600,,'',0,4900,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'578',2301,55600,,'',0,7700,,'',0,7600,,'',0,4900,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'579',2301,55600,,'',0,7700,,'',0,7600,,'',0,4900,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'580',2301,55600,,'',0,7700,,'',0,7600,,'',0,4900,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'581',2301,94100,,'',0,10100,,'',0,8900,,'',0,22100,,'',0,20700,,'',0,7400,,'',0,9600,,'',0,10000,,'',0,19400,,'',0
-'582',2301,55600,,'',0,7700,,'',0,7600,,'',0,4900,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'583',2301,55600,,'',0,7700,,'',0,7600,,'',0,4900,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'584',2301,55600,,'',0,7700,,'',0,7600,,'',0,4900,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'585',2301,94100,,'',0,10100,,'',0,8900,,'',0,22100,,'',0,20700,,'',0,7400,,'',0,9600,,'',0,10000,,'',0,19400,,'',0
+'587',2301,55600,,'',0,7700,,'',0,7600,,'',0,4900,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'588',2301,55600,,'',0,7700,,'',0,7600,,'',0,4900,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'589',2301,55600,,'',0,7700,,'',0,7600,,'',0,4900,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_613 b/src/main/res-current/raw/current_gtfs_schedule_stop_613
index bc19b250e..6ba497434 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_613
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_613
@@ -1,6 +1,6 @@
-'577',2300,55800,,'',0,7500,,'',0,7000,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
-'578',2300,55800,,'',0,7500,,'',0,7000,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
-'579',2300,55800,,'',0,7500,,'',0,7000,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
-'580',2300,55800,,'',0,7500,,'',0,7000,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
-'581',2300,70700,,'',0,9900,,'',0,9800,,'',0,10100,,'',0,55100,,'',0,9700,,'',0,10200,,'',0,29800,,'',0
-'582',2300,55800,,'',0,7500,,'',0,7000,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
+'583',2300,55800,,'',0,7500,,'',0,7000,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
+'584',2300,55800,,'',0,7500,,'',0,7000,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
+'585',2300,70700,,'',0,9900,,'',0,9800,,'',0,10100,,'',0,55100,,'',0,9700,,'',0,10200,,'',0,29800,,'',0
+'587',2300,55800,,'',0,7500,,'',0,7000,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
+'588',2300,55800,,'',0,7500,,'',0,7000,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
+'589',2300,55800,,'',0,7500,,'',0,7000,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_614 b/src/main/res-current/raw/current_gtfs_schedule_stop_614
index 44cbc1290..e9443e7c4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_614
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_614
@@ -1,6 +1,6 @@
-'577',2301,74200,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
-'578',2301,74200,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
-'579',2301,74200,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
-'580',2301,74200,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
-'581',2301,100500,0,'Old Vernon Rd',0
-'582',2301,74200,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'583',2301,74200,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'584',2301,74200,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'585',2301,100500,0,'Old Vernon Rd',0
+'587',2301,74200,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'588',2301,74200,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'589',2301,74200,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_615 b/src/main/res-current/raw/current_gtfs_schedule_stop_615
index 975fee04d..72c861c15 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_615
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_615
@@ -1,7 +1,7 @@
-'576',2101,73800,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
-'577',2101,55500,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'578',2101,55500,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'579',2101,55500,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'580',2101,55500,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'581',2101,63600,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'582',2101,55500,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'583',2101,55500,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'584',2101,55500,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'585',2101,63600,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'586',2101,73800,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
+'587',2101,55500,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'588',2101,55500,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'589',2101,55500,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_616 b/src/main/res-current/raw/current_gtfs_schedule_stop_616
index 975fee04d..72c861c15 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_616
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_616
@@ -1,7 +1,7 @@
-'576',2101,73800,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
-'577',2101,55500,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'578',2101,55500,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'579',2101,55500,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'580',2101,55500,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'581',2101,63600,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'582',2101,55500,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'583',2101,55500,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'584',2101,55500,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'585',2101,63600,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'586',2101,73800,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
+'587',2101,55500,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'588',2101,55500,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'589',2101,55500,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_617 b/src/main/res-current/raw/current_gtfs_schedule_stop_617
index 975fee04d..72c861c15 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_617
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_617
@@ -1,7 +1,7 @@
-'576',2101,73800,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
-'577',2101,55500,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'578',2101,55500,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'579',2101,55500,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'580',2101,55500,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'581',2101,63600,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'582',2101,55500,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'583',2101,55500,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'584',2101,55500,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'585',2101,63600,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'586',2101,73800,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
+'587',2101,55500,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'588',2101,55500,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'589',2101,55500,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_618 b/src/main/res-current/raw/current_gtfs_schedule_stop_618
index 916d675e6..c23e95d93 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_618
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_618
@@ -1,7 +1,7 @@
-'576',2101,73700,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
-'577',2101,55400,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'578',2101,55400,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'579',2101,55400,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'580',2101,55400,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'581',2101,63500,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'582',2101,55400,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'583',2101,55400,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'584',2101,55400,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'585',2101,63500,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'586',2101,73700,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
+'587',2101,55400,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'588',2101,55400,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'589',2101,55400,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_619 b/src/main/res-current/raw/current_gtfs_schedule_stop_619
index 2c763c194..ef91528ea 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_619
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_619
@@ -1,7 +1,7 @@
-'576',2101,73900,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
-'577',2101,55600,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'578',2101,55600,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'579',2101,55600,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'580',2101,55600,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'581',2101,63700,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'582',2101,55600,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'583',2101,55600,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'584',2101,55600,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'585',2101,63700,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'586',2101,73900,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
+'587',2101,55600,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'588',2101,55600,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'589',2101,55600,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_62 b/src/main/res-current/raw/current_gtfs_schedule_stop_62
index 4ab071d96..d6c490766 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_62
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_62
@@ -1,7 +1,7 @@
-'576',1101,74500,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
-'577',1101,65200,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'578',1101,65200,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'579',1101,65200,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'580',1101,65200,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'581',1101,80600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'582',1101,65200,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'583',1101,65200,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'584',1101,65200,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'585',1101,80600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'586',1101,74500,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
+'587',1101,65200,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'588',1101,65200,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'589',1101,65200,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_620 b/src/main/res-current/raw/current_gtfs_schedule_stop_620
index fee493a18..3de0568fb 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_620
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_620
@@ -1,6 +1,6 @@
-'577',2301,74100,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
-'578',2301,74100,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
-'579',2301,74100,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
-'580',2301,74100,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
-'581',2301,100500,0,'Old Vernon Rd',0
-'582',2301,74100,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'583',2301,74100,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'584',2301,74100,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'585',2301,100500,0,'Old Vernon Rd',0
+'587',2301,74100,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'588',2301,74100,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'589',2301,74100,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_621 b/src/main/res-current/raw/current_gtfs_schedule_stop_621
index da4d5e228..ee779cbd0 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_621
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_621
@@ -1,6 +1,6 @@
-'577',2300,144500,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
-'578',2300,144500,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
-'579',2300,144500,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
-'580',2300,144500,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
-'581',2300,142600,0,'Old Vernon Rd',0
-'582',2300,144500,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'583',2300,144500,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'584',2300,144500,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'585',2300,142600,0,'Old Vernon Rd',0
+'587',2300,144500,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'588',2300,144500,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'589',2300,144500,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_622 b/src/main/res-current/raw/current_gtfs_schedule_stop_622
index 1983d16f8..f27fb0dd3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_622
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_622
@@ -1,7 +1,7 @@
-'576',2101,73400,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,5200,,'',0,15000,,'',0,10000,,'',0,10400,,'',0
-'577',2101,55100,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'578',2101,55100,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'579',2101,55100,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'580',2101,55100,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'581',2101,63200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,10900,,'',0,7000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,3400,,'',0,14500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'582',2101,55100,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'583',2101,55100,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'584',2101,55100,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'585',2101,63200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,10900,,'',0,7000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,3400,,'',0,14500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'586',2101,73400,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,5200,,'',0,15000,,'',0,10000,,'',0,10400,,'',0
+'587',2101,55100,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'588',2101,55100,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'589',2101,55100,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_623 b/src/main/res-current/raw/current_gtfs_schedule_stop_623
index 473a11871..6d59fc343 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_623
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_623
@@ -1,7 +1,7 @@
-'576',2101,74000,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,14200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
-'577',2101,55700,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'578',2101,55700,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'579',2101,55700,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'580',2101,55700,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'581',2101,63800,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'582',2101,55700,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'583',2101,55700,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'584',2101,55700,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'585',2101,63800,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'586',2101,74000,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,14200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
+'587',2101,55700,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'588',2101,55700,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'589',2101,55700,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_624 b/src/main/res-current/raw/current_gtfs_schedule_stop_624
index 916d675e6..c23e95d93 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_624
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_624
@@ -1,7 +1,7 @@
-'576',2101,73700,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
-'577',2101,55400,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'578',2101,55400,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'579',2101,55400,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'580',2101,55400,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'581',2101,63500,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'582',2101,55400,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'583',2101,55400,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'584',2101,55400,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'585',2101,63500,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'586',2101,73700,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
+'587',2101,55400,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'588',2101,55400,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'589',2101,55400,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_625 b/src/main/res-current/raw/current_gtfs_schedule_stop_625
index 473a11871..6d59fc343 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_625
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_625
@@ -1,7 +1,7 @@
-'576',2101,74000,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,14200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
-'577',2101,55700,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'578',2101,55700,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'579',2101,55700,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'580',2101,55700,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'581',2101,63800,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'582',2101,55700,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'583',2101,55700,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'584',2101,55700,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'585',2101,63800,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'586',2101,74000,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,14200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
+'587',2101,55700,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'588',2101,55700,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'589',2101,55700,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_626 b/src/main/res-current/raw/current_gtfs_schedule_stop_626
index 52c531a28..7dfcea6d3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_626
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_626
@@ -1,7 +1,7 @@
-'576',2101,74200,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
-'577',2101,55900,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,9900,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'578',2101,55900,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,9900,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'579',2101,55900,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,9900,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'580',2101,55900,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,9900,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'581',2101,64000,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'582',2101,55900,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,9900,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'583',2101,55900,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,9900,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'584',2101,55900,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,9900,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'585',2101,64000,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'586',2101,74200,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
+'587',2101,55900,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,9900,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'588',2101,55900,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,9900,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'589',2101,55900,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,9900,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_6260 b/src/main/res-current/raw/current_gtfs_schedule_stop_6260
index 2d1cd15e2..a920467a8 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_6260
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_6260
@@ -1,7 +1,7 @@
-'576',601,80600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',601,61600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'578',601,61600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'579',601,61600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'580',601,61600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'581',601,75100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'582',601,61600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'583',601,61600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'584',601,61600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'585',601,75100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
+'586',601,80600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',601,61600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'588',601,61600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'589',601,61600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_627 b/src/main/res-current/raw/current_gtfs_schedule_stop_627
index a09b45250..5408977aa 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_627
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_627
@@ -1,7 +1,7 @@
-'576',2101,74100,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,14200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
-'577',2101,55800,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'578',2101,55800,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'579',2101,55800,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'580',2101,55800,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'581',2101,63900,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'582',2101,55800,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'583',2101,55800,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'584',2101,55800,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'585',2101,63900,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'586',2101,74100,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,14200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
+'587',2101,55800,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'588',2101,55800,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'589',2101,55800,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_6273 b/src/main/res-current/raw/current_gtfs_schedule_stop_6273
index c7753ebe2..cd5a7492c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_6273
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_6273
@@ -1,7 +1,7 @@
-'576',600,92300,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0
-'577',600,63500,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'578',600,63500,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'579',600,63500,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'580',600,63500,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'581',600,80900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
-'582',600,63500,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'583',600,63500,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'584',600,63500,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'585',600,80900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'586',600,92300,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0
+'587',600,63500,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'588',600,63500,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'589',600,63500,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_628 b/src/main/res-current/raw/current_gtfs_schedule_stop_628
index e48fc7e88..5525b61a2 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_628
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_628
@@ -1,7 +1,7 @@
-'576',2101,73600,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,5200,,'',0,15000,,'',0,10000,,'',0,10400,,'',0
-'577',2101,55300,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'578',2101,55300,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'579',2101,55300,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'580',2101,55300,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'581',2101,63400,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,10900,,'',0,7000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'582',2101,55300,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'583',2101,55300,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'584',2101,55300,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'585',2101,63400,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,10900,,'',0,7000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'586',2101,73600,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,5200,,'',0,15000,,'',0,10000,,'',0,10400,,'',0
+'587',2101,55300,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'588',2101,55300,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'589',2101,55300,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_629 b/src/main/res-current/raw/current_gtfs_schedule_stop_629
index 7f09bbca8..3e803b912 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_629
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_629
@@ -1,7 +1,7 @@
-'576',2101,74200,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
-'577',2101,55900,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'578',2101,55900,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'579',2101,55900,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'580',2101,55900,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'581',2101,64000,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'582',2101,55900,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'583',2101,55900,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'584',2101,55900,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'585',2101,64000,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'586',2101,74200,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
+'587',2101,55900,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'588',2101,55900,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'589',2101,55900,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_63 b/src/main/res-current/raw/current_gtfs_schedule_stop_63
index 58275fa20..909174e1a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_63
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_63
@@ -1,7 +1,7 @@
-'576',1000,82100,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
-'577',1000,62000,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1600,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'578',1000,62000,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1600,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'579',1000,62000,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1600,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'580',1000,62000,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1600,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'581',1000,82000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
-'582',1000,62000,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1600,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'583',1000,62000,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1600,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'584',1000,62000,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1600,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'585',1000,82000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'586',1000,82100,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
+'587',1000,62000,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1600,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'588',1000,62000,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1600,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'589',1000,62000,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,5500,,'',0,1600,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_630 b/src/main/res-current/raw/current_gtfs_schedule_stop_630
index 473a11871..6d59fc343 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_630
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_630
@@ -1,7 +1,7 @@
-'576',2101,74000,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,14200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
-'577',2101,55700,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'578',2101,55700,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'579',2101,55700,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'580',2101,55700,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'581',2101,63800,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'582',2101,55700,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'583',2101,55700,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'584',2101,55700,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'585',2101,63800,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'586',2101,74000,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,14200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
+'587',2101,55700,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'588',2101,55700,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'589',2101,55700,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_631 b/src/main/res-current/raw/current_gtfs_schedule_stop_631
index e48fc7e88..5525b61a2 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_631
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_631
@@ -1,7 +1,7 @@
-'576',2101,73600,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,5200,,'',0,15000,,'',0,10000,,'',0,10400,,'',0
-'577',2101,55300,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'578',2101,55300,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'579',2101,55300,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'580',2101,55300,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'581',2101,63400,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,10900,,'',0,7000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'582',2101,55300,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'583',2101,55300,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'584',2101,55300,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'585',2101,63400,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,10900,,'',0,7000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'586',2101,73600,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,5200,,'',0,15000,,'',0,10000,,'',0,10400,,'',0
+'587',2101,55300,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'588',2101,55300,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'589',2101,55300,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_632 b/src/main/res-current/raw/current_gtfs_schedule_stop_632
index 8907bab88..edac9350c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_632
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_632
@@ -1,7 +1,7 @@
-'576',2101,74700,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
-'577',2101,60300,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'578',2101,60300,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'579',2101,60300,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'580',2101,60300,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'581',2101,64400,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,14300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'582',2101,60300,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'583',2101,60300,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'584',2101,60300,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'585',2101,64400,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,14300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'586',2101,74700,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
+'587',2101,60300,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'588',2101,60300,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'589',2101,60300,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_6324 b/src/main/res-current/raw/current_gtfs_schedule_stop_6324
index dbeb293cb..4f8482cea 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_6324
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_6324
@@ -1,7 +1,7 @@
-'576',2500,103800,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
-'577',2500,72600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'578',2500,72600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'579',2500,72600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'580',2500,72600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'581',2500,95400,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
-'582',2500,72600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'583',2500,72600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'584',2500,72600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'585',2500,95400,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
+'586',2500,103800,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
+'587',2500,72600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'588',2500,72600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'589',2500,72600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_6325 b/src/main/res-current/raw/current_gtfs_schedule_stop_6325
index 7884d54af..e822b2784 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_6325
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_6325
@@ -1,7 +1,7 @@
-'576',2501,100900,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
-'577',2501,75100,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'578',2501,75100,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'579',2501,75100,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'580',2501,75100,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'581',2501,92400,,'',0,13200,,'',0,17300,,'',0,17100,,'',0,40300,,'',0
-'582',2501,75100,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'583',2501,75100,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'584',2501,75100,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'585',2501,92400,,'',0,13200,,'',0,17300,,'',0,17100,,'',0,40300,,'',0
+'586',2501,100900,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
+'587',2501,75100,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'588',2501,75100,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'589',2501,75100,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_633 b/src/main/res-current/raw/current_gtfs_schedule_stop_633
index 864d471cd..d2c2fa2f2 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_633
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_633
@@ -1,7 +1,7 @@
-'576',2101,73500,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,5200,,'',0,15000,,'',0,10000,,'',0,10400,,'',0
-'577',2101,55200,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'578',2101,55200,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'579',2101,55200,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'580',2101,55200,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'581',2101,63300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,10900,,'',0,7000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'582',2101,55200,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'583',2101,55200,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'584',2101,55200,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'585',2101,63300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,10900,,'',0,7000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'586',2101,73500,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,5200,,'',0,15000,,'',0,10000,,'',0,10400,,'',0
+'587',2101,55200,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'588',2101,55200,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'589',2101,55200,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_634 b/src/main/res-current/raw/current_gtfs_schedule_stop_634
index 658d314a0..e21210cd4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_634
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_634
@@ -1,7 +1,7 @@
-'576',2101,74600,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
-'577',2101,60300,,'',0,3100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'578',2101,60300,,'',0,3100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'579',2101,60300,,'',0,3100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'580',2101,60300,,'',0,3100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'581',2101,64400,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,14300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'582',2101,60300,,'',0,3100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'583',2101,60300,,'',0,3100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'584',2101,60300,,'',0,3100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'585',2101,64400,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,14300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'586',2101,74600,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
+'587',2101,60300,,'',0,3100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'588',2101,60300,,'',0,3100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'589',2101,60300,,'',0,3100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_63466 b/src/main/res-current/raw/current_gtfs_schedule_stop_63466
index 3f6eb98fc..11ff0a174 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_63466
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_63466
@@ -1,7 +1,7 @@
-'576',2201,81900,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',2201,72600,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'578',2201,72600,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'579',2201,72600,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'580',2201,72600,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'581',2201,84200,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
-'582',2201,72600,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'583',2201,72600,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'584',2201,72600,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'585',2201,84200,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
+'586',2201,81900,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',2201,72600,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'588',2201,72600,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'589',2201,72600,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_63467 b/src/main/res-current/raw/current_gtfs_schedule_stop_63467
index ba23f569e..b2f881222 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_63467
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_63467
@@ -1,7 +1,7 @@
-'576',2200,83600,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'577',2200,62300,,'',0,2400,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16800,,'',0
-'578',2200,62300,,'',0,2400,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16800,,'',0
-'579',2200,62300,,'',0,2400,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16800,,'',0
-'580',2200,62300,,'',0,2400,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16800,,'',0
-'581',2200,90000,,'',0,11100,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
-'582',2200,62300,,'',0,2400,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16800,,'',0
+'583',2200,62300,,'',0,2400,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16800,,'',0
+'584',2200,62300,,'',0,2400,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16800,,'',0
+'585',2200,90000,,'',0,11100,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
+'586',2200,83600,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'587',2200,62300,,'',0,2400,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16800,,'',0
+'588',2200,62300,,'',0,2400,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16800,,'',0
+'589',2200,62300,,'',0,2400,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_635 b/src/main/res-current/raw/current_gtfs_schedule_stop_635
index 661b0acc2..b1006c2fc 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_635
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_635
@@ -1,7 +1,7 @@
-'576',2101,74400,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
-'577',2101,60000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'578',2101,60000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'579',2101,60000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'580',2101,60000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'581',2101,64100,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'582',2101,60000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'583',2101,60000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'584',2101,60000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'585',2101,64100,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'586',2101,74400,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
+'587',2101,60000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'588',2101,60000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'589',2101,60000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_637 b/src/main/res-current/raw/current_gtfs_schedule_stop_637
index 2db93be2e..7b34db197 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_637
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_637
@@ -1,7 +1,7 @@
-'576',2101,74700,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
-'577',2101,60400,,'',0,3100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'578',2101,60400,,'',0,3100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'579',2101,60400,,'',0,3100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'580',2101,60400,,'',0,3100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'581',2101,64500,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,14300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'582',2101,60400,,'',0,3100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'583',2101,60400,,'',0,3100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'584',2101,60400,,'',0,3100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'585',2101,64500,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,14300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'586',2101,74700,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
+'587',2101,60400,,'',0,3100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'588',2101,60400,,'',0,3100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'589',2101,60400,,'',0,3100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_638 b/src/main/res-current/raw/current_gtfs_schedule_stop_638
index 3d442a7ca..31f59a1af 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_638
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_638
@@ -1,7 +1,7 @@
-'576',2101,75400,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10200,,'',0
-'577',2101,61000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,7400,,'',0,3200,,'',0,7500,,'',0,9800,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'578',2101,61000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,7400,,'',0,3200,,'',0,7500,,'',0,9800,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'579',2101,61000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,7400,,'',0,3200,,'',0,7500,,'',0,9800,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'580',2101,61000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,7400,,'',0,3200,,'',0,7500,,'',0,9800,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'581',2101,65100,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,6900,,'',0,4900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'582',2101,61000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,7400,,'',0,3200,,'',0,7500,,'',0,9800,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'583',2101,61000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,7400,,'',0,3200,,'',0,7500,,'',0,9800,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'584',2101,61000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,7400,,'',0,3200,,'',0,7500,,'',0,9800,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'585',2101,65100,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,6900,,'',0,4900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'586',2101,75400,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10200,,'',0
+'587',2101,61000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,7400,,'',0,3200,,'',0,7500,,'',0,9800,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'588',2101,61000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,7400,,'',0,3200,,'',0,7500,,'',0,9800,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'589',2101,61000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,7400,,'',0,3200,,'',0,7500,,'',0,9800,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_639 b/src/main/res-current/raw/current_gtfs_schedule_stop_639
index 360f1063b..f7815bd01 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_639
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_639
@@ -1,7 +1,7 @@
-'576',2101,74800,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
-'577',2101,60400,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'578',2101,60400,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'579',2101,60400,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'580',2101,60400,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'581',2101,64500,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,14300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'582',2101,60400,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'583',2101,60400,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'584',2101,60400,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'585',2101,64500,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,14300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'586',2101,74800,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
+'587',2101,60400,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'588',2101,60400,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'589',2101,60400,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_64 b/src/main/res-current/raw/current_gtfs_schedule_stop_64
index 0c86d750f..83ca288eb 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_64
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_64
@@ -1,7 +1,7 @@
-'576',300,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
-'577',300,73400,,'',0,2300,,'',0,7100,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'578',300,73400,,'',0,2300,,'',0,7100,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'579',300,73400,,'',0,2300,,'',0,7100,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'580',300,73400,,'',0,2300,,'',0,7100,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'581',300,82100,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'582',300,73400,,'',0,2300,,'',0,7100,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'583',300,73400,,'',0,2300,,'',0,7100,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'584',300,73400,,'',0,2300,,'',0,7100,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'585',300,82100,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
+'586',300,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
+'587',300,73400,,'',0,2300,,'',0,7100,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'588',300,73400,,'',0,2300,,'',0,7100,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'589',300,73400,,'',0,2300,,'',0,7100,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_640 b/src/main/res-current/raw/current_gtfs_schedule_stop_640
index 29e1d868d..76e714ebe 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_640
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_640
@@ -1,7 +1,7 @@
-'576',2101,75300,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
-'577',2101,60900,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,7400,,'',0,3200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'578',2101,60900,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,7400,,'',0,3200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'579',2101,60900,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,7400,,'',0,3200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'580',2101,60900,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,7400,,'',0,3200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'581',2101,65000,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'582',2101,60900,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,7400,,'',0,3200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'583',2101,60900,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,7400,,'',0,3200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'584',2101,60900,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,7400,,'',0,3200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'585',2101,65000,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'586',2101,75300,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
+'587',2101,60900,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,7400,,'',0,3200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'588',2101,60900,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,7400,,'',0,3200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'589',2101,60900,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,7400,,'',0,3200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_641 b/src/main/res-current/raw/current_gtfs_schedule_stop_641
index ce9c73bbb..478a19cbb 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_641
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_641
@@ -1,7 +1,7 @@
-'576',2101,74500,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
-'577',2101,60100,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'578',2101,60100,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'579',2101,60100,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'580',2101,60100,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'581',2101,64200,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'582',2101,60100,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'583',2101,60100,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'584',2101,60100,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'585',2101,64200,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'586',2101,74500,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
+'587',2101,60100,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'588',2101,60100,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'589',2101,60100,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_642 b/src/main/res-current/raw/current_gtfs_schedule_stop_642
index 1c6158918..70206f961 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_642
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_642
@@ -1,7 +1,7 @@
-'576',2101,74900,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
-'577',2101,60500,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'578',2101,60500,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'579',2101,60500,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'580',2101,60500,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'581',2101,64600,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'582',2101,60500,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'583',2101,60500,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'584',2101,60500,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'585',2101,64600,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'586',2101,74900,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
+'587',2101,60500,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'588',2101,60500,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'589',2101,60500,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_643 b/src/main/res-current/raw/current_gtfs_schedule_stop_643
index e3947ba95..ace577b31 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_643
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_643
@@ -1,7 +1,7 @@
-'576',2101,74600,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
-'577',2101,60200,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,5900,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'578',2101,60200,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,5900,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'579',2101,60200,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,5900,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'580',2101,60200,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,5900,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'581',2101,64300,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,14300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'582',2101,60200,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,5900,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'583',2101,60200,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,5900,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'584',2101,60200,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,5900,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'585',2101,64300,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,14300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'586',2101,74600,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
+'587',2101,60200,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,5900,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'588',2101,60200,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,5900,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'589',2101,60200,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,5900,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_644 b/src/main/res-current/raw/current_gtfs_schedule_stop_644
index 2de8a9d1e..fee68fbbe 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_644
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_644
@@ -1,7 +1,7 @@
-'576',2101,75600,,'',0,14500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10200,,'',0
-'577',2101,61200,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,7400,,'',0,3200,,'',0,7500,,'',0,9800,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'578',2101,61200,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,7400,,'',0,3200,,'',0,7500,,'',0,9800,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'579',2101,61200,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,7400,,'',0,3200,,'',0,7500,,'',0,9800,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'580',2101,61200,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,7400,,'',0,3200,,'',0,7500,,'',0,9800,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'581',2101,65300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,6900,,'',0,4900,,'',0,10600,,'',0,14400,,'',0,10600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'582',2101,61200,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,7400,,'',0,3200,,'',0,7500,,'',0,9800,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'583',2101,61200,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,7400,,'',0,3200,,'',0,7500,,'',0,9800,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'584',2101,61200,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,7400,,'',0,3200,,'',0,7500,,'',0,9800,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'585',2101,65300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,6900,,'',0,4900,,'',0,10600,,'',0,14400,,'',0,10600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'586',2101,75600,,'',0,14500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10200,,'',0
+'587',2101,61200,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,7400,,'',0,3200,,'',0,7500,,'',0,9800,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'588',2101,61200,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,7400,,'',0,3200,,'',0,7500,,'',0,9800,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'589',2101,61200,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,7400,,'',0,3200,,'',0,7500,,'',0,9800,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_645 b/src/main/res-current/raw/current_gtfs_schedule_stop_645
index d9fbb29dd..110053fe9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_645
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_645
@@ -1,7 +1,7 @@
-'576',2101,75000,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
-'577',2101,60600,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'578',2101,60600,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'579',2101,60600,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'580',2101,60600,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'581',2101,64700,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'582',2101,60600,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'583',2101,60600,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'584',2101,60600,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'585',2101,64700,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'586',2101,75000,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
+'587',2101,60600,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'588',2101,60600,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'589',2101,60600,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_646 b/src/main/res-current/raw/current_gtfs_schedule_stop_646
index 9774ece08..731e3f5e5 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_646
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_646
@@ -1,7 +1,7 @@
-'576',2101,75200,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
-'577',2101,60800,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'578',2101,60800,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'579',2101,60800,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'580',2101,60800,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'581',2101,64900,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'582',2101,60800,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'583',2101,60800,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'584',2101,60800,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'585',2101,64900,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'586',2101,75200,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
+'587',2101,60800,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'588',2101,60800,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'589',2101,60800,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_647 b/src/main/res-current/raw/current_gtfs_schedule_stop_647
index 1c6158918..70206f961 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_647
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_647
@@ -1,7 +1,7 @@
-'576',2101,74900,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
-'577',2101,60500,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'578',2101,60500,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'579',2101,60500,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'580',2101,60500,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'581',2101,64600,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'582',2101,60500,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'583',2101,60500,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'584',2101,60500,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'585',2101,64600,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'586',2101,74900,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
+'587',2101,60500,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'588',2101,60500,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'589',2101,60500,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_648 b/src/main/res-current/raw/current_gtfs_schedule_stop_648
index 8cc8c930a..17fdbc67e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_648
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_648
@@ -1,7 +1,7 @@
-'576',2101,75100,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
-'577',2101,60700,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'578',2101,60700,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'579',2101,60700,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'580',2101,60700,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'581',2101,64800,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'582',2101,60700,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'583',2101,60700,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'584',2101,60700,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'585',2101,64800,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'586',2101,75100,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
+'587',2101,60700,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'588',2101,60700,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'589',2101,60700,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_649 b/src/main/res-current/raw/current_gtfs_schedule_stop_649
index d9fbb29dd..110053fe9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_649
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_649
@@ -1,7 +1,7 @@
-'576',2101,75000,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
-'577',2101,60600,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'578',2101,60600,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'579',2101,60600,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'580',2101,60600,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'581',2101,64700,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'582',2101,60600,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'583',2101,60600,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'584',2101,60600,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'585',2101,64700,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'586',2101,75000,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
+'587',2101,60600,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'588',2101,60600,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'589',2101,60600,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_65 b/src/main/res-current/raw/current_gtfs_schedule_stop_65
index 24042b469..a7fc9c9dd 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_65
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_65
@@ -1,7 +1,7 @@
-'576',1001,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'577',1001,63300,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'578',1001,63300,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'579',1001,63300,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'580',1001,63300,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'581',1001,81200,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',1001,63300,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'583',1001,63300,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'584',1001,63300,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'585',1001,81200,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',1001,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'587',1001,63300,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'588',1001,63300,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'589',1001,63300,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_650 b/src/main/res-current/raw/current_gtfs_schedule_stop_650
index 8cc8c930a..17fdbc67e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_650
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_650
@@ -1,7 +1,7 @@
-'576',2101,75100,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
-'577',2101,60700,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'578',2101,60700,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'579',2101,60700,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'580',2101,60700,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'581',2101,64800,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'582',2101,60700,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'583',2101,60700,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'584',2101,60700,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'585',2101,64800,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'586',2101,75100,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
+'587',2101,60700,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'588',2101,60700,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'589',2101,60700,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,7800,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_651 b/src/main/res-current/raw/current_gtfs_schedule_stop_651
index aa33b819e..b1fb199b1 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_651
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_651
@@ -1,7 +1,7 @@
-'576',2300,80400,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
-'577',2300,60200,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3700,0,'Old Vernon Rd',0,5400,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1600,0,'Old Vernon Rd',0,1400,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,9900,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
-'578',2300,60200,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3700,0,'Old Vernon Rd',0,5400,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1600,0,'Old Vernon Rd',0,1400,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,9900,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
-'579',2300,60200,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3700,0,'Old Vernon Rd',0,5400,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1600,0,'Old Vernon Rd',0,1400,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,9900,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
-'580',2300,60200,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3700,0,'Old Vernon Rd',0,5400,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1600,0,'Old Vernon Rd',0,1400,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,9900,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
-'581',2300,71100,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7100,,'',0,2500,,'',0,7600,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8100,0,'Old Vernon Rd',0,1900,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,2800,,'',0,6800,,'',0,3300,,'',0,14300,,'',0,5100,,'',0,10400,,'',0,15200,,'',0,10800,,'',0,11000,,'',0
-'582',2300,60200,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3700,0,'Old Vernon Rd',0,5400,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1600,0,'Old Vernon Rd',0,1400,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,9900,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
+'583',2300,60200,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3700,0,'Old Vernon Rd',0,5400,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1600,0,'Old Vernon Rd',0,1400,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,9900,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
+'584',2300,60200,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3700,0,'Old Vernon Rd',0,5400,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1600,0,'Old Vernon Rd',0,1400,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,9900,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
+'585',2300,71100,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7100,,'',0,2500,,'',0,7600,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8100,0,'Old Vernon Rd',0,1900,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,2800,,'',0,6800,,'',0,3300,,'',0,14300,,'',0,5100,,'',0,10400,,'',0,15200,,'',0,10800,,'',0,11000,,'',0
+'586',2300,80400,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
+'587',2300,60200,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3700,0,'Old Vernon Rd',0,5400,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1600,0,'Old Vernon Rd',0,1400,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,9900,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
+'588',2300,60200,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3700,0,'Old Vernon Rd',0,5400,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1600,0,'Old Vernon Rd',0,1400,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,9900,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
+'589',2300,60200,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3700,0,'Old Vernon Rd',0,5400,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1600,0,'Old Vernon Rd',0,1400,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,9900,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_652 b/src/main/res-current/raw/current_gtfs_schedule_stop_652
index 4da5b9c58..0b951007b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_652
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_652
@@ -1,7 +1,7 @@
-'576',2301,83100,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
-'577',2301,55000,,'',0,7700,,'',0,7600,,'',0,3200,0,'Old Vernon Rd',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,0,'Old Vernon Rd',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'578',2301,55000,,'',0,7700,,'',0,7600,,'',0,3200,0,'Old Vernon Rd',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,0,'Old Vernon Rd',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'579',2301,55000,,'',0,7700,,'',0,7600,,'',0,3200,0,'Old Vernon Rd',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,0,'Old Vernon Rd',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'580',2301,55000,,'',0,7700,,'',0,7600,,'',0,3200,0,'Old Vernon Rd',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,0,'Old Vernon Rd',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'581',2301,73600,,'',0,7100,,'',0,3200,,'',0,6600,,'',0,3000,,'',0,6500,0,'Old Vernon Rd',0,3600,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,,'',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2800,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'582',2301,55000,,'',0,7700,,'',0,7600,,'',0,3200,0,'Old Vernon Rd',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,0,'Old Vernon Rd',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'583',2301,55000,,'',0,7700,,'',0,7600,,'',0,3200,0,'Old Vernon Rd',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,0,'Old Vernon Rd',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'584',2301,55000,,'',0,7700,,'',0,7600,,'',0,3200,0,'Old Vernon Rd',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,0,'Old Vernon Rd',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'585',2301,73600,,'',0,7100,,'',0,3200,,'',0,6600,,'',0,3000,,'',0,6500,0,'Old Vernon Rd',0,3600,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,,'',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2800,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'586',2301,83100,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
+'587',2301,55000,,'',0,7700,,'',0,7600,,'',0,3200,0,'Old Vernon Rd',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,0,'Old Vernon Rd',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'588',2301,55000,,'',0,7700,,'',0,7600,,'',0,3200,0,'Old Vernon Rd',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,0,'Old Vernon Rd',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'589',2301,55000,,'',0,7700,,'',0,7600,,'',0,3200,0,'Old Vernon Rd',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,0,'Old Vernon Rd',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_653 b/src/main/res-current/raw/current_gtfs_schedule_stop_653
index de4db0a7a..5e71c5180 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_653
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_653
@@ -1,7 +1,7 @@
-'576',2300,80500,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,5500,,'',0,9400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
-'577',2300,60300,,'',0,3500,,'',0,7000,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
-'578',2300,60300,,'',0,3500,,'',0,7000,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
-'579',2300,60300,,'',0,3500,,'',0,7000,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
-'580',2300,60300,,'',0,3500,,'',0,7000,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
-'581',2300,71200,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8100,0,'Old Vernon Rd',0,1900,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,2700,,'',0,6900,,'',0,7300,,'',0,10200,,'',0,5100,,'',0,10500,,'',0,15100,,'',0,10800,,'',0,11000,,'',0
-'582',2300,60300,,'',0,3500,,'',0,7000,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
+'583',2300,60300,,'',0,3500,,'',0,7000,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
+'584',2300,60300,,'',0,3500,,'',0,7000,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
+'585',2300,71200,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8100,0,'Old Vernon Rd',0,1900,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,2700,,'',0,6900,,'',0,7300,,'',0,10200,,'',0,5100,,'',0,10500,,'',0,15100,,'',0,10800,,'',0,11000,,'',0
+'586',2300,80500,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,5500,,'',0,9400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
+'587',2300,60300,,'',0,3500,,'',0,7000,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
+'588',2300,60300,,'',0,3500,,'',0,7000,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
+'589',2300,60300,,'',0,3500,,'',0,7000,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_654 b/src/main/res-current/raw/current_gtfs_schedule_stop_654
index 8db243531..6ae204f61 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_654
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_654
@@ -1,7 +1,7 @@
-'576',2300,80700,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,5500,,'',0,9400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
-'577',2300,60400,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
-'578',2300,60400,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
-'579',2300,60400,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
-'580',2300,60400,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
-'581',2300,71300,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,5100,,'',0,10400,,'',0,15200,,'',0,10800,,'',0,11000,,'',0
-'582',2300,60400,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
+'583',2300,60400,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
+'584',2300,60400,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
+'585',2300,71300,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,5100,,'',0,10400,,'',0,15200,,'',0,10800,,'',0,11000,,'',0
+'586',2300,80700,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,5500,,'',0,9400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
+'587',2300,60400,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
+'588',2300,60400,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
+'589',2300,60400,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_655 b/src/main/res-current/raw/current_gtfs_schedule_stop_655
index 6d7bf54f0..4e103ff03 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_655
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_655
@@ -1,7 +1,7 @@
-'576',2301,82900,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
-'577',2301,54800,,'',0,7700,,'',0,7600,,'',0,3200,0,'Old Vernon Rd',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,0,'Old Vernon Rd',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'578',2301,54800,,'',0,7700,,'',0,7600,,'',0,3200,0,'Old Vernon Rd',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,0,'Old Vernon Rd',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'579',2301,54800,,'',0,7700,,'',0,7600,,'',0,3200,0,'Old Vernon Rd',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,0,'Old Vernon Rd',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'580',2301,54800,,'',0,7700,,'',0,7600,,'',0,3200,0,'Old Vernon Rd',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,0,'Old Vernon Rd',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'581',2301,73400,,'',0,7100,,'',0,3200,,'',0,6600,,'',0,3000,,'',0,2600,0,'Old Vernon Rd',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,,'',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2800,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'582',2301,54800,,'',0,7700,,'',0,7600,,'',0,3200,0,'Old Vernon Rd',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,0,'Old Vernon Rd',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'583',2301,54800,,'',0,7700,,'',0,7600,,'',0,3200,0,'Old Vernon Rd',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,0,'Old Vernon Rd',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'584',2301,54800,,'',0,7700,,'',0,7600,,'',0,3200,0,'Old Vernon Rd',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,0,'Old Vernon Rd',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'585',2301,73400,,'',0,7100,,'',0,3200,,'',0,6600,,'',0,3000,,'',0,2600,0,'Old Vernon Rd',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,,'',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2800,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'586',2301,82900,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
+'587',2301,54800,,'',0,7700,,'',0,7600,,'',0,3200,0,'Old Vernon Rd',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,0,'Old Vernon Rd',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'588',2301,54800,,'',0,7700,,'',0,7600,,'',0,3200,0,'Old Vernon Rd',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,0,'Old Vernon Rd',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'589',2301,54800,,'',0,7700,,'',0,7600,,'',0,3200,0,'Old Vernon Rd',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,0,'Old Vernon Rd',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_656 b/src/main/res-current/raw/current_gtfs_schedule_stop_656
index bd6ec0bdc..0e5b011c8 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_656
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_656
@@ -1,6 +1,6 @@
-'577',2301,55800,,'',0,7700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'578',2301,55800,,'',0,7700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'579',2301,55800,,'',0,7700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'580',2301,55800,,'',0,7700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'581',2301,94300,,'',0,10100,,'',0,8900,,'',0,22100,,'',0,24700,,'',0,3400,,'',0,9600,,'',0,10000,,'',0,19400,,'',0
-'582',2301,55800,,'',0,7700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'583',2301,55800,,'',0,7700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'584',2301,55800,,'',0,7700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'585',2301,94300,,'',0,10100,,'',0,8900,,'',0,22100,,'',0,24700,,'',0,3400,,'',0,9600,,'',0,10000,,'',0,19400,,'',0
+'587',2301,55800,,'',0,7700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'588',2301,55800,,'',0,7700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'589',2301,55800,,'',0,7700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_657 b/src/main/res-current/raw/current_gtfs_schedule_stop_657
index 5b7b3bfaf..df6d246c3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_657
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_657
@@ -1,7 +1,7 @@
-'576',2301,82900,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
-'577',2301,54800,,'',0,7700,,'',0,7600,,'',0,3100,0,'Old Vernon Rd',0,1800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5600,0,'Old Vernon Rd',0,3500,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'578',2301,54800,,'',0,7700,,'',0,7600,,'',0,3100,0,'Old Vernon Rd',0,1800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5600,0,'Old Vernon Rd',0,3500,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'579',2301,54800,,'',0,7700,,'',0,7600,,'',0,3100,0,'Old Vernon Rd',0,1800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5600,0,'Old Vernon Rd',0,3500,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'580',2301,54800,,'',0,7700,,'',0,7600,,'',0,3100,0,'Old Vernon Rd',0,1800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5600,0,'Old Vernon Rd',0,3500,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'581',2301,73400,,'',0,7100,,'',0,3200,,'',0,6600,,'',0,3000,,'',0,2500,0,'Old Vernon Rd',0,7600,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,,'',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6600,,'',0,2900,,'',0,7100,,'',0,10400,,'',0,9000,,'',0,10500,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'582',2301,54800,,'',0,7700,,'',0,7600,,'',0,3100,0,'Old Vernon Rd',0,1800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5600,0,'Old Vernon Rd',0,3500,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'583',2301,54800,,'',0,7700,,'',0,7600,,'',0,3100,0,'Old Vernon Rd',0,1800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5600,0,'Old Vernon Rd',0,3500,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'584',2301,54800,,'',0,7700,,'',0,7600,,'',0,3100,0,'Old Vernon Rd',0,1800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5600,0,'Old Vernon Rd',0,3500,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'585',2301,73400,,'',0,7100,,'',0,3200,,'',0,6600,,'',0,3000,,'',0,2500,0,'Old Vernon Rd',0,7600,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,,'',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6600,,'',0,2900,,'',0,7100,,'',0,10400,,'',0,9000,,'',0,10500,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'586',2301,82900,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
+'587',2301,54800,,'',0,7700,,'',0,7600,,'',0,3100,0,'Old Vernon Rd',0,1800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5600,0,'Old Vernon Rd',0,3500,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'588',2301,54800,,'',0,7700,,'',0,7600,,'',0,3100,0,'Old Vernon Rd',0,1800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5600,0,'Old Vernon Rd',0,3500,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'589',2301,54800,,'',0,7700,,'',0,7600,,'',0,3100,0,'Old Vernon Rd',0,1800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5600,0,'Old Vernon Rd',0,3500,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_658 b/src/main/res-current/raw/current_gtfs_schedule_stop_658
index 453720916..1c79aa709 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_658
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_658
@@ -1,12 +1,12 @@
-'576',2300,80700,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
-'577',2300,60500,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,9900,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
-'578',2300,60500,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,9900,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
-'579',2300,60500,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,9900,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
-'580',2300,60500,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,9900,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
-'581',2300,71400,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7100,,'',0,2500,,'',0,7600,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8100,0,'Old Vernon Rd',0,1900,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7300,,'',0,10300,,'',0,5100,,'',0,14400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'582',2300,60500,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,9900,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
-'577',2800,65600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'578',2800,65600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'579',2800,65600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'580',2800,65600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'582',2800,65600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'583',2300,60500,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,9900,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
+'584',2300,60500,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,9900,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
+'585',2300,71400,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7100,,'',0,2500,,'',0,7600,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8100,0,'Old Vernon Rd',0,1900,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7300,,'',0,10300,,'',0,5100,,'',0,14400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'586',2300,80700,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
+'587',2300,60500,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,9900,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
+'588',2300,60500,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,9900,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
+'589',2300,60500,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,9900,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
+'583',2800,65600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'584',2800,65600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'587',2800,65600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'588',2800,65600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'589',2800,65600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_659 b/src/main/res-current/raw/current_gtfs_schedule_stop_659
index 41e5715e4..2f9c6c98e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_659
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_659
@@ -1,7 +1,7 @@
-'576',2300,82600,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
-'577',2300,54600,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'578',2300,54600,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'579',2300,54600,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'580',2300,54600,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'581',2300,73200,,'',0,7100,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'582',2300,54600,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'583',2300,54600,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'584',2300,54600,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'585',2300,73200,,'',0,7100,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'586',2300,82600,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
+'587',2300,54600,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'588',2300,54600,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'589',2300,54600,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_66 b/src/main/res-current/raw/current_gtfs_schedule_stop_66
index 4a021862e..83ca08759 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_66
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_66
@@ -1,7 +1,7 @@
-'576',300,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
-'577',300,73300,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'578',300,73300,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'579',300,73300,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'580',300,73300,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'581',300,82000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'582',300,73300,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'583',300,73300,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'584',300,73300,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'585',300,82000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
+'586',300,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
+'587',300,73300,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'588',300,73300,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'589',300,73300,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_660 b/src/main/res-current/raw/current_gtfs_schedule_stop_660
index 2ad1d7b98..e72919b57 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_660
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_660
@@ -1,14 +1,14 @@
-'576',2300,82800,4,'',0,9500,4,'',0,9500,4,'',0,9500,4,'',0,9500,4,'',0,14000,4,'',0,9500,4,'',0,9500,4,'',0,9500,4,'',0,9000,4,'',0,9400,4,'',0,9400,4,'',0,9500,4,'',0,12500,4,'',0,9800,4,'',0
-'576',2301,82800,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
-'577',2300,54700,4,'',0,7700,4,'',0,7600,4,'',0,3200,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,7400,4,'',0,3400,4,'',0,7800,4,'',0,1300,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1300,4,'',0,2100,4,'',0,6800,4,'',0,3500,4,'',0,7500,4,'',0,10000,4,'',0,10500,4,'',0,10000,4,'',0,10600,4,'',0
-'577',2301,54700,,'',0,7700,,'',0,7600,,'',0,3200,0,'Old Vernon Rd',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,0,'Old Vernon Rd',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'578',2300,54700,4,'',0,7700,4,'',0,7600,4,'',0,3200,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,7400,4,'',0,3400,4,'',0,7800,4,'',0,1300,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1300,4,'',0,2100,4,'',0,6800,4,'',0,3500,4,'',0,7500,4,'',0,10000,4,'',0,10500,4,'',0,10000,4,'',0,10600,4,'',0
-'578',2301,54700,,'',0,7700,,'',0,7600,,'',0,3200,0,'Old Vernon Rd',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,0,'Old Vernon Rd',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'579',2300,54700,4,'',0,7700,4,'',0,7600,4,'',0,3200,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,7400,4,'',0,3400,4,'',0,7800,4,'',0,1300,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1300,4,'',0,2100,4,'',0,6800,4,'',0,3500,4,'',0,7500,4,'',0,10000,4,'',0,10500,4,'',0,10000,4,'',0,10600,4,'',0
-'579',2301,54700,,'',0,7700,,'',0,7600,,'',0,3200,0,'Old Vernon Rd',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,0,'Old Vernon Rd',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'580',2300,54700,4,'',0,7700,4,'',0,7600,4,'',0,3200,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,7400,4,'',0,3400,4,'',0,7800,4,'',0,1300,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1300,4,'',0,2100,4,'',0,6800,4,'',0,3500,4,'',0,7500,4,'',0,10000,4,'',0,10500,4,'',0,10000,4,'',0,10600,4,'',0
-'580',2301,54700,,'',0,7700,,'',0,7600,,'',0,3200,0,'Old Vernon Rd',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,0,'Old Vernon Rd',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'581',2300,73300,4,'',0,7100,4,'',0,3000,4,'',0,6800,4,'',0,3000,4,'',0,2600,4,'',0,7500,4,'',0,2400,4,'',0,6500,4,'',0,2500,4,'',0,6700,4,'',0,3000,4,'',0,7000,4,'',0,2900,4,'',0,7100,4,'',0,4000,4,'',0,6000,4,'',0,3600,4,'',0,7400,4,'',0,3000,4,'',0,6700,4,'',0,2800,4,'',0,7200,4,'',0,10300,4,'',0,9100,4,'',0,10400,4,'',0,11200,4,'',0,10800,4,'',0,11000,4,'',0
-'581',2301,73300,,'',0,7100,,'',0,3200,,'',0,6600,,'',0,3000,,'',0,2600,0,'Old Vernon Rd',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,,'',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2800,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'582',2300,54700,4,'',0,7700,4,'',0,7600,4,'',0,3200,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,7400,4,'',0,3400,4,'',0,7800,4,'',0,1300,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1300,4,'',0,2100,4,'',0,6800,4,'',0,3500,4,'',0,7500,4,'',0,10000,4,'',0,10500,4,'',0,10000,4,'',0,10600,4,'',0
-'582',2301,54700,,'',0,7700,,'',0,7600,,'',0,3200,0,'Old Vernon Rd',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,0,'Old Vernon Rd',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'583',2300,54700,4,'',0,7700,4,'',0,7600,4,'',0,3200,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,7400,4,'',0,3400,4,'',0,7800,4,'',0,1300,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1300,4,'',0,2100,4,'',0,6800,4,'',0,3500,4,'',0,7500,4,'',0,10000,4,'',0,10500,4,'',0,10000,4,'',0,10600,4,'',0
+'583',2301,54700,,'',0,7700,,'',0,7600,,'',0,3200,0,'Old Vernon Rd',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,0,'Old Vernon Rd',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'584',2300,54700,4,'',0,7700,4,'',0,7600,4,'',0,3200,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,7400,4,'',0,3400,4,'',0,7800,4,'',0,1300,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1300,4,'',0,2100,4,'',0,6800,4,'',0,3500,4,'',0,7500,4,'',0,10000,4,'',0,10500,4,'',0,10000,4,'',0,10600,4,'',0
+'584',2301,54700,,'',0,7700,,'',0,7600,,'',0,3200,0,'Old Vernon Rd',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,0,'Old Vernon Rd',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'585',2300,73300,4,'',0,7100,4,'',0,3000,4,'',0,6800,4,'',0,3000,4,'',0,2600,4,'',0,7500,4,'',0,2400,4,'',0,6500,4,'',0,2500,4,'',0,6700,4,'',0,3000,4,'',0,7000,4,'',0,2900,4,'',0,7100,4,'',0,4000,4,'',0,6000,4,'',0,3600,4,'',0,7400,4,'',0,3000,4,'',0,6700,4,'',0,2800,4,'',0,7200,4,'',0,10300,4,'',0,9100,4,'',0,10400,4,'',0,11200,4,'',0,10800,4,'',0,11000,4,'',0
+'585',2301,73300,,'',0,7100,,'',0,3200,,'',0,6600,,'',0,3000,,'',0,2600,0,'Old Vernon Rd',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,,'',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2800,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'586',2300,82800,4,'',0,9500,4,'',0,9500,4,'',0,9500,4,'',0,9500,4,'',0,14000,4,'',0,9500,4,'',0,9500,4,'',0,9500,4,'',0,9000,4,'',0,9400,4,'',0,9400,4,'',0,9500,4,'',0,12500,4,'',0,9800,4,'',0
+'586',2301,82800,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
+'587',2300,54700,4,'',0,7700,4,'',0,7600,4,'',0,3200,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,7400,4,'',0,3400,4,'',0,7800,4,'',0,1300,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1300,4,'',0,2100,4,'',0,6800,4,'',0,3500,4,'',0,7500,4,'',0,10000,4,'',0,10500,4,'',0,10000,4,'',0,10600,4,'',0
+'587',2301,54700,,'',0,7700,,'',0,7600,,'',0,3200,0,'Old Vernon Rd',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,0,'Old Vernon Rd',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'588',2300,54700,4,'',0,7700,4,'',0,7600,4,'',0,3200,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,7400,4,'',0,3400,4,'',0,7800,4,'',0,1300,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1300,4,'',0,2100,4,'',0,6800,4,'',0,3500,4,'',0,7500,4,'',0,10000,4,'',0,10500,4,'',0,10000,4,'',0,10600,4,'',0
+'588',2301,54700,,'',0,7700,,'',0,7600,,'',0,3200,0,'Old Vernon Rd',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,0,'Old Vernon Rd',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'589',2300,54700,4,'',0,7700,4,'',0,7600,4,'',0,3200,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,7400,4,'',0,3400,4,'',0,7800,4,'',0,1300,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1300,4,'',0,2100,4,'',0,6800,4,'',0,3500,4,'',0,7500,4,'',0,10000,4,'',0,10500,4,'',0,10000,4,'',0,10600,4,'',0
+'589',2301,54700,,'',0,7700,,'',0,7600,,'',0,3200,0,'Old Vernon Rd',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,0,'Old Vernon Rd',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_661 b/src/main/res-current/raw/current_gtfs_schedule_stop_661
index 919df26c6..e08ec2607 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_661
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_661
@@ -1,12 +1,12 @@
-'576',2300,80900,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,5500,,'',0,9400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
-'577',2300,52900,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10800,,'',0
-'578',2300,52900,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10800,,'',0
-'579',2300,52900,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10800,,'',0
-'580',2300,52900,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10800,,'',0
-'581',2300,71500,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,5100,,'',0,14400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'582',2300,52900,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10800,,'',0
-'577',2800,70600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
-'578',2800,70600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
-'579',2800,70600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
-'580',2800,70600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
-'582',2800,70600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
+'583',2300,52900,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10800,,'',0
+'584',2300,52900,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10800,,'',0
+'585',2300,71500,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,5100,,'',0,14400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'586',2300,80900,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,5500,,'',0,9400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
+'587',2300,52900,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10800,,'',0
+'588',2300,52900,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10800,,'',0
+'589',2300,52900,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10800,,'',0
+'583',2800,70600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
+'584',2800,70600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
+'587',2800,70600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
+'588',2800,70600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
+'589',2800,70600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_662 b/src/main/res-current/raw/current_gtfs_schedule_stop_662
index 078c2689d..73f31ae01 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_662
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_662
@@ -1,7 +1,7 @@
-'576',2300,82500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
-'577',2300,54500,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'578',2300,54500,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'579',2300,54500,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'580',2300,54500,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'581',2300,73100,,'',0,7100,,'',0,2900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'582',2300,54500,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'583',2300,54500,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'584',2300,54500,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'585',2300,73100,,'',0,7100,,'',0,2900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'586',2300,82500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
+'587',2300,54500,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'588',2300,54500,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'589',2300,54500,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_663 b/src/main/res-current/raw/current_gtfs_schedule_stop_663
index 44f5f7307..671986363 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_663
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_663
@@ -1,7 +1,7 @@
-'576',2300,81000,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,5400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
-'577',2300,53000,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
-'578',2300,53000,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
-'579',2300,53000,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
-'580',2300,53000,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
-'581',2300,71600,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,5100,,'',0,14400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'582',2300,53000,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
+'583',2300,53000,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
+'584',2300,53000,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
+'585',2300,71600,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,5100,,'',0,14400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'586',2300,81000,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,5400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
+'587',2300,53000,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
+'588',2300,53000,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
+'589',2300,53000,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_664 b/src/main/res-current/raw/current_gtfs_schedule_stop_664
index c8da1f0f8..f3cd3b747 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_664
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_664
@@ -1,7 +1,7 @@
-'576',2300,81000,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,5400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
-'577',2300,53000,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,2900,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10800,,'',0
-'578',2300,53000,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,2900,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10800,,'',0
-'579',2300,53000,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,2900,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10800,,'',0
-'580',2300,53000,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,2900,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10800,,'',0
-'581',2300,71600,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,5100,,'',0,14400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'582',2300,53000,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,2900,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10800,,'',0
+'583',2300,53000,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,2900,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10800,,'',0
+'584',2300,53000,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,2900,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10800,,'',0
+'585',2300,71600,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,5100,,'',0,14400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'586',2300,81000,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,5400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
+'587',2300,53000,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,2900,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10800,,'',0
+'588',2300,53000,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,2900,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10800,,'',0
+'589',2300,53000,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,2900,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_665 b/src/main/res-current/raw/current_gtfs_schedule_stop_665
index a34854c61..a76329b77 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_665
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_665
@@ -1,7 +1,7 @@
-'576',2201,81400,,'',0,9600,,'',0,22800,,'',0,26900,,'',0,29500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',2201,60700,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9100,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'578',2201,60700,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9100,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'579',2201,60700,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9100,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'580',2201,60700,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9100,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'581',2201,83700,,'',0,11000,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9700,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
-'582',2201,60700,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9100,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'583',2201,60700,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9100,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'584',2201,60700,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9100,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'585',2201,83700,,'',0,11000,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9700,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
+'586',2201,81400,,'',0,9600,,'',0,22800,,'',0,26900,,'',0,29500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',2201,60700,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9100,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'588',2201,60700,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9100,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'589',2201,60700,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9100,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_666 b/src/main/res-current/raw/current_gtfs_schedule_stop_666
index a382e57e1..7e4e40001 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_666
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_666
@@ -1,7 +1,7 @@
-'576',2300,81100,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,5400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
-'577',2300,53100,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
-'578',2300,53100,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
-'579',2300,53100,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
-'580',2300,53100,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
-'581',2300,71700,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,5100,,'',0,14400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'582',2300,53100,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
+'583',2300,53100,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
+'584',2300,53100,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
+'585',2300,71700,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,5100,,'',0,14400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'586',2300,81100,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,5400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
+'587',2300,53100,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
+'588',2300,53100,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
+'589',2300,53100,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_667 b/src/main/res-current/raw/current_gtfs_schedule_stop_667
index 80f944988..06826a67f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_667
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_667
@@ -1,7 +1,7 @@
-'576',2200,84400,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'577',2200,62700,,'',0,2800,,'',0,9600,,'',0,9600,,'',0,17500,,'',0,10000,,'',0,13100,,'',0,10000,,'',0,17100,,'',0,17700,,'',0,5300,,'',0,9200,,'',0,17400,,'',0,13700,,'',0,16500,,'',0
-'578',2200,62700,,'',0,2800,,'',0,9600,,'',0,9600,,'',0,17500,,'',0,10000,,'',0,13100,,'',0,10000,,'',0,17100,,'',0,17700,,'',0,5300,,'',0,9200,,'',0,17400,,'',0,13700,,'',0,16500,,'',0
-'579',2200,62700,,'',0,2800,,'',0,9600,,'',0,9600,,'',0,17500,,'',0,10000,,'',0,13100,,'',0,10000,,'',0,17100,,'',0,17700,,'',0,5300,,'',0,9200,,'',0,17400,,'',0,13700,,'',0,16500,,'',0
-'580',2200,62700,,'',0,2800,,'',0,9600,,'',0,9600,,'',0,17500,,'',0,10000,,'',0,13100,,'',0,10000,,'',0,17100,,'',0,17700,,'',0,5300,,'',0,9200,,'',0,17400,,'',0,13700,,'',0,16500,,'',0
-'581',2200,91100,,'',0,10800,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
-'582',2200,62700,,'',0,2800,,'',0,9600,,'',0,9600,,'',0,17500,,'',0,10000,,'',0,13100,,'',0,10000,,'',0,17100,,'',0,17700,,'',0,5300,,'',0,9200,,'',0,17400,,'',0,13700,,'',0,16500,,'',0
+'583',2200,62700,,'',0,2800,,'',0,9600,,'',0,9600,,'',0,17500,,'',0,10000,,'',0,13100,,'',0,10000,,'',0,17100,,'',0,17700,,'',0,5300,,'',0,9200,,'',0,17400,,'',0,13700,,'',0,16500,,'',0
+'584',2200,62700,,'',0,2800,,'',0,9600,,'',0,9600,,'',0,17500,,'',0,10000,,'',0,13100,,'',0,10000,,'',0,17100,,'',0,17700,,'',0,5300,,'',0,9200,,'',0,17400,,'',0,13700,,'',0,16500,,'',0
+'585',2200,91100,,'',0,10800,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
+'586',2200,84400,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'587',2200,62700,,'',0,2800,,'',0,9600,,'',0,9600,,'',0,17500,,'',0,10000,,'',0,13100,,'',0,10000,,'',0,17100,,'',0,17700,,'',0,5300,,'',0,9200,,'',0,17400,,'',0,13700,,'',0,16500,,'',0
+'588',2200,62700,,'',0,2800,,'',0,9600,,'',0,9600,,'',0,17500,,'',0,10000,,'',0,13100,,'',0,10000,,'',0,17100,,'',0,17700,,'',0,5300,,'',0,9200,,'',0,17400,,'',0,13700,,'',0,16500,,'',0
+'589',2200,62700,,'',0,2800,,'',0,9600,,'',0,9600,,'',0,17500,,'',0,10000,,'',0,13100,,'',0,10000,,'',0,17100,,'',0,17700,,'',0,5300,,'',0,9200,,'',0,17400,,'',0,13700,,'',0,16500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_668 b/src/main/res-current/raw/current_gtfs_schedule_stop_668
index 2e1e28798..fb20b4478 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_668
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_668
@@ -1,7 +1,7 @@
-'576',2300,82400,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
-'577',2300,54300,,'',0,7700,,'',0,3600,,'',0,7200,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2800,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'578',2300,54300,,'',0,7700,,'',0,3600,,'',0,7200,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2800,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'579',2300,54300,,'',0,7700,,'',0,3600,,'',0,7200,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2800,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'580',2300,54300,,'',0,7700,,'',0,3600,,'',0,7200,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2800,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'581',2300,72900,,'',0,7100,,'',0,3000,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2800,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'582',2300,54300,,'',0,7700,,'',0,3600,,'',0,7200,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2800,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'583',2300,54300,,'',0,7700,,'',0,3600,,'',0,7200,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2800,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'584',2300,54300,,'',0,7700,,'',0,3600,,'',0,7200,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2800,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'585',2300,72900,,'',0,7100,,'',0,3000,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2800,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'586',2300,82400,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
+'587',2300,54300,,'',0,7700,,'',0,3600,,'',0,7200,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2800,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'588',2300,54300,,'',0,7700,,'',0,3600,,'',0,7200,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2800,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'589',2300,54300,,'',0,7700,,'',0,3600,,'',0,7200,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2800,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_669 b/src/main/res-current/raw/current_gtfs_schedule_stop_669
index a34854c61..a76329b77 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_669
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_669
@@ -1,7 +1,7 @@
-'576',2201,81400,,'',0,9600,,'',0,22800,,'',0,26900,,'',0,29500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',2201,60700,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9100,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'578',2201,60700,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9100,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'579',2201,60700,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9100,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'580',2201,60700,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9100,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'581',2201,83700,,'',0,11000,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9700,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
-'582',2201,60700,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9100,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'583',2201,60700,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9100,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'584',2201,60700,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9100,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'585',2201,83700,,'',0,11000,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9700,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
+'586',2201,81400,,'',0,9600,,'',0,22800,,'',0,26900,,'',0,29500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',2201,60700,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9100,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'588',2201,60700,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9100,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'589',2201,60700,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9100,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_67 b/src/main/res-current/raw/current_gtfs_schedule_stop_67
index 007223fe8..4138be405 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_67
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_67
@@ -1,7 +1,7 @@
-'576',901,115200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',901,90700,,'',0,22000,,'',0,38000,,'',0
-'578',901,90700,,'',0,22000,,'',0,38000,,'',0
-'579',901,90700,,'',0,22000,,'',0,38000,,'',0
-'580',901,90700,,'',0,22000,,'',0,38000,,'',0
-'581',901,115200,,'',0,8500,,'',0,29000,,'',0,8500,,'',0
-'582',901,90700,,'',0,22000,,'',0,38000,,'',0
+'583',901,90700,,'',0,22000,,'',0,38000,,'',0
+'584',901,90700,,'',0,22000,,'',0,38000,,'',0
+'585',901,115200,,'',0,8500,,'',0,29000,,'',0,8500,,'',0
+'586',901,115200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',901,90700,,'',0,22000,,'',0,38000,,'',0
+'588',901,90700,,'',0,22000,,'',0,38000,,'',0
+'589',901,90700,,'',0,22000,,'',0,38000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_670 b/src/main/res-current/raw/current_gtfs_schedule_stop_670
index fdaf5ca5f..5011e1b54 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_670
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_670
@@ -1,7 +1,7 @@
-'576',2300,82300,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
-'577',2300,54300,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'578',2300,54300,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'579',2300,54300,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'580',2300,54300,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'581',2300,72900,,'',0,7100,,'',0,2900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'582',2300,54300,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'583',2300,54300,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'584',2300,54300,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'585',2300,72900,,'',0,7100,,'',0,2900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'586',2300,82300,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
+'587',2300,54300,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'588',2300,54300,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'589',2300,54300,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_671 b/src/main/res-current/raw/current_gtfs_schedule_stop_671
index 4d62cad98..e2e378d3f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_671
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_671
@@ -1,7 +1,7 @@
-'576',2200,84300,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'577',2200,62700,,'',0,2800,,'',0,9600,,'',0,9600,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,17700,,'',0,5300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16500,,'',0
-'578',2200,62700,,'',0,2800,,'',0,9600,,'',0,9600,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,17700,,'',0,5300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16500,,'',0
-'579',2200,62700,,'',0,2800,,'',0,9600,,'',0,9600,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,17700,,'',0,5300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16500,,'',0
-'580',2200,62700,,'',0,2800,,'',0,9600,,'',0,9600,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,17700,,'',0,5300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16500,,'',0
-'581',2200,91000,,'',0,10800,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
-'582',2200,62700,,'',0,2800,,'',0,9600,,'',0,9600,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,17700,,'',0,5300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16500,,'',0
+'583',2200,62700,,'',0,2800,,'',0,9600,,'',0,9600,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,17700,,'',0,5300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16500,,'',0
+'584',2200,62700,,'',0,2800,,'',0,9600,,'',0,9600,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,17700,,'',0,5300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16500,,'',0
+'585',2200,91000,,'',0,10800,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
+'586',2200,84300,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'587',2200,62700,,'',0,2800,,'',0,9600,,'',0,9600,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,17700,,'',0,5300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16500,,'',0
+'588',2200,62700,,'',0,2800,,'',0,9600,,'',0,9600,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,17700,,'',0,5300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16500,,'',0
+'589',2200,62700,,'',0,2800,,'',0,9600,,'',0,9600,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,17700,,'',0,5300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_672 b/src/main/res-current/raw/current_gtfs_schedule_stop_672
index a34854c61..a76329b77 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_672
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_672
@@ -1,7 +1,7 @@
-'576',2201,81400,,'',0,9600,,'',0,22800,,'',0,26900,,'',0,29500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',2201,60700,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9100,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'578',2201,60700,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9100,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'579',2201,60700,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9100,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'580',2201,60700,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9100,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'581',2201,83700,,'',0,11000,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9700,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
-'582',2201,60700,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9100,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'583',2201,60700,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9100,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'584',2201,60700,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9100,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'585',2201,83700,,'',0,11000,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9700,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
+'586',2201,81400,,'',0,9600,,'',0,22800,,'',0,26900,,'',0,29500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',2201,60700,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9100,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'588',2201,60700,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9100,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'589',2201,60700,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9100,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_67265 b/src/main/res-current/raw/current_gtfs_schedule_stop_67265
index f50d7a7b3..ca1452ece 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_67265
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_67265
@@ -1,5 +1,5 @@
-'577',2601,71700,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,14400,,'',0,10000,,'',0
-'578',2601,71700,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,14400,,'',0,10000,,'',0
-'579',2601,71700,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,14400,,'',0,10000,,'',0
-'580',2601,71700,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,14400,,'',0,10000,,'',0
-'582',2601,71700,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,14400,,'',0,10000,,'',0
+'583',2601,71700,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,14400,,'',0,10000,,'',0
+'584',2601,71700,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,14400,,'',0,10000,,'',0
+'587',2601,71700,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,14400,,'',0,10000,,'',0
+'588',2601,71700,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,14400,,'',0,10000,,'',0
+'589',2601,71700,,'',0,9300,,'',0,69800,,'',0,5000,,'',0,14400,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_673 b/src/main/res-current/raw/current_gtfs_schedule_stop_673
index 5542c41e1..bc4168921 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_673
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_673
@@ -1,7 +1,7 @@
-'576',2300,81200,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,5400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
-'577',2300,53200,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,2900,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
-'578',2300,53200,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,2900,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
-'579',2300,53200,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,2900,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
-'580',2300,53200,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,2900,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
-'581',2300,71800,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'582',2300,53200,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,2900,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
+'583',2300,53200,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,2900,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
+'584',2300,53200,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,2900,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
+'585',2300,71800,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'586',2300,81200,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,5400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
+'587',2300,53200,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,2900,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
+'588',2300,53200,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,2900,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
+'589',2300,53200,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,2900,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_674 b/src/main/res-current/raw/current_gtfs_schedule_stop_674
index c667bf822..f61389b01 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_674
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_674
@@ -1,7 +1,7 @@
-'576',2300,82300,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
-'577',2300,54200,,'',0,7700,,'',0,3600,,'',0,7200,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2800,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'578',2300,54200,,'',0,7700,,'',0,3600,,'',0,7200,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2800,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'579',2300,54200,,'',0,7700,,'',0,3600,,'',0,7200,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2800,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'580',2300,54200,,'',0,7700,,'',0,3600,,'',0,7200,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2800,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'581',2300,72800,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2800,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'582',2300,54200,,'',0,7700,,'',0,3600,,'',0,7200,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2800,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'583',2300,54200,,'',0,7700,,'',0,3600,,'',0,7200,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2800,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'584',2300,54200,,'',0,7700,,'',0,3600,,'',0,7200,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2800,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'585',2300,72800,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2800,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'586',2300,82300,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
+'587',2300,54200,,'',0,7700,,'',0,3600,,'',0,7200,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2800,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'588',2300,54200,,'',0,7700,,'',0,3600,,'',0,7200,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2800,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'589',2300,54200,,'',0,7700,,'',0,3600,,'',0,7200,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2800,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_675 b/src/main/res-current/raw/current_gtfs_schedule_stop_675
index 2a49ae123..73b3008c7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_675
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_675
@@ -1,7 +1,7 @@
-'576',2200,84300,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'577',2200,62600,,'',0,2800,,'',0,9600,,'',0,9600,,'',0,17500,,'',0,10000,,'',0,13100,,'',0,10000,,'',0,17100,,'',0,17700,,'',0,5300,,'',0,9200,,'',0,17400,,'',0,13700,,'',0,16500,,'',0
-'578',2200,62600,,'',0,2800,,'',0,9600,,'',0,9600,,'',0,17500,,'',0,10000,,'',0,13100,,'',0,10000,,'',0,17100,,'',0,17700,,'',0,5300,,'',0,9200,,'',0,17400,,'',0,13700,,'',0,16500,,'',0
-'579',2200,62600,,'',0,2800,,'',0,9600,,'',0,9600,,'',0,17500,,'',0,10000,,'',0,13100,,'',0,10000,,'',0,17100,,'',0,17700,,'',0,5300,,'',0,9200,,'',0,17400,,'',0,13700,,'',0,16500,,'',0
-'580',2200,62600,,'',0,2800,,'',0,9600,,'',0,9600,,'',0,17500,,'',0,10000,,'',0,13100,,'',0,10000,,'',0,17100,,'',0,17700,,'',0,5300,,'',0,9200,,'',0,17400,,'',0,13700,,'',0,16500,,'',0
-'581',2200,90900,,'',0,10900,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
-'582',2200,62600,,'',0,2800,,'',0,9600,,'',0,9600,,'',0,17500,,'',0,10000,,'',0,13100,,'',0,10000,,'',0,17100,,'',0,17700,,'',0,5300,,'',0,9200,,'',0,17400,,'',0,13700,,'',0,16500,,'',0
+'583',2200,62600,,'',0,2800,,'',0,9600,,'',0,9600,,'',0,17500,,'',0,10000,,'',0,13100,,'',0,10000,,'',0,17100,,'',0,17700,,'',0,5300,,'',0,9200,,'',0,17400,,'',0,13700,,'',0,16500,,'',0
+'584',2200,62600,,'',0,2800,,'',0,9600,,'',0,9600,,'',0,17500,,'',0,10000,,'',0,13100,,'',0,10000,,'',0,17100,,'',0,17700,,'',0,5300,,'',0,9200,,'',0,17400,,'',0,13700,,'',0,16500,,'',0
+'585',2200,90900,,'',0,10900,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
+'586',2200,84300,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'587',2200,62600,,'',0,2800,,'',0,9600,,'',0,9600,,'',0,17500,,'',0,10000,,'',0,13100,,'',0,10000,,'',0,17100,,'',0,17700,,'',0,5300,,'',0,9200,,'',0,17400,,'',0,13700,,'',0,16500,,'',0
+'588',2200,62600,,'',0,2800,,'',0,9600,,'',0,9600,,'',0,17500,,'',0,10000,,'',0,13100,,'',0,10000,,'',0,17100,,'',0,17700,,'',0,5300,,'',0,9200,,'',0,17400,,'',0,13700,,'',0,16500,,'',0
+'589',2200,62600,,'',0,2800,,'',0,9600,,'',0,9600,,'',0,17500,,'',0,10000,,'',0,13100,,'',0,10000,,'',0,17100,,'',0,17700,,'',0,5300,,'',0,9200,,'',0,17400,,'',0,13700,,'',0,16500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_676 b/src/main/res-current/raw/current_gtfs_schedule_stop_676
index c8a365df9..f32dc8fc9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_676
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_676
@@ -1,7 +1,7 @@
-'576',2300,81300,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,5400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
-'577',2300,53300,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
-'578',2300,53300,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
-'579',2300,53300,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
-'580',2300,53300,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
-'581',2300,71900,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'582',2300,53300,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
+'583',2300,53300,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
+'584',2300,53300,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
+'585',2300,71900,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'586',2300,81300,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,5400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
+'587',2300,53300,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
+'588',2300,53300,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
+'589',2300,53300,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_677 b/src/main/res-current/raw/current_gtfs_schedule_stop_677
index 52b5df771..c25395947 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_677
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_677
@@ -1,7 +1,7 @@
-'576',2300,82200,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
-'577',2300,54200,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'578',2300,54200,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'579',2300,54200,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'580',2300,54200,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'581',2300,72800,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'582',2300,54200,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'583',2300,54200,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'584',2300,54200,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'585',2300,72800,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'586',2300,82200,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
+'587',2300,54200,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'588',2300,54200,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'589',2300,54200,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_678 b/src/main/res-current/raw/current_gtfs_schedule_stop_678
index b68c6464d..e0f4843b0 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_678
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_678
@@ -1,7 +1,7 @@
-'576',2300,81300,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,5400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
-'577',2300,53300,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,2900,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
-'578',2300,53300,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,2900,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
-'579',2300,53300,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,2900,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
-'580',2300,53300,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,2900,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
-'581',2300,71900,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'582',2300,53300,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,2900,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
+'583',2300,53300,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,2900,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
+'584',2300,53300,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,2900,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
+'585',2300,71900,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'586',2300,81300,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,5400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
+'587',2300,53300,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,2900,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
+'588',2300,53300,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,2900,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
+'589',2300,53300,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,2900,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_679 b/src/main/res-current/raw/current_gtfs_schedule_stop_679
index 0b00f79dc..4718e39e7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_679
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_679
@@ -1,12 +1,12 @@
-'576',2300,81600,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,5500,,'',0,16500,,'',0,9800,,'',0
-'577',2300,53600,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10700,,'',0
-'578',2300,53600,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10700,,'',0
-'579',2300,53600,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10700,,'',0
-'580',2300,53600,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10700,,'',0
-'581',2300,72200,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'582',2300,53600,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10700,,'',0
-'577',2800,70900,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
-'578',2800,70900,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
-'579',2800,70900,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
-'580',2800,70900,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
-'582',2800,70900,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
+'583',2300,53600,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10700,,'',0
+'584',2300,53600,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10700,,'',0
+'585',2300,72200,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'586',2300,81600,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,5500,,'',0,16500,,'',0,9800,,'',0
+'587',2300,53600,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10700,,'',0
+'588',2300,53600,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10700,,'',0
+'589',2300,53600,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10700,,'',0
+'583',2800,70900,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
+'584',2800,70900,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
+'587',2800,70900,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
+'588',2800,70900,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
+'589',2800,70900,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_68 b/src/main/res-current/raw/current_gtfs_schedule_stop_68
index c6aff7bde..7089473df 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_68
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_68
@@ -1,7 +1,7 @@
-'576',900,121500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',900,93200,,'',0,31200,,'',0,28800,,'',0
-'578',900,93200,,'',0,31200,,'',0,28800,,'',0
-'579',900,93200,,'',0,31200,,'',0,28800,,'',0
-'580',900,93200,,'',0,31200,,'',0,28800,,'',0
-'581',900,121500,,'',0,8500,,'',0,20500,,'',0,4500,,'',0
-'582',900,93200,,'',0,31200,,'',0,28800,,'',0
+'583',900,93200,,'',0,31200,,'',0,28800,,'',0
+'584',900,93200,,'',0,31200,,'',0,28800,,'',0
+'585',900,121500,,'',0,8500,,'',0,20500,,'',0,4500,,'',0
+'586',900,121500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',900,93200,,'',0,31200,,'',0,28800,,'',0
+'588',900,93200,,'',0,31200,,'',0,28800,,'',0
+'589',900,93200,,'',0,31200,,'',0,28800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_680 b/src/main/res-current/raw/current_gtfs_schedule_stop_680
index d1d019784..0577f44e5 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_680
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_680
@@ -1,6 +1,6 @@
-'577',2300,55600,,'',0,7500,,'',0,7000,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
-'578',2300,55600,,'',0,7500,,'',0,7000,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
-'579',2300,55600,,'',0,7500,,'',0,7000,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
-'580',2300,55600,,'',0,7500,,'',0,7000,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
-'581',2300,70500,,'',0,9900,,'',0,9800,,'',0,10100,,'',0,55100,,'',0,9700,,'',0,10200,,'',0,29800,,'',0
-'582',2300,55600,,'',0,7500,,'',0,7000,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
+'583',2300,55600,,'',0,7500,,'',0,7000,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
+'584',2300,55600,,'',0,7500,,'',0,7000,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
+'585',2300,70500,,'',0,9900,,'',0,9800,,'',0,10100,,'',0,55100,,'',0,9700,,'',0,10200,,'',0,29800,,'',0
+'587',2300,55600,,'',0,7500,,'',0,7000,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
+'588',2300,55600,,'',0,7500,,'',0,7000,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
+'589',2300,55600,,'',0,7500,,'',0,7000,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_681 b/src/main/res-current/raw/current_gtfs_schedule_stop_681
index 7472cf708..670b33dea 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_681
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_681
@@ -1,7 +1,7 @@
-'576',2300,81600,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,5500,,'',0,16500,,'',0,9800,,'',0
-'577',2300,53600,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'578',2300,53600,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'579',2300,53600,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'580',2300,53600,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'581',2300,72200,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'582',2300,53600,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'583',2300,53600,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'584',2300,53600,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'585',2300,72200,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'586',2300,81600,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,5500,,'',0,16500,,'',0,9800,,'',0
+'587',2300,53600,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'588',2300,53600,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'589',2300,53600,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_682 b/src/main/res-current/raw/current_gtfs_schedule_stop_682
index 71ca33beb..0229a77f2 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_682
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_682
@@ -1,7 +1,7 @@
-'576',2201,81500,,'',0,9600,,'',0,22800,,'',0,26900,,'',0,29500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',2201,72200,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'578',2201,72200,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'579',2201,72200,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'580',2201,72200,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'581',2201,83800,,'',0,11000,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9700,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
-'582',2201,72200,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'583',2201,72200,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'584',2201,72200,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'585',2201,83800,,'',0,11000,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9700,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
+'586',2201,81500,,'',0,9600,,'',0,22800,,'',0,26900,,'',0,29500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',2201,72200,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'588',2201,72200,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'589',2201,72200,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_683 b/src/main/res-current/raw/current_gtfs_schedule_stop_683
index 20f0ec06d..9437c7cc7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_683
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_683
@@ -1,7 +1,7 @@
-'576',2300,81500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,5400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
-'577',2300,53500,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10700,,'',0
-'578',2300,53500,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10700,,'',0
-'579',2300,53500,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10700,,'',0
-'580',2300,53500,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10700,,'',0
-'581',2300,72100,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'582',2300,53500,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10700,,'',0
+'583',2300,53500,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10700,,'',0
+'584',2300,53500,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10700,,'',0
+'585',2300,72100,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'586',2300,81500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,5400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
+'587',2300,53500,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10700,,'',0
+'588',2300,53500,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10700,,'',0
+'589',2300,53500,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_684 b/src/main/res-current/raw/current_gtfs_schedule_stop_684
index 034f08556..3baa4a7e3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_684
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_684
@@ -1,7 +1,7 @@
-'576',2300,81400,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,5400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
-'577',2300,53400,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10700,,'',0
-'578',2300,53400,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10700,,'',0
-'579',2300,53400,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10700,,'',0
-'580',2300,53400,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10700,,'',0
-'581',2300,72000,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'582',2300,53400,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10700,,'',0
+'583',2300,53400,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10700,,'',0
+'584',2300,53400,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10700,,'',0
+'585',2300,72000,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'586',2300,81400,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,5400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
+'587',2300,53400,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10700,,'',0
+'588',2300,53400,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10700,,'',0
+'589',2300,53400,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_685 b/src/main/res-current/raw/current_gtfs_schedule_stop_685
index f0b0784ff..c63728bf2 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_685
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_685
@@ -1,12 +1,12 @@
-'576',2300,81800,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,5500,,'',0,16500,,'',0,9800,,'',0
-'577',2300,53800,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'578',2300,53800,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'579',2300,53800,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'580',2300,53800,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'581',2300,72400,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'582',2300,53800,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'577',2800,71000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
-'578',2800,71000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
-'579',2800,71000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
-'580',2800,71000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
-'582',2800,71000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'583',2300,53800,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'584',2300,53800,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'585',2300,72400,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'586',2300,81800,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,5500,,'',0,16500,,'',0,9800,,'',0
+'587',2300,53800,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'588',2300,53800,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'589',2300,53800,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'583',2800,71000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'584',2800,71000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'587',2800,71000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'588',2800,71000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'589',2800,71000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_686 b/src/main/res-current/raw/current_gtfs_schedule_stop_686
index 685584271..9d465eff9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_686
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_686
@@ -1,14 +1,14 @@
-'576',2200,84100,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'576',2201,81600,,'',0,9600,,'',0,22800,,'',0,26900,,'',0,29500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',2200,65300,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0
-'577',2201,72300,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'578',2200,65300,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0
-'578',2201,72300,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'579',2200,65300,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0
-'579',2201,72300,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'580',2200,65300,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0
-'580',2201,72300,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'581',2200,90500,,'',0,11100,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
-'581',2201,83900,,'',0,11000,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9700,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
-'582',2200,65300,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0
-'582',2201,72300,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'583',2200,65300,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0
+'583',2201,72300,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'584',2200,65300,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0
+'584',2201,72300,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'585',2200,90500,,'',0,11100,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
+'585',2201,83900,,'',0,11000,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9700,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
+'586',2200,84100,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'586',2201,81600,,'',0,9600,,'',0,22800,,'',0,26900,,'',0,29500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',2200,65300,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0
+'587',2201,72300,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'588',2200,65300,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0
+'588',2201,72300,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'589',2200,65300,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0
+'589',2201,72300,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_687 b/src/main/res-current/raw/current_gtfs_schedule_stop_687
index b63d43a51..93705a0f0 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_687
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_687
@@ -1,7 +1,7 @@
-'576',2300,82000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,5500,,'',0,16500,,'',0,9800,,'',0
-'577',2300,54000,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'578',2300,54000,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'579',2300,54000,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'580',2300,54000,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'581',2300,72600,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'582',2300,54000,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'583',2300,54000,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'584',2300,54000,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'585',2300,72600,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'586',2300,82000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,5500,,'',0,16500,,'',0,9800,,'',0
+'587',2300,54000,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'588',2300,54000,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'589',2300,54000,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_688 b/src/main/res-current/raw/current_gtfs_schedule_stop_688
index 0a2547549..399a722ed 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_688
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_688
@@ -1,7 +1,7 @@
-'576',2201,81700,,'',0,9600,,'',0,22800,,'',0,26900,,'',0,29500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',2201,72400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'578',2201,72400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'579',2201,72400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'580',2201,72400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'581',2201,84000,,'',0,11000,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9700,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
-'582',2201,72400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'583',2201,72400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'584',2201,72400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'585',2201,84000,,'',0,11000,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9700,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
+'586',2201,81700,,'',0,9600,,'',0,22800,,'',0,26900,,'',0,29500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',2201,72400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'588',2201,72400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'589',2201,72400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_689 b/src/main/res-current/raw/current_gtfs_schedule_stop_689
index bd0114915..0aaf4a31e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_689
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_689
@@ -1,7 +1,7 @@
-'576',2200,84000,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'577',2200,62500,,'',0,2600,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16600,,'',0
-'578',2200,62500,,'',0,2600,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16600,,'',0
-'579',2200,62500,,'',0,2600,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16600,,'',0
-'580',2200,62500,,'',0,2600,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16600,,'',0
-'581',2200,90400,,'',0,11100,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
-'582',2200,62500,,'',0,2600,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16600,,'',0
+'583',2200,62500,,'',0,2600,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16600,,'',0
+'584',2200,62500,,'',0,2600,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16600,,'',0
+'585',2200,90400,,'',0,11100,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
+'586',2200,84000,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'587',2200,62500,,'',0,2600,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16600,,'',0
+'588',2200,62500,,'',0,2600,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16600,,'',0
+'589',2200,62500,,'',0,2600,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_69 b/src/main/res-current/raw/current_gtfs_schedule_stop_69
index a9fadaabd..acc8eeb78 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_69
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_69
@@ -1,7 +1,7 @@
-'576',1100,81800,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9400,,'',0,10000,,'',0,10000,,'',0
-'577',1100,70000,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'578',1100,70000,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'579',1100,70000,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'580',1100,70000,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'581',1100,80500,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
-'582',1100,70000,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'583',1100,70000,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'584',1100,70000,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'585',1100,80500,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
+'586',1100,81800,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9400,,'',0,10000,,'',0,10000,,'',0
+'587',1100,70000,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'588',1100,70000,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'589',1100,70000,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_690 b/src/main/res-current/raw/current_gtfs_schedule_stop_690
index ce1652247..124f2aab1 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_690
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_690
@@ -1,7 +1,7 @@
-'576',2201,81800,,'',0,9600,,'',0,22800,,'',0,26900,,'',0,29500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',2201,72500,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'578',2201,72500,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'579',2201,72500,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'580',2201,72500,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'581',2201,84100,,'',0,11000,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9700,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
-'582',2201,72500,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'583',2201,72500,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'584',2201,72500,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'585',2201,84100,,'',0,11000,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9700,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
+'586',2201,81800,,'',0,9600,,'',0,22800,,'',0,26900,,'',0,29500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',2201,72500,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'588',2201,72500,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'589',2201,72500,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_691 b/src/main/res-current/raw/current_gtfs_schedule_stop_691
index 2e6a326a1..51ab9422a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_691
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_691
@@ -1,7 +1,7 @@
-'576',2200,83800,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'577',2200,62400,,'',0,2600,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16700,,'',0
-'578',2200,62400,,'',0,2600,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16700,,'',0
-'579',2200,62400,,'',0,2600,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16700,,'',0
-'580',2200,62400,,'',0,2600,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16700,,'',0
-'581',2200,90200,,'',0,11100,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
-'582',2200,62400,,'',0,2600,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16700,,'',0
+'583',2200,62400,,'',0,2600,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16700,,'',0
+'584',2200,62400,,'',0,2600,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16700,,'',0
+'585',2200,90200,,'',0,11100,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
+'586',2200,83800,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'587',2200,62400,,'',0,2600,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16700,,'',0
+'588',2200,62400,,'',0,2600,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16700,,'',0
+'589',2200,62400,,'',0,2600,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_69166 b/src/main/res-current/raw/current_gtfs_schedule_stop_69166
index 06a7976e7..43bb36c72 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_69166
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_69166
@@ -1,7 +1,7 @@
-'576',300,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
-'577',300,73100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'578',300,73100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'579',300,73100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'580',300,73100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'581',300,81800,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'582',300,73100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'583',300,73100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'584',300,73100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'585',300,81800,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
+'586',300,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
+'587',300,73100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'588',300,73100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'589',300,73100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_692 b/src/main/res-current/raw/current_gtfs_schedule_stop_692
index e0bfb1bbb..6fb64205f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_692
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_692
@@ -1,7 +1,7 @@
-'576',2201,81800,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',2201,72500,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'578',2201,72500,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'579',2201,72500,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'580',2201,72500,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'581',2201,84100,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
-'582',2201,72500,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'583',2201,72500,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'584',2201,72500,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'585',2201,84100,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
+'586',2201,81800,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',2201,72500,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'588',2201,72500,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'589',2201,72500,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_693 b/src/main/res-current/raw/current_gtfs_schedule_stop_693
index 3f6eb98fc..11ff0a174 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_693
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_693
@@ -1,7 +1,7 @@
-'576',2201,81900,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',2201,72600,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'578',2201,72600,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'579',2201,72600,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'580',2201,72600,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'581',2201,84200,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
-'582',2201,72600,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'583',2201,72600,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'584',2201,72600,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'585',2201,84200,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
+'586',2201,81900,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',2201,72600,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'588',2201,72600,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'589',2201,72600,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_694 b/src/main/res-current/raw/current_gtfs_schedule_stop_694
index dfc297241..0d0eecb9a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_694
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_694
@@ -1,7 +1,7 @@
-'576',2200,83700,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'577',2200,62400,,'',0,2400,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16800,,'',0
-'578',2200,62400,,'',0,2400,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16800,,'',0
-'579',2200,62400,,'',0,2400,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16800,,'',0
-'580',2200,62400,,'',0,2400,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16800,,'',0
-'581',2200,90100,,'',0,11100,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
-'582',2200,62400,,'',0,2400,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16800,,'',0
+'583',2200,62400,,'',0,2400,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16800,,'',0
+'584',2200,62400,,'',0,2400,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16800,,'',0
+'585',2200,90100,,'',0,11100,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
+'586',2200,83700,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'587',2200,62400,,'',0,2400,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16800,,'',0
+'588',2200,62400,,'',0,2400,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16800,,'',0
+'589',2200,62400,,'',0,2400,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_699 b/src/main/res-current/raw/current_gtfs_schedule_stop_699
index bb5099467..dfac76e70 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_699
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_699
@@ -1,7 +1,7 @@
-'576',2200,83500,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'577',2200,62300,,'',0,2300,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'578',2200,62300,,'',0,2300,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'579',2200,62300,,'',0,2300,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'580',2200,62300,,'',0,2300,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'581',2200,85900,,'',0,15100,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
-'582',2200,62300,,'',0,2300,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'583',2200,62300,,'',0,2300,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'584',2200,62300,,'',0,2300,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'585',2200,85900,,'',0,15100,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
+'586',2200,83500,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'587',2200,62300,,'',0,2300,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'588',2200,62300,,'',0,2300,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'589',2200,62300,,'',0,2300,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_7 b/src/main/res-current/raw/current_gtfs_schedule_stop_7
index 47cdf9f62..765af752d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_7
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_7
@@ -1,21 +1,21 @@
-'576',300,83000,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,10500,,'',0,1000,4,'',0,8800,,'',0,1000,4,'',0,9200,,'',0,1000,4,'',0,16800,,'',0,1000,4,'',0
-'577',300,72800,,'',0,1200,4,'',0,1100,,'',0,5200,4,'',0,1800,,'',0,1300,4,'',0,1600,,'',0,5300,4,'',0,1500,,'',0,1300,4,'',0,49400,,'',0,1300,4,'',0,1400,,'',0,5300,4,'',0,1000,,'',0,1300,4,'',0,2000,,'',0,5300,4,'',0,1600,,'',0,1300,4,'',0,1500,,'',0,1300,4,'',0,5700,,'',0,1300,4,'',0,1200,,'',0,1300,4,'',0,8700,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,9300,,'',0,1200,4,'',0,9300,,'',0,5200,4,'',0
-'578',300,72800,,'',0,1200,4,'',0,1100,,'',0,5200,4,'',0,1800,,'',0,1300,4,'',0,1600,,'',0,5300,4,'',0,1500,,'',0,1300,4,'',0,49400,,'',0,1300,4,'',0,1400,,'',0,5300,4,'',0,1000,,'',0,1300,4,'',0,2000,,'',0,5300,4,'',0,1600,,'',0,1300,4,'',0,1500,,'',0,1300,4,'',0,5700,,'',0,1300,4,'',0,1200,,'',0,1300,4,'',0,8700,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,9300,,'',0,1200,4,'',0,9300,,'',0,5200,4,'',0
-'579',300,72800,,'',0,1200,4,'',0,1100,,'',0,5200,4,'',0,1800,,'',0,1300,4,'',0,1600,,'',0,5300,4,'',0,1500,,'',0,1300,4,'',0,49400,,'',0,1300,4,'',0,1400,,'',0,5300,4,'',0,1000,,'',0,1300,4,'',0,2000,,'',0,5300,4,'',0,1600,,'',0,1300,4,'',0,1500,,'',0,1300,4,'',0,5700,,'',0,1300,4,'',0,1200,,'',0,1300,4,'',0,8700,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,9300,,'',0,1200,4,'',0,9300,,'',0,5200,4,'',0
-'580',300,72800,,'',0,1200,4,'',0,1100,,'',0,5200,4,'',0,1800,,'',0,1300,4,'',0,1600,,'',0,5300,4,'',0,1500,,'',0,1300,4,'',0,49400,,'',0,1300,4,'',0,1400,,'',0,5300,4,'',0,1000,,'',0,1300,4,'',0,2000,,'',0,5300,4,'',0,1600,,'',0,1300,4,'',0,1500,,'',0,1300,4,'',0,5700,,'',0,1300,4,'',0,1200,,'',0,1300,4,'',0,8700,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,9300,,'',0,1200,4,'',0,9300,,'',0,5200,4,'',0
-'581',300,81500,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,1800,,'',0,1200,4,'',0,5800,,'',0,1200,4,'',0,1800,,'',0,1200,4,'',0,5800,,'',0,1200,4,'',0,1800,,'',0,1200,4,'',0,5800,,'',0,1200,4,'',0,1800,,'',0,1200,4,'',0,5800,,'',0,1200,4,'',0,1800,,'',0,1200,4,'',0,5800,,'',0,1200,4,'',0,1800,,'',0,1200,4,'',0,5800,,'',0,1200,4,'',0,1800,,'',0,1200,4,'',0,5800,,'',0,1200,4,'',0,1800,,'',0,1200,4,'',0,6300,,'',0,1000,4,'',0,7000,,'',0,1000,4,'',0,9000,,'',0,1000,4,'',0,9000,,'',0,1000,4,'',0,9000,,'',0,1000,4,'',0,9700,,'',0,1000,4,'',0,9300,,'',0,1000,4,'',0
-'582',300,72800,,'',0,1200,4,'',0,1100,,'',0,5200,4,'',0,1800,,'',0,1300,4,'',0,1600,,'',0,5300,4,'',0,1500,,'',0,1300,4,'',0,49400,,'',0,1300,4,'',0,1400,,'',0,5300,4,'',0,1000,,'',0,1300,4,'',0,2000,,'',0,5300,4,'',0,1600,,'',0,1300,4,'',0,1500,,'',0,1300,4,'',0,5700,,'',0,1300,4,'',0,1200,,'',0,1300,4,'',0,8700,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,9300,,'',0,1200,4,'',0,9300,,'',0,5200,4,'',0
-'576',900,122400,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'576',901,114500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',900,94100,4,'',0,31200,4,'',0,28800,4,'',0
-'577',901,90000,,'',0,22000,,'',0,38000,,'',0
-'578',900,94100,4,'',0,31200,4,'',0,28800,4,'',0
-'578',901,90000,,'',0,22000,,'',0,38000,,'',0
-'579',900,94100,4,'',0,31200,4,'',0,28800,4,'',0
-'579',901,90000,,'',0,22000,,'',0,38000,,'',0
-'580',900,94100,4,'',0,31200,4,'',0,28800,4,'',0
-'580',901,90000,,'',0,22000,,'',0,38000,,'',0
-'581',900,122400,4,'',0,8500,4,'',0,20500,4,'',0,4500,4,'',0
-'581',901,114500,,'',0,8500,,'',0,29000,,'',0,8500,,'',0
-'582',900,94100,4,'',0,31200,4,'',0,28800,4,'',0
-'582',901,90000,,'',0,22000,,'',0,38000,,'',0
+'583',300,72800,,'',0,1200,4,'',0,1100,,'',0,5200,4,'',0,1800,,'',0,1300,4,'',0,1600,,'',0,5300,4,'',0,1500,,'',0,1300,4,'',0,49400,,'',0,1300,4,'',0,1400,,'',0,5300,4,'',0,1000,,'',0,1300,4,'',0,2000,,'',0,5300,4,'',0,1600,,'',0,1300,4,'',0,1500,,'',0,1300,4,'',0,5700,,'',0,1300,4,'',0,1200,,'',0,1300,4,'',0,8700,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,9300,,'',0,1200,4,'',0,9300,,'',0,5200,4,'',0
+'584',300,72800,,'',0,1200,4,'',0,1100,,'',0,5200,4,'',0,1800,,'',0,1300,4,'',0,1600,,'',0,5300,4,'',0,1500,,'',0,1300,4,'',0,49400,,'',0,1300,4,'',0,1400,,'',0,5300,4,'',0,1000,,'',0,1300,4,'',0,2000,,'',0,5300,4,'',0,1600,,'',0,1300,4,'',0,1500,,'',0,1300,4,'',0,5700,,'',0,1300,4,'',0,1200,,'',0,1300,4,'',0,8700,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,9300,,'',0,1200,4,'',0,9300,,'',0,5200,4,'',0
+'585',300,81500,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,1800,,'',0,1200,4,'',0,5800,,'',0,1200,4,'',0,1800,,'',0,1200,4,'',0,5800,,'',0,1200,4,'',0,1800,,'',0,1200,4,'',0,5800,,'',0,1200,4,'',0,1800,,'',0,1200,4,'',0,5800,,'',0,1200,4,'',0,1800,,'',0,1200,4,'',0,5800,,'',0,1200,4,'',0,1800,,'',0,1200,4,'',0,5800,,'',0,1200,4,'',0,1800,,'',0,1200,4,'',0,5800,,'',0,1200,4,'',0,1800,,'',0,1200,4,'',0,6300,,'',0,1000,4,'',0,7000,,'',0,1000,4,'',0,9000,,'',0,1000,4,'',0,9000,,'',0,1000,4,'',0,9000,,'',0,1000,4,'',0,9700,,'',0,1000,4,'',0,9300,,'',0,1000,4,'',0
+'586',300,83000,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,10500,,'',0,1000,4,'',0,8800,,'',0,1000,4,'',0,9200,,'',0,1000,4,'',0,16800,,'',0,1000,4,'',0
+'587',300,72800,,'',0,1200,4,'',0,1100,,'',0,5200,4,'',0,1800,,'',0,1300,4,'',0,1600,,'',0,5300,4,'',0,1500,,'',0,1300,4,'',0,49400,,'',0,1300,4,'',0,1400,,'',0,5300,4,'',0,1000,,'',0,1300,4,'',0,2000,,'',0,5300,4,'',0,1600,,'',0,1300,4,'',0,1500,,'',0,1300,4,'',0,5700,,'',0,1300,4,'',0,1200,,'',0,1300,4,'',0,8700,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,9300,,'',0,1200,4,'',0,9300,,'',0,5200,4,'',0
+'588',300,72800,,'',0,1200,4,'',0,1100,,'',0,5200,4,'',0,1800,,'',0,1300,4,'',0,1600,,'',0,5300,4,'',0,1500,,'',0,1300,4,'',0,49400,,'',0,1300,4,'',0,1400,,'',0,5300,4,'',0,1000,,'',0,1300,4,'',0,2000,,'',0,5300,4,'',0,1600,,'',0,1300,4,'',0,1500,,'',0,1300,4,'',0,5700,,'',0,1300,4,'',0,1200,,'',0,1300,4,'',0,8700,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,9300,,'',0,1200,4,'',0,9300,,'',0,5200,4,'',0
+'589',300,72800,,'',0,1200,4,'',0,1100,,'',0,5200,4,'',0,1800,,'',0,1300,4,'',0,1600,,'',0,5300,4,'',0,1500,,'',0,1300,4,'',0,49400,,'',0,1300,4,'',0,1400,,'',0,5300,4,'',0,1000,,'',0,1300,4,'',0,2000,,'',0,5300,4,'',0,1600,,'',0,1300,4,'',0,1500,,'',0,1300,4,'',0,5700,,'',0,1300,4,'',0,1200,,'',0,1300,4,'',0,8700,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,9300,,'',0,1200,4,'',0,9300,,'',0,5200,4,'',0
+'583',900,94100,4,'',0,31200,4,'',0,28800,4,'',0
+'583',901,90000,,'',0,22000,,'',0,38000,,'',0
+'584',900,94100,4,'',0,31200,4,'',0,28800,4,'',0
+'584',901,90000,,'',0,22000,,'',0,38000,,'',0
+'585',900,122400,4,'',0,8500,4,'',0,20500,4,'',0,4500,4,'',0
+'585',901,114500,,'',0,8500,,'',0,29000,,'',0,8500,,'',0
+'586',900,122400,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'586',901,114500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',900,94100,4,'',0,31200,4,'',0,28800,4,'',0
+'587',901,90000,,'',0,22000,,'',0,38000,,'',0
+'588',900,94100,4,'',0,31200,4,'',0,28800,4,'',0
+'588',901,90000,,'',0,22000,,'',0,38000,,'',0
+'589',900,94100,4,'',0,31200,4,'',0,28800,4,'',0
+'589',901,90000,,'',0,22000,,'',0,38000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_70 b/src/main/res-current/raw/current_gtfs_schedule_stop_70
index 238173c67..4b4458bc9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_70
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_70
@@ -1,14 +1,14 @@
-'576',201,74400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',201,60400,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'578',201,60400,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'579',201,60400,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'580',201,60400,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'581',201,80900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10200,,'',0,10000,,'',0,9600,,'',0
-'582',201,60400,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'576',801,64700,,'',0,27400,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
-'577',801,62700,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5000,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'578',801,62700,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5000,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'579',801,62700,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5000,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'580',801,62700,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5000,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'581',801,64800,,'',0,10200,,'',0,8000,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'582',801,62700,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5000,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'583',201,60400,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'584',201,60400,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'585',201,80900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10200,,'',0,10000,,'',0,9600,,'',0
+'586',201,74400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',201,60400,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'588',201,60400,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'589',201,60400,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'583',801,62700,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5000,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'584',801,62700,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5000,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'585',801,64800,,'',0,10200,,'',0,8000,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
+'586',801,64700,,'',0,27400,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
+'587',801,62700,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5000,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'588',801,62700,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5000,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'589',801,62700,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5000,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_700 b/src/main/res-current/raw/current_gtfs_schedule_stop_700
index 40b6a4450..dc8ed89bf 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_700
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_700
@@ -1,7 +1,7 @@
-'576',2201,82000,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',2201,72700,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,16900,,'',0
-'578',2201,72700,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,16900,,'',0
-'579',2201,72700,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,16900,,'',0
-'580',2201,72700,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,16900,,'',0
-'581',2201,84300,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
-'582',2201,72700,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,16900,,'',0
+'583',2201,72700,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,16900,,'',0
+'584',2201,72700,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,16900,,'',0
+'585',2201,84300,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
+'586',2201,82000,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',2201,72700,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,16900,,'',0
+'588',2201,72700,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,16900,,'',0
+'589',2201,72700,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_701 b/src/main/res-current/raw/current_gtfs_schedule_stop_701
index e005be805..3a0935eab 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_701
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_701
@@ -1,7 +1,7 @@
-'576',2201,82000,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
-'577',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9200,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17600,,'',0,16900,,'',0
-'578',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9200,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17600,,'',0,16900,,'',0
-'579',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9200,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17600,,'',0,16900,,'',0
-'580',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9200,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17600,,'',0,16900,,'',0
-'581',2201,84300,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17500,,'',0,13500,,'',0,9800,,'',0
-'582',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9200,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17600,,'',0,16900,,'',0
+'583',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9200,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17600,,'',0,16900,,'',0
+'584',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9200,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17600,,'',0,16900,,'',0
+'585',2201,84300,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17500,,'',0,13500,,'',0,9800,,'',0
+'586',2201,82000,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
+'587',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9200,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17600,,'',0,16900,,'',0
+'588',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9200,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17600,,'',0,16900,,'',0
+'589',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9200,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17600,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_702 b/src/main/res-current/raw/current_gtfs_schedule_stop_702
index dfde3bb8a..951e7ceb6 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_702
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_702
@@ -1,7 +1,7 @@
-'576',2200,83400,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'577',2200,62200,,'',0,2300,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'578',2200,62200,,'',0,2300,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'579',2200,62200,,'',0,2300,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'580',2200,62200,,'',0,2300,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'581',2200,85800,,'',0,15100,,'',0,10000,,'',0,19400,,'',0,9700,,'',0,13000,,'',0,9800,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
-'582',2200,62200,,'',0,2300,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'583',2200,62200,,'',0,2300,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'584',2200,62200,,'',0,2300,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'585',2200,85800,,'',0,15100,,'',0,10000,,'',0,19400,,'',0,9700,,'',0,13000,,'',0,9800,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
+'586',2200,83400,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'587',2200,62200,,'',0,2300,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'588',2200,62200,,'',0,2300,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'589',2200,62200,,'',0,2300,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_703 b/src/main/res-current/raw/current_gtfs_schedule_stop_703
index e8cda2054..98e5bd203 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_703
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_703
@@ -1,7 +1,7 @@
-'576',2201,82100,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9300,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,16900,,'',0
-'578',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9300,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,16900,,'',0
-'579',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9300,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,16900,,'',0
-'580',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9300,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,16900,,'',0
-'581',2201,84400,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
-'582',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9300,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,16900,,'',0
+'583',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9300,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,16900,,'',0
+'584',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9300,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,16900,,'',0
+'585',2201,84400,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
+'586',2201,82100,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9300,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,16900,,'',0
+'588',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9300,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,16900,,'',0
+'589',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9300,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_704 b/src/main/res-current/raw/current_gtfs_schedule_stop_704
index 92d5ff623..bb8df673b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_704
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_704
@@ -1,7 +1,7 @@
-'576',2201,82100,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
-'577',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9300,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17600,,'',0,16900,,'',0
-'578',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9300,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17600,,'',0,16900,,'',0
-'579',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9300,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17600,,'',0,16900,,'',0
-'580',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9300,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17600,,'',0,16900,,'',0
-'581',2201,84400,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17500,,'',0,13500,,'',0,9800,,'',0
-'582',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9300,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17600,,'',0,16900,,'',0
+'583',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9300,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17600,,'',0,16900,,'',0
+'584',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9300,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17600,,'',0,16900,,'',0
+'585',2201,84400,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17500,,'',0,13500,,'',0,9800,,'',0
+'586',2201,82100,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
+'587',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9300,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17600,,'',0,16900,,'',0
+'588',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9300,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17600,,'',0,16900,,'',0
+'589',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9300,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17600,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_705 b/src/main/res-current/raw/current_gtfs_schedule_stop_705
index 9860a8a29..81c81d923 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_705
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_705
@@ -1,7 +1,7 @@
-'576',2200,83300,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'577',2200,62200,,'',0,2300,,'',0,9500,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'578',2200,62200,,'',0,2300,,'',0,9500,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'579',2200,62200,,'',0,2300,,'',0,9500,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'580',2200,62200,,'',0,2300,,'',0,9500,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'581',2200,85700,,'',0,15100,,'',0,10000,,'',0,19400,,'',0,5700,,'',0,17000,,'',0,9800,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
-'582',2200,62200,,'',0,2300,,'',0,9500,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'583',2200,62200,,'',0,2300,,'',0,9500,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'584',2200,62200,,'',0,2300,,'',0,9500,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'585',2200,85700,,'',0,15100,,'',0,10000,,'',0,19400,,'',0,5700,,'',0,17000,,'',0,9800,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
+'586',2200,83300,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'587',2200,62200,,'',0,2300,,'',0,9500,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'588',2200,62200,,'',0,2300,,'',0,9500,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'589',2200,62200,,'',0,2300,,'',0,9500,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_706 b/src/main/res-current/raw/current_gtfs_schedule_stop_706
index 2f9a537f4..1713b532c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_706
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_706
@@ -1,7 +1,7 @@
-'576',2200,83300,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'577',2200,62100,,'',0,2300,,'',0,9600,,'',0,9300,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'578',2200,62100,,'',0,2300,,'',0,9600,,'',0,9300,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'579',2200,62100,,'',0,2300,,'',0,9600,,'',0,9300,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'580',2200,62100,,'',0,2300,,'',0,9600,,'',0,9300,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'581',2200,85700,,'',0,15100,,'',0,10000,,'',0,19300,,'',0,5700,,'',0,17000,,'',0,9800,,'',0,9600,,'',0,17800,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
-'582',2200,62100,,'',0,2300,,'',0,9600,,'',0,9300,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'583',2200,62100,,'',0,2300,,'',0,9600,,'',0,9300,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'584',2200,62100,,'',0,2300,,'',0,9600,,'',0,9300,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'585',2200,85700,,'',0,15100,,'',0,10000,,'',0,19300,,'',0,5700,,'',0,17000,,'',0,9800,,'',0,9600,,'',0,17800,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
+'586',2200,83300,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'587',2200,62100,,'',0,2300,,'',0,9600,,'',0,9300,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'588',2200,62100,,'',0,2300,,'',0,9600,,'',0,9300,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'589',2200,62100,,'',0,2300,,'',0,9600,,'',0,9300,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_707 b/src/main/res-current/raw/current_gtfs_schedule_stop_707
index 7239cb9f7..7317ed140 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_707
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_707
@@ -1,7 +1,7 @@
-'576',2201,82200,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,16900,,'',0
-'578',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,16900,,'',0
-'579',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,16900,,'',0
-'580',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,16900,,'',0
-'581',2201,84500,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
-'582',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,16900,,'',0
+'583',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,16900,,'',0
+'584',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,16900,,'',0
+'585',2201,84500,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
+'586',2201,82200,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,16900,,'',0
+'588',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,16900,,'',0
+'589',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_708 b/src/main/res-current/raw/current_gtfs_schedule_stop_708
index 5742fb825..dac5c8399 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_708
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_708
@@ -1,7 +1,7 @@
-'576',2200,83200,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'577',2200,62100,,'',0,2300,,'',0,9500,,'',0,9300,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'578',2200,62100,,'',0,2300,,'',0,9500,,'',0,9300,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'579',2200,62100,,'',0,2300,,'',0,9500,,'',0,9300,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'580',2200,62100,,'',0,2300,,'',0,9500,,'',0,9300,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'581',2200,85600,,'',0,15100,,'',0,10000,,'',0,15200,,'',0,9800,,'',0,17000,,'',0,9800,,'',0,9600,,'',0,13800,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
-'582',2200,62100,,'',0,2300,,'',0,9500,,'',0,9300,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'583',2200,62100,,'',0,2300,,'',0,9500,,'',0,9300,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'584',2200,62100,,'',0,2300,,'',0,9500,,'',0,9300,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'585',2200,85600,,'',0,15100,,'',0,10000,,'',0,15200,,'',0,9800,,'',0,17000,,'',0,9800,,'',0,9600,,'',0,13800,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
+'586',2200,83200,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'587',2200,62100,,'',0,2300,,'',0,9500,,'',0,9300,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'588',2200,62100,,'',0,2300,,'',0,9500,,'',0,9300,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'589',2200,62100,,'',0,2300,,'',0,9500,,'',0,9300,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_709 b/src/main/res-current/raw/current_gtfs_schedule_stop_709
index c37352d62..24eb8894a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_709
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_709
@@ -1,7 +1,7 @@
-'576',2201,82200,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0
-'577',2201,61300,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9300,,'',0,9100,,'',0,13700,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13500,,'',0,17600,,'',0,16900,,'',0
-'578',2201,61300,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9300,,'',0,9100,,'',0,13700,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13500,,'',0,17600,,'',0,16900,,'',0
-'579',2201,61300,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9300,,'',0,9100,,'',0,13700,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13500,,'',0,17600,,'',0,16900,,'',0
-'580',2201,61300,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9300,,'',0,9100,,'',0,13700,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13500,,'',0,17600,,'',0,16900,,'',0
-'581',2201,84500,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17600,,'',0,17500,,'',0,5800,,'',0
-'582',2201,61300,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9300,,'',0,9100,,'',0,13700,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13500,,'',0,17600,,'',0,16900,,'',0
+'583',2201,61300,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9300,,'',0,9100,,'',0,13700,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13500,,'',0,17600,,'',0,16900,,'',0
+'584',2201,61300,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9300,,'',0,9100,,'',0,13700,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13500,,'',0,17600,,'',0,16900,,'',0
+'585',2201,84500,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17600,,'',0,17500,,'',0,5800,,'',0
+'586',2201,82200,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0
+'587',2201,61300,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9300,,'',0,9100,,'',0,13700,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13500,,'',0,17600,,'',0,16900,,'',0
+'588',2201,61300,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9300,,'',0,9100,,'',0,13700,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13500,,'',0,17600,,'',0,16900,,'',0
+'589',2201,61300,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9300,,'',0,9100,,'',0,13700,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13500,,'',0,17600,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_71 b/src/main/res-current/raw/current_gtfs_schedule_stop_71
index 4a7f848a0..6d96a0ae5 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_71
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_71
@@ -1,7 +1,7 @@
-'576',800,70300,,'',0,10200,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
-'577',800,60100,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'578',800,60100,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'579',800,60100,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'580',800,60100,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'581',800,70000,,'',0,4500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'582',800,60100,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'583',800,60100,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'584',800,60100,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'585',800,70000,,'',0,4500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
+'586',800,70300,,'',0,10200,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
+'587',800,60100,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'588',800,60100,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'589',800,60100,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_710 b/src/main/res-current/raw/current_gtfs_schedule_stop_710
index 14a7628da..1abe24b77 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_710
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_710
@@ -1,7 +1,7 @@
-'576',2200,83100,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'577',2200,62000,,'',0,2300,,'',0,9500,,'',0,9300,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'578',2200,62000,,'',0,2300,,'',0,9500,,'',0,9300,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'579',2200,62000,,'',0,2300,,'',0,9500,,'',0,9300,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'580',2200,62000,,'',0,2300,,'',0,9500,,'',0,9300,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'581',2200,85500,,'',0,15100,,'',0,10000,,'',0,15100,,'',0,9900,,'',0,17000,,'',0,9800,,'',0,9600,,'',0,13800,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
-'582',2200,62000,,'',0,2300,,'',0,9500,,'',0,9300,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'583',2200,62000,,'',0,2300,,'',0,9500,,'',0,9300,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'584',2200,62000,,'',0,2300,,'',0,9500,,'',0,9300,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'585',2200,85500,,'',0,15100,,'',0,10000,,'',0,15100,,'',0,9900,,'',0,17000,,'',0,9800,,'',0,9600,,'',0,13800,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
+'586',2200,83100,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'587',2200,62000,,'',0,2300,,'',0,9500,,'',0,9300,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'588',2200,62000,,'',0,2300,,'',0,9500,,'',0,9300,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'589',2200,62000,,'',0,2300,,'',0,9500,,'',0,9300,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_711 b/src/main/res-current/raw/current_gtfs_schedule_stop_711
index 571ea9eb9..6e0ee7c07 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_711
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_711
@@ -1,7 +1,7 @@
-'576',2201,82300,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0
-'577',2201,61300,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13700,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13600,,'',0,16900,,'',0
-'578',2201,61300,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13700,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13600,,'',0,16900,,'',0
-'579',2201,61300,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13700,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13600,,'',0,16900,,'',0
-'580',2201,61300,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13700,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13600,,'',0,16900,,'',0
-'581',2201,84600,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17600,,'',0,17500,,'',0,5800,,'',0
-'582',2201,61300,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13700,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13600,,'',0,16900,,'',0
+'583',2201,61300,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13700,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13600,,'',0,16900,,'',0
+'584',2201,61300,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13700,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13600,,'',0,16900,,'',0
+'585',2201,84600,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17600,,'',0,17500,,'',0,5800,,'',0
+'586',2201,82300,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0
+'587',2201,61300,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13700,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13600,,'',0,16900,,'',0
+'588',2201,61300,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13700,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13600,,'',0,16900,,'',0
+'589',2201,61300,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13700,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13600,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_712 b/src/main/res-current/raw/current_gtfs_schedule_stop_712
index 231728fa5..38df333f5 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_712
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_712
@@ -1,7 +1,7 @@
-'576',2200,83100,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'577',2200,61900,,'',0,2300,,'',0,9600,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'578',2200,61900,,'',0,2300,,'',0,9600,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'579',2200,61900,,'',0,2300,,'',0,9600,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'580',2200,61900,,'',0,2300,,'',0,9600,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'581',2200,85400,,'',0,15100,,'',0,10000,,'',0,15100,,'',0,9900,,'',0,16900,,'',0,9900,,'',0,9600,,'',0,13900,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
-'582',2200,61900,,'',0,2300,,'',0,9600,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'583',2200,61900,,'',0,2300,,'',0,9600,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'584',2200,61900,,'',0,2300,,'',0,9600,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'585',2200,85400,,'',0,15100,,'',0,10000,,'',0,15100,,'',0,9900,,'',0,16900,,'',0,9900,,'',0,9600,,'',0,13900,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
+'586',2200,83100,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'587',2200,61900,,'',0,2300,,'',0,9600,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'588',2200,61900,,'',0,2300,,'',0,9600,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'589',2200,61900,,'',0,2300,,'',0,9600,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_713 b/src/main/res-current/raw/current_gtfs_schedule_stop_713
index 4d8acca92..8c8418fee 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_713
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_713
@@ -1,7 +1,7 @@
-'576',2201,82400,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
-'577',2201,61400,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17400,,'',0,13600,,'',0,16900,,'',0
-'578',2201,61400,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17400,,'',0,13600,,'',0,16900,,'',0
-'579',2201,61400,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17400,,'',0,13600,,'',0,16900,,'',0
-'580',2201,61400,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17400,,'',0,13600,,'',0,16900,,'',0
-'581',2201,84700,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17500,,'',0,17500,,'',0,5800,,'',0
-'582',2201,61400,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17400,,'',0,13600,,'',0,16900,,'',0
+'583',2201,61400,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17400,,'',0,13600,,'',0,16900,,'',0
+'584',2201,61400,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17400,,'',0,13600,,'',0,16900,,'',0
+'585',2201,84700,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17500,,'',0,17500,,'',0,5800,,'',0
+'586',2201,82400,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
+'587',2201,61400,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17400,,'',0,13600,,'',0,16900,,'',0
+'588',2201,61400,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17400,,'',0,13600,,'',0,16900,,'',0
+'589',2201,61400,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17400,,'',0,13600,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_714 b/src/main/res-current/raw/current_gtfs_schedule_stop_714
index c8dbb5c07..51eb9f054 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_714
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_714
@@ -1,7 +1,7 @@
-'576',2200,83000,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'577',2200,61900,,'',0,2300,,'',0,9500,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'578',2200,61900,,'',0,2300,,'',0,9500,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'579',2200,61900,,'',0,2300,,'',0,9500,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'580',2200,61900,,'',0,2300,,'',0,9500,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'581',2200,85400,,'',0,15100,,'',0,10000,,'',0,15000,,'',0,9900,,'',0,17000,,'',0,9800,,'',0,9600,,'',0,13900,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
-'582',2200,61900,,'',0,2300,,'',0,9500,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'583',2200,61900,,'',0,2300,,'',0,9500,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'584',2200,61900,,'',0,2300,,'',0,9500,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'585',2200,85400,,'',0,15100,,'',0,10000,,'',0,15000,,'',0,9900,,'',0,17000,,'',0,9800,,'',0,9600,,'',0,13900,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
+'586',2200,83000,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'587',2200,61900,,'',0,2300,,'',0,9500,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'588',2200,61900,,'',0,2300,,'',0,9500,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'589',2200,61900,,'',0,2300,,'',0,9500,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_715 b/src/main/res-current/raw/current_gtfs_schedule_stop_715
index 05ac0778e..21aec3ec6 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_715
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_715
@@ -1,7 +1,7 @@
-'576',2201,82400,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0
-'577',2201,61400,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13700,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13600,,'',0,16900,,'',0
-'578',2201,61400,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13700,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13600,,'',0,16900,,'',0
-'579',2201,61400,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13700,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13600,,'',0,16900,,'',0
-'580',2201,61400,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13700,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13600,,'',0,16900,,'',0
-'581',2201,84700,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17600,,'',0,17500,,'',0,9800,,'',0
-'582',2201,61400,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13700,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13600,,'',0,16900,,'',0
+'583',2201,61400,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13700,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13600,,'',0,16900,,'',0
+'584',2201,61400,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13700,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13600,,'',0,16900,,'',0
+'585',2201,84700,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17600,,'',0,17500,,'',0,9800,,'',0
+'586',2201,82400,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0
+'587',2201,61400,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13700,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13600,,'',0,16900,,'',0
+'588',2201,61400,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13700,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13600,,'',0,16900,,'',0
+'589',2201,61400,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13700,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13600,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_716 b/src/main/res-current/raw/current_gtfs_schedule_stop_716
index 94dc907b9..f53e9a7ba 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_716
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_716
@@ -1,7 +1,7 @@
-'576',2201,82500,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0
-'577',2201,61500,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17400,,'',0,13700,,'',0,16900,,'',0
-'578',2201,61500,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17400,,'',0,13700,,'',0,16900,,'',0
-'579',2201,61500,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17400,,'',0,13700,,'',0,16900,,'',0
-'580',2201,61500,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17400,,'',0,13700,,'',0,16900,,'',0
-'581',2201,84800,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17600,,'',0,17500,,'',0,9800,,'',0
-'582',2201,61500,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17400,,'',0,13700,,'',0,16900,,'',0
+'583',2201,61500,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17400,,'',0,13700,,'',0,16900,,'',0
+'584',2201,61500,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17400,,'',0,13700,,'',0,16900,,'',0
+'585',2201,84800,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17600,,'',0,17500,,'',0,9800,,'',0
+'586',2201,82500,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0
+'587',2201,61500,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17400,,'',0,13700,,'',0,16900,,'',0
+'588',2201,61500,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17400,,'',0,13700,,'',0,16900,,'',0
+'589',2201,61500,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17400,,'',0,13700,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_717 b/src/main/res-current/raw/current_gtfs_schedule_stop_717
index f72ead647..ac6c34823 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_717
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_717
@@ -1,7 +1,7 @@
-'576',2200,82900,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'577',2200,61800,,'',0,2300,,'',0,9500,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'578',2200,61800,,'',0,2300,,'',0,9500,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'579',2200,61800,,'',0,2300,,'',0,9500,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'580',2200,61800,,'',0,2300,,'',0,9500,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'581',2200,85300,,'',0,15100,,'',0,10000,,'',0,14900,,'',0,10000,,'',0,16900,,'',0,9900,,'',0,9600,,'',0,13900,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
-'582',2200,61800,,'',0,2300,,'',0,9500,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'583',2200,61800,,'',0,2300,,'',0,9500,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'584',2200,61800,,'',0,2300,,'',0,9500,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'585',2200,85300,,'',0,15100,,'',0,10000,,'',0,14900,,'',0,10000,,'',0,16900,,'',0,9900,,'',0,9600,,'',0,13900,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
+'586',2200,82900,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'587',2200,61800,,'',0,2300,,'',0,9500,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'588',2200,61800,,'',0,2300,,'',0,9500,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'589',2200,61800,,'',0,2300,,'',0,9500,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_718 b/src/main/res-current/raw/current_gtfs_schedule_stop_718
index 59f6134d4..019118b14 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_718
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_718
@@ -1,7 +1,7 @@
-'576',2201,82600,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0
-'577',2201,61500,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9500,,'',0,9100,,'',0,17600,,'',0,10000,,'',0,13000,,'',0,10100,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17400,,'',0,13700,,'',0,16900,,'',0
-'578',2201,61500,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9500,,'',0,9100,,'',0,17600,,'',0,10000,,'',0,13000,,'',0,10100,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17400,,'',0,13700,,'',0,16900,,'',0
-'579',2201,61500,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9500,,'',0,9100,,'',0,17600,,'',0,10000,,'',0,13000,,'',0,10100,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17400,,'',0,13700,,'',0,16900,,'',0
-'580',2201,61500,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9500,,'',0,9100,,'',0,17600,,'',0,10000,,'',0,13000,,'',0,10100,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17400,,'',0,13700,,'',0,16900,,'',0
-'581',2201,84900,,'',0,15100,,'',0,10000,,'',0,14700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17600,,'',0,17500,,'',0,9800,,'',0
-'582',2201,61500,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9500,,'',0,9100,,'',0,17600,,'',0,10000,,'',0,13000,,'',0,10100,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17400,,'',0,13700,,'',0,16900,,'',0
+'583',2201,61500,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9500,,'',0,9100,,'',0,17600,,'',0,10000,,'',0,13000,,'',0,10100,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17400,,'',0,13700,,'',0,16900,,'',0
+'584',2201,61500,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9500,,'',0,9100,,'',0,17600,,'',0,10000,,'',0,13000,,'',0,10100,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17400,,'',0,13700,,'',0,16900,,'',0
+'585',2201,84900,,'',0,15100,,'',0,10000,,'',0,14700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17600,,'',0,17500,,'',0,9800,,'',0
+'586',2201,82600,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0
+'587',2201,61500,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9500,,'',0,9100,,'',0,17600,,'',0,10000,,'',0,13000,,'',0,10100,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17400,,'',0,13700,,'',0,16900,,'',0
+'588',2201,61500,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9500,,'',0,9100,,'',0,17600,,'',0,10000,,'',0,13000,,'',0,10100,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17400,,'',0,13700,,'',0,16900,,'',0
+'589',2201,61500,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9500,,'',0,9100,,'',0,17600,,'',0,10000,,'',0,13000,,'',0,10100,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17400,,'',0,13700,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_719 b/src/main/res-current/raw/current_gtfs_schedule_stop_719
index 7b9361023..207153e77 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_719
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_719
@@ -1,7 +1,7 @@
-'576',2200,82900,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'577',2200,61700,,'',0,2300,,'',0,9600,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'578',2200,61700,,'',0,2300,,'',0,9600,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'579',2200,61700,,'',0,2300,,'',0,9600,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'580',2200,61700,,'',0,2300,,'',0,9600,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'581',2200,85200,,'',0,15100,,'',0,10000,,'',0,14800,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,9600,,'',0,14000,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
-'582',2200,61700,,'',0,2300,,'',0,9600,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'583',2200,61700,,'',0,2300,,'',0,9600,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'584',2200,61700,,'',0,2300,,'',0,9600,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'585',2200,85200,,'',0,15100,,'',0,10000,,'',0,14800,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,9600,,'',0,14000,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
+'586',2200,82900,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'587',2200,61700,,'',0,2300,,'',0,9600,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'588',2200,61700,,'',0,2300,,'',0,9600,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'589',2200,61700,,'',0,2300,,'',0,9600,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_72 b/src/main/res-current/raw/current_gtfs_schedule_stop_72
index 18f5e384e..cd1152525 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_72
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_72
@@ -1,14 +1,14 @@
-'576',200,82100,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
-'577',200,61600,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'578',200,61600,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'579',200,61600,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'580',200,61600,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'581',200,82000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'582',200,61600,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'576',800,70100,,'',0,10200,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
-'577',800,55900,,'',0,6500,,'',0,2300,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
-'578',800,55900,,'',0,6500,,'',0,2300,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
-'579',800,55900,,'',0,6500,,'',0,2300,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
-'580',800,55900,,'',0,6500,,'',0,2300,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
-'581',800,65900,,'',0,8500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'582',800,55900,,'',0,6500,,'',0,2300,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'583',200,61600,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'584',200,61600,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'585',200,82000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
+'586',200,82100,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
+'587',200,61600,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'588',200,61600,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'589',200,61600,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'583',800,55900,,'',0,6500,,'',0,2300,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'584',800,55900,,'',0,6500,,'',0,2300,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'585',800,65900,,'',0,8500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
+'586',800,70100,,'',0,10200,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
+'587',800,55900,,'',0,6500,,'',0,2300,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'588',800,55900,,'',0,6500,,'',0,2300,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'589',800,55900,,'',0,6500,,'',0,2300,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_720 b/src/main/res-current/raw/current_gtfs_schedule_stop_720
index 789d2e2aa..8e70fa959 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_720
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_720
@@ -1,7 +1,7 @@
-'576',2201,82600,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'577',2201,61500,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9500,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'578',2201,61500,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9500,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'579',2201,61500,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9500,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'580',2201,61500,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9500,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'581',2201,84900,,'',0,15100,,'',0,10000,,'',0,14700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
-'582',2201,61500,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9500,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'583',2201,61500,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9500,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'584',2201,61500,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9500,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'585',2201,84900,,'',0,15100,,'',0,10000,,'',0,14700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
+'586',2201,82600,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'587',2201,61500,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9500,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'588',2201,61500,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9500,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'589',2201,61500,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9500,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_721 b/src/main/res-current/raw/current_gtfs_schedule_stop_721
index c7161a520..e5a754ae6 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_721
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_721
@@ -1,7 +1,7 @@
-'576',2200,82800,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'577',2200,61700,,'',0,2300,,'',0,9500,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'578',2200,61700,,'',0,2300,,'',0,9500,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'579',2200,61700,,'',0,2300,,'',0,9500,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'580',2200,61700,,'',0,2300,,'',0,9500,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'581',2200,85100,,'',0,15100,,'',0,10000,,'',0,14800,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,9600,,'',0,14000,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
-'582',2200,61700,,'',0,2300,,'',0,9500,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'583',2200,61700,,'',0,2300,,'',0,9500,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'584',2200,61700,,'',0,2300,,'',0,9500,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'585',2200,85100,,'',0,15100,,'',0,10000,,'',0,14800,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,9600,,'',0,14000,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
+'586',2200,82800,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'587',2200,61700,,'',0,2300,,'',0,9500,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'588',2200,61700,,'',0,2300,,'',0,9500,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'589',2200,61700,,'',0,2300,,'',0,9500,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_722 b/src/main/res-current/raw/current_gtfs_schedule_stop_722
index 9e18a1807..37096f055 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_722
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_722
@@ -1,7 +1,7 @@
-'576',2200,82700,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'577',2200,61600,,'',0,2300,,'',0,9500,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'578',2200,61600,,'',0,2300,,'',0,9500,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'579',2200,61600,,'',0,2300,,'',0,9500,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'580',2200,61600,,'',0,2300,,'',0,9500,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'581',2200,85000,,'',0,15100,,'',0,10000,,'',0,14800,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,13900,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
-'582',2200,61600,,'',0,2300,,'',0,9500,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'583',2200,61600,,'',0,2300,,'',0,9500,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'584',2200,61600,,'',0,2300,,'',0,9500,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'585',2200,85000,,'',0,15100,,'',0,10000,,'',0,14800,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,13900,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
+'586',2200,82700,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'587',2200,61600,,'',0,2300,,'',0,9500,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'588',2200,61600,,'',0,2300,,'',0,9500,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'589',2200,61600,,'',0,2300,,'',0,9500,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_723 b/src/main/res-current/raw/current_gtfs_schedule_stop_723
index 493d13267..be6dafb22 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_723
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_723
@@ -1,12 +1,12 @@
-'577',2901,155300,0,'',0
-'578',2901,155300,0,'',0
-'579',2901,155300,0,'',0
-'580',2901,155300,0,'',0
-'582',2901,155300,0,'',0
-'576',3000,73300,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'577',3000,55100,,'',0,7300,,'',0,2100,,'',0,1100,,'',0,4900,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5800,,'',0,2400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1500,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1400,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,6400,,'',0,2500,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0
-'578',3000,55100,,'',0,7300,,'',0,2100,,'',0,1100,,'',0,4900,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5800,,'',0,2400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1500,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1400,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,6400,,'',0,2500,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0
-'579',3000,55100,,'',0,7300,,'',0,2100,,'',0,1100,,'',0,4900,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5800,,'',0,2400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1500,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1400,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,6400,,'',0,2500,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0
-'580',3000,55100,,'',0,7300,,'',0,2100,,'',0,1100,,'',0,4900,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5800,,'',0,2400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1500,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1400,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,6400,,'',0,2500,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0
-'581',3000,71400,,'',0,9000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',3000,55100,,'',0,7300,,'',0,2100,,'',0,1100,,'',0,4900,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5800,,'',0,2400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1500,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1400,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,6400,,'',0,2500,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0
+'583',2901,155300,0,'',0
+'584',2901,155300,0,'',0
+'587',2901,155300,0,'',0
+'588',2901,155300,0,'',0
+'589',2901,155300,0,'',0
+'583',3000,55100,,'',0,7300,,'',0,2100,,'',0,1100,,'',0,4900,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5800,,'',0,2400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1500,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1400,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,6400,,'',0,2500,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0
+'584',3000,55100,,'',0,7300,,'',0,2100,,'',0,1100,,'',0,4900,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5800,,'',0,2400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1500,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1400,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,6400,,'',0,2500,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0
+'585',3000,71400,,'',0,9000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',3000,73300,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'587',3000,55100,,'',0,7300,,'',0,2100,,'',0,1100,,'',0,4900,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5800,,'',0,2400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1500,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1400,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,6400,,'',0,2500,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0
+'588',3000,55100,,'',0,7300,,'',0,2100,,'',0,1100,,'',0,4900,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5800,,'',0,2400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1500,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1400,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,6400,,'',0,2500,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0
+'589',3000,55100,,'',0,7300,,'',0,2100,,'',0,1100,,'',0,4900,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5800,,'',0,2400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1500,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1400,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,6400,,'',0,2500,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_724 b/src/main/res-current/raw/current_gtfs_schedule_stop_724
index dcb808c50..389185d4a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_724
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_724
@@ -1,7 +1,7 @@
-'576',3001,82300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',3001,62200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1300,,'',0,5400,0,'Downtown',0,1500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,1700,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5600,,'',0,1800,,'',0,800,0,'Downtown',0,800,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,900,0,'Downtown',0,1000,,'',0,1400,0,'Downtown',0,1400,,'',0,6000,,'',0,2000,,'',0,1400,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,6500,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,8000,0,'Downtown',0
-'578',3001,62200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1300,,'',0,5400,0,'Downtown',0,1500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,1700,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5600,,'',0,1800,,'',0,800,0,'Downtown',0,800,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,900,0,'Downtown',0,1000,,'',0,1400,0,'Downtown',0,1400,,'',0,6000,,'',0,2000,,'',0,1400,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,6500,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,8000,0,'Downtown',0
-'579',3001,62200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1300,,'',0,5400,0,'Downtown',0,1500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,1700,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5600,,'',0,1800,,'',0,800,0,'Downtown',0,800,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,900,0,'Downtown',0,1000,,'',0,1400,0,'Downtown',0,1400,,'',0,6000,,'',0,2000,,'',0,1400,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,6500,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,8000,0,'Downtown',0
-'580',3001,62200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1300,,'',0,5400,0,'Downtown',0,1500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,1700,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5600,,'',0,1800,,'',0,800,0,'Downtown',0,800,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,900,0,'Downtown',0,1000,,'',0,1400,0,'Downtown',0,1400,,'',0,6000,,'',0,2000,,'',0,1400,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,6500,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,8000,0,'Downtown',0
-'581',3001,72300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',3001,62200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1300,,'',0,5400,0,'Downtown',0,1500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,1700,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5600,,'',0,1800,,'',0,800,0,'Downtown',0,800,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,900,0,'Downtown',0,1000,,'',0,1400,0,'Downtown',0,1400,,'',0,6000,,'',0,2000,,'',0,1400,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,6500,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,8000,0,'Downtown',0
+'583',3001,62200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1300,,'',0,5400,0,'Downtown',0,1500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,1700,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5600,,'',0,1800,,'',0,800,0,'Downtown',0,800,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,900,0,'Downtown',0,1000,,'',0,1400,0,'Downtown',0,1400,,'',0,6000,,'',0,2000,,'',0,1400,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,6500,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,8000,0,'Downtown',0
+'584',3001,62200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1300,,'',0,5400,0,'Downtown',0,1500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,1700,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5600,,'',0,1800,,'',0,800,0,'Downtown',0,800,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,900,0,'Downtown',0,1000,,'',0,1400,0,'Downtown',0,1400,,'',0,6000,,'',0,2000,,'',0,1400,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,6500,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,8000,0,'Downtown',0
+'585',3001,72300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',3001,82300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',3001,62200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1300,,'',0,5400,0,'Downtown',0,1500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,1700,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5600,,'',0,1800,,'',0,800,0,'Downtown',0,800,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,900,0,'Downtown',0,1000,,'',0,1400,0,'Downtown',0,1400,,'',0,6000,,'',0,2000,,'',0,1400,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,6500,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,8000,0,'Downtown',0
+'588',3001,62200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1300,,'',0,5400,0,'Downtown',0,1500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,1700,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5600,,'',0,1800,,'',0,800,0,'Downtown',0,800,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,900,0,'Downtown',0,1000,,'',0,1400,0,'Downtown',0,1400,,'',0,6000,,'',0,2000,,'',0,1400,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,6500,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,8000,0,'Downtown',0
+'589',3001,62200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1300,,'',0,5400,0,'Downtown',0,1500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,1700,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5600,,'',0,1800,,'',0,800,0,'Downtown',0,800,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,900,0,'Downtown',0,1000,,'',0,1400,0,'Downtown',0,1400,,'',0,6000,,'',0,2000,,'',0,1400,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,6500,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,8000,0,'Downtown',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_725 b/src/main/res-current/raw/current_gtfs_schedule_stop_725
index 7930549a3..42738d8b7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_725
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_725
@@ -1,14 +1,14 @@
-'576',200,80700,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',200,60200,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'578',200,60200,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'579',200,60200,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'580',200,60200,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'581',200,80600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9400,,'',0,10200,,'',0,10100,,'',0
-'582',200,60200,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'576',1601,90100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
-'577',1601,60100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1601,60100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1601,60100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1601,60100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1601,80200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
-'582',1601,60100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',200,60200,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'584',200,60200,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'585',200,80600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9400,,'',0,10200,,'',0,10100,,'',0
+'586',200,80700,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',200,60200,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'588',200,60200,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'589',200,60200,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'583',1601,60100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1601,60100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1601,80200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
+'586',1601,90100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
+'587',1601,60100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1601,60100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1601,60100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_726 b/src/main/res-current/raw/current_gtfs_schedule_stop_726
index d256a8feb..41d94a0c7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_726
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_726
@@ -1,14 +1,14 @@
-'576',201,80200,,'',0,5500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'577',201,61900,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'578',201,61900,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'579',201,61900,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'580',201,61900,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'581',201,82700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,5600,,'',0
-'582',201,61900,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'576',1601,92600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
-'577',1601,62600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7900,,'',0,2300,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,7500,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5500,,'',0,10000,,'',0
-'578',1601,62600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7900,,'',0,2300,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,7500,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5500,,'',0,10000,,'',0
-'579',1601,62600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7900,,'',0,2300,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,7500,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5500,,'',0,10000,,'',0
-'580',1601,62600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7900,,'',0,2300,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,7500,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5500,,'',0,10000,,'',0
-'581',1601,82700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
-'582',1601,62600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7900,,'',0,2300,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,7500,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5500,,'',0,10000,,'',0
+'583',201,61900,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'584',201,61900,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'585',201,82700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,5600,,'',0
+'586',201,80200,,'',0,5500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'587',201,61900,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'588',201,61900,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'589',201,61900,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'583',1601,62600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7900,,'',0,2300,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,7500,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5500,,'',0,10000,,'',0
+'584',1601,62600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7900,,'',0,2300,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,7500,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5500,,'',0,10000,,'',0
+'585',1601,82700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
+'586',1601,92600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
+'587',1601,62600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7900,,'',0,2300,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,7500,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5500,,'',0,10000,,'',0
+'588',1601,62600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7900,,'',0,2300,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,7500,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5500,,'',0,10000,,'',0
+'589',1601,62600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7900,,'',0,2300,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,7500,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_727 b/src/main/res-current/raw/current_gtfs_schedule_stop_727
index 13822548c..f1fd3204b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_727
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_727
@@ -1,7 +1,7 @@
-'576',1601,90200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
-'577',1601,60200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1601,60200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1601,60200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1601,60200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1601,80300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
-'582',1601,60200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1601,60200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1601,60200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1601,80300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
+'586',1601,90200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
+'587',1601,60200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1601,60200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1601,60200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_728 b/src/main/res-current/raw/current_gtfs_schedule_stop_728
index ad4e59277..19aa1336d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_728
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_728
@@ -1,7 +1,7 @@
-'576',1601,90300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
-'577',1601,60300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1601,60300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1601,60300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1601,60300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1601,80400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
-'582',1601,60300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1601,60300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1601,60300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1601,80400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
+'586',1601,90300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
+'587',1601,60300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1601,60300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1601,60300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_729 b/src/main/res-current/raw/current_gtfs_schedule_stop_729
index a2a6b5fcb..d55c9c3de 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_729
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_729
@@ -1,7 +1,7 @@
-'576',1601,90300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
-'577',1601,60300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1601,60300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1601,60300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1601,60300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1601,80400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
-'582',1601,60300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1601,60300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1601,60300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1601,80400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
+'586',1601,90300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
+'587',1601,60300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1601,60300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1601,60300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_72995 b/src/main/res-current/raw/current_gtfs_schedule_stop_72995
index 98e81c1d1..a11c3f8d4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_72995
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_72995
@@ -1,7 +1,7 @@
-'576',600,91300,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',600,62500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1200,,'',0,2000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'578',600,62500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1200,,'',0,2000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'579',600,62500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1200,,'',0,2000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'580',600,62500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1200,,'',0,2000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'581',600,75900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',600,62500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1200,,'',0,2000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'583',600,62500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1200,,'',0,2000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'584',600,62500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1200,,'',0,2000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'585',600,75900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',600,91300,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',600,62500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1200,,'',0,2000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'588',600,62500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1200,,'',0,2000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'589',600,62500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1200,,'',0,2000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_72996 b/src/main/res-current/raw/current_gtfs_schedule_stop_72996
index 4da71d99f..08bea6149 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_72996
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_72996
@@ -1,7 +1,7 @@
-'576',601,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'577',601,62300,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'578',601,62300,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'579',601,62300,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'580',601,62300,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'581',601,75900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'582',601,62300,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'583',601,62300,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'584',601,62300,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'585',601,75900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
+'586',601,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'587',601,62300,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'588',601,62300,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'589',601,62300,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_72997 b/src/main/res-current/raw/current_gtfs_schedule_stop_72997
index e42774730..f609eda19 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_72997
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_72997
@@ -1,12 +1,12 @@
-'577',1301,73000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,43500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0
-'578',1301,73000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,43500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0
-'579',1301,73000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,43500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0
-'580',1301,73000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,43500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0
-'582',1301,73000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,43500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0
-'576',2301,84000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
-'577',2301,60000,,'',0,3700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'578',2301,60000,,'',0,3700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'579',2301,60000,,'',0,3700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'580',2301,60000,,'',0,3700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'581',2301,74500,,'',0,7100,,'',0,3200,,'',0,6600,,'',0,3100,,'',0,10100,,'',0,6300,,'',0,2600,,'',0,2400,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,2000,,'',0,7700,,'',0,3400,,'',0,6900,,'',0,2700,,'',0,6800,,'',0,3200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,15000,,'',0
-'582',2301,60000,,'',0,3700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'583',1301,73000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,43500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0
+'584',1301,73000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,43500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0
+'587',1301,73000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,43500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0
+'588',1301,73000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,43500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0
+'589',1301,73000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,43500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0
+'583',2301,60000,,'',0,3700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'584',2301,60000,,'',0,3700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'585',2301,74500,,'',0,7100,,'',0,3200,,'',0,6600,,'',0,3100,,'',0,10100,,'',0,6300,,'',0,2600,,'',0,2400,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,2000,,'',0,7700,,'',0,3400,,'',0,6900,,'',0,2700,,'',0,6800,,'',0,3200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,15000,,'',0
+'586',2301,84000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
+'587',2301,60000,,'',0,3700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'588',2301,60000,,'',0,3700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'589',2301,60000,,'',0,3700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_72998 b/src/main/res-current/raw/current_gtfs_schedule_stop_72998
index c9ae8213d..11c324ffb 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_72998
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_72998
@@ -1,12 +1,12 @@
-'577',500,65900,,'',0,7800,,'',0,9800,,'',0,9400,,'',0,60500,,'',0,1500,,'',0,7700,,'',0,9000,,'',0,4000,,'',0
-'578',500,65900,,'',0,7800,,'',0,9800,,'',0,9400,,'',0,60500,,'',0,1500,,'',0,7700,,'',0,9000,,'',0,4000,,'',0
-'579',500,65900,,'',0,7800,,'',0,9800,,'',0,9400,,'',0,60500,,'',0,1500,,'',0,7700,,'',0,9000,,'',0,4000,,'',0
-'580',500,65900,,'',0,7800,,'',0,9800,,'',0,9400,,'',0,60500,,'',0,1500,,'',0,7700,,'',0,9000,,'',0,4000,,'',0
-'582',500,65900,,'',0,7800,,'',0,9800,,'',0,9400,,'',0,60500,,'',0,1500,,'',0,7700,,'',0,9000,,'',0,4000,,'',0
-'576',1001,85100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'577',1001,64700,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'578',1001,64700,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'579',1001,64700,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'580',1001,64700,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'581',1001,82700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',1001,64700,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'583',500,65900,,'',0,7800,,'',0,9800,,'',0,9400,,'',0,60500,,'',0,1500,,'',0,7700,,'',0,9000,,'',0,4000,,'',0
+'584',500,65900,,'',0,7800,,'',0,9800,,'',0,9400,,'',0,60500,,'',0,1500,,'',0,7700,,'',0,9000,,'',0,4000,,'',0
+'587',500,65900,,'',0,7800,,'',0,9800,,'',0,9400,,'',0,60500,,'',0,1500,,'',0,7700,,'',0,9000,,'',0,4000,,'',0
+'588',500,65900,,'',0,7800,,'',0,9800,,'',0,9400,,'',0,60500,,'',0,1500,,'',0,7700,,'',0,9000,,'',0,4000,,'',0
+'589',500,65900,,'',0,7800,,'',0,9800,,'',0,9400,,'',0,60500,,'',0,1500,,'',0,7700,,'',0,9000,,'',0,4000,,'',0
+'583',1001,64700,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'584',1001,64700,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'585',1001,82700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',1001,85100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'587',1001,64700,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'588',1001,64700,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'589',1001,64700,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_72999 b/src/main/res-current/raw/current_gtfs_schedule_stop_72999
index d83e15366..8b3a49d86 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_72999
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_72999
@@ -1,7 +1,7 @@
-'576',700,84500,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'577',700,65500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
-'578',700,65500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
-'579',700,65500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
-'580',700,65500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
-'581',700,80800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',700,65500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
+'583',700,65500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
+'584',700,65500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
+'585',700,80800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',700,84500,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
+'587',700,65500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
+'588',700,65500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
+'589',700,65500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_73 b/src/main/res-current/raw/current_gtfs_schedule_stop_73
index c6cc6aa9b..76ea6b853 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_73
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_73
@@ -1,7 +1,7 @@
-'576',1101,74600,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
-'577',1101,65300,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'578',1101,65300,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'579',1101,65300,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'580',1101,65300,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'581',1101,80700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'582',1101,65300,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'583',1101,65300,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'584',1101,65300,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'585',1101,80700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'586',1101,74600,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
+'587',1101,65300,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'588',1101,65300,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'589',1101,65300,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_730 b/src/main/res-current/raw/current_gtfs_schedule_stop_730
index 4d03e1c16..cdade4dcf 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_730
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_730
@@ -1,7 +1,7 @@
-'576',1601,91900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
-'577',1601,61900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1601,61900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1601,61900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1601,61900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1601,82000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
-'582',1601,61900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1601,61900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1601,61900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1601,82000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
+'586',1601,91900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
+'587',1601,61900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1601,61900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1601,61900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_73000 b/src/main/res-current/raw/current_gtfs_schedule_stop_73000
index 5b6a5ecab..cb929272a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_73000
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_73000
@@ -1,7 +1,7 @@
-'576',701,81800,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'577',701,63200,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
-'578',701,63200,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
-'579',701,63200,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
-'580',701,63200,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
-'581',701,82300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',701,63200,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'583',701,63200,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'584',701,63200,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'585',701,82300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',701,81800,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'587',701,63200,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'588',701,63200,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'589',701,63200,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_731 b/src/main/res-current/raw/current_gtfs_schedule_stop_731
index f3370397d..be8c330c6 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_731
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_731
@@ -1,7 +1,7 @@
-'576',1601,90700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
-'577',1601,60700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11100,,'',0,5900,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1601,60700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11100,,'',0,5900,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1601,60700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11100,,'',0,5900,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1601,60700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11100,,'',0,5900,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1601,80800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
-'582',1601,60700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11100,,'',0,5900,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1601,60700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11100,,'',0,5900,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1601,60700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11100,,'',0,5900,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1601,80800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
+'586',1601,90700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
+'587',1601,60700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11100,,'',0,5900,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1601,60700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11100,,'',0,5900,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1601,60700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11100,,'',0,5900,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_732 b/src/main/res-current/raw/current_gtfs_schedule_stop_732
index 0913d7760..50f3e8fa6 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_732
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_732
@@ -1,7 +1,7 @@
-'576',1601,91800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
-'577',1601,61800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1601,61800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1601,61800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1601,61800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1601,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
-'582',1601,61800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1601,61800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1601,61800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1601,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
+'586',1601,91800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
+'587',1601,61800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1601,61800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1601,61800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_733 b/src/main/res-current/raw/current_gtfs_schedule_stop_733
index 7632adcbd..991061aea 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_733
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_733
@@ -1,7 +1,7 @@
-'576',1601,90800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
-'577',1601,60800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11100,,'',0,5900,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1601,60800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11100,,'',0,5900,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1601,60800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11100,,'',0,5900,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1601,60800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11100,,'',0,5900,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1601,80900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
-'582',1601,60800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11100,,'',0,5900,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1601,60800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11100,,'',0,5900,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1601,60800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11100,,'',0,5900,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1601,80900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
+'586',1601,90800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
+'587',1601,60800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11100,,'',0,5900,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1601,60800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11100,,'',0,5900,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1601,60800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11100,,'',0,5900,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_734 b/src/main/res-current/raw/current_gtfs_schedule_stop_734
index 707afcd03..d01e76401 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_734
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_734
@@ -1,7 +1,7 @@
-'576',1601,91700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
-'577',1601,61700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1601,61700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1601,61700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1601,61700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1601,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
-'582',1601,61700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1601,61700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1601,61700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1601,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
+'586',1601,91700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
+'587',1601,61700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1601,61700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1601,61700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_735 b/src/main/res-current/raw/current_gtfs_schedule_stop_735
index 0b7b5bbc1..4ce4a244f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_735
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_735
@@ -1,7 +1,7 @@
-'576',1601,90900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
-'577',1601,60900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11100,,'',0,5900,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1601,60900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11100,,'',0,5900,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1601,60900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11100,,'',0,5900,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1601,60900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11100,,'',0,5900,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1601,81000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
-'582',1601,60900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11100,,'',0,5900,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1601,60900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11100,,'',0,5900,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1601,60900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11100,,'',0,5900,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1601,81000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
+'586',1601,90900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
+'587',1601,60900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11100,,'',0,5900,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1601,60900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11100,,'',0,5900,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1601,60900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11100,,'',0,5900,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_736 b/src/main/res-current/raw/current_gtfs_schedule_stop_736
index c3143e400..cce3e5199 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_736
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_736
@@ -1,7 +1,7 @@
-'576',1601,91000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
-'577',1601,61000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1601,61000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1601,61000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1601,61000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1601,81100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
-'582',1601,61000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1601,61000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1601,61000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1601,81100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
+'586',1601,91000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
+'587',1601,61000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1601,61000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1601,61000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_737 b/src/main/res-current/raw/current_gtfs_schedule_stop_737
index 7bd186fc1..7120d5419 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_737
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_737
@@ -1,7 +1,7 @@
-'576',1601,91500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
-'577',1601,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2600,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1601,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2600,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1601,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2600,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1601,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2600,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1601,81600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
-'582',1601,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2600,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1601,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2600,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1601,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2600,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1601,81600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
+'586',1601,91500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
+'587',1601,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2600,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1601,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2600,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1601,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2600,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_738 b/src/main/res-current/raw/current_gtfs_schedule_stop_738
index d8a209d15..420b8315f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_738
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_738
@@ -1,7 +1,7 @@
-'576',1601,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
-'577',1601,61400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1601,61400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1601,61400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1601,61400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1601,81500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
-'582',1601,61400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1601,61400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1601,61400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1601,81500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
+'586',1601,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
+'587',1601,61400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1601,61400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1601,61400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_739 b/src/main/res-current/raw/current_gtfs_schedule_stop_739
index a1512901a..7dfcc62cb 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_739
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_739
@@ -1,7 +1,7 @@
-'576',1601,91300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
-'577',1601,61300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1601,61300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1601,61300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1601,61300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1601,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
-'582',1601,61300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1601,61300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1601,61300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1601,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
+'586',1601,91300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
+'587',1601,61300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1601,61300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1601,61300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_74 b/src/main/res-current/raw/current_gtfs_schedule_stop_74
index 4a021862e..83ca08759 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_74
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_74
@@ -1,7 +1,7 @@
-'576',300,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
-'577',300,73300,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'578',300,73300,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'579',300,73300,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'580',300,73300,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'581',300,82000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'582',300,73300,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'583',300,73300,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'584',300,73300,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'585',300,82000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
+'586',300,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
+'587',300,73300,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'588',300,73300,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'589',300,73300,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_740 b/src/main/res-current/raw/current_gtfs_schedule_stop_740
index 919b0c91d..fe8340bec 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_740
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_740
@@ -1,14 +1,14 @@
-'576',1501,85100,,'',0,20000,,'',0,40000,,'',0,27000,,'',0
-'577',1501,72100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'578',1501,72100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'579',1501,72100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'580',1501,72100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'581',1501,95200,,'',0,17000,,'',0,20000,,'',0,20000,,'',0,10200,,'',0,10000,,'',0
-'582',1501,72100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'576',1700,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',1700,62200,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,4800,,'',0,2200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1700,62200,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,4800,,'',0,2200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1700,62200,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,4800,,'',0,2200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1700,62200,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,4800,,'',0,2200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1700,84800,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'582',1700,62200,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,4800,,'',0,2200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1501,72100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'584',1501,72100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'585',1501,95200,,'',0,17000,,'',0,20000,,'',0,20000,,'',0,10200,,'',0,10000,,'',0
+'586',1501,85100,,'',0,20000,,'',0,40000,,'',0,27000,,'',0
+'587',1501,72100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'588',1501,72100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'589',1501,72100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'583',1700,62200,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,4800,,'',0,2200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1700,62200,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,4800,,'',0,2200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1700,84800,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'586',1700,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',1700,62200,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,4800,,'',0,2200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1700,62200,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,4800,,'',0,2200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1700,62200,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,4800,,'',0,2200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_741 b/src/main/res-current/raw/current_gtfs_schedule_stop_741
index e7ecbdfda..d34d37c4b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_741
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_741
@@ -1,14 +1,14 @@
-'576',1501,85000,,'',0,20000,,'',0,40000,,'',0,27000,,'',0
-'577',1501,72000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'578',1501,72000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'579',1501,72000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'580',1501,72000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'581',1501,95100,,'',0,17000,,'',0,20000,,'',0,20000,,'',0,10200,,'',0,10000,,'',0
-'582',1501,72000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'576',1700,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',1700,62100,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,4800,,'',0,2200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1700,62100,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,4800,,'',0,2200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1700,62100,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,4800,,'',0,2200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1700,62100,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,4800,,'',0,2200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1700,84700,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'582',1700,62100,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,4800,,'',0,2200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1501,72000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'584',1501,72000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'585',1501,95100,,'',0,17000,,'',0,20000,,'',0,20000,,'',0,10200,,'',0,10000,,'',0
+'586',1501,85000,,'',0,20000,,'',0,40000,,'',0,27000,,'',0
+'587',1501,72000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'588',1501,72000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'589',1501,72000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'583',1700,62100,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,4800,,'',0,2200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1700,62100,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,4800,,'',0,2200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1700,84700,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'586',1700,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',1700,62100,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,4800,,'',0,2200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1700,62100,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,4800,,'',0,2200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1700,62100,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,4800,,'',0,2200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_742 b/src/main/res-current/raw/current_gtfs_schedule_stop_742
index 4994b116f..2d3db4fed 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_742
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_742
@@ -1,14 +1,14 @@
-'576',1501,83200,,'',0,20000,,'',0,40000,,'',0,27000,,'',0
-'577',1501,70200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'578',1501,70200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'579',1501,70200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'580',1501,70200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'581',1501,93300,,'',0,17000,,'',0,20000,,'',0,20000,,'',0,10200,,'',0,10000,,'',0
-'582',1501,70200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'576',1700,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',1700,60800,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3000,,'',0,800,,'',0,6600,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,1000,,'',0,2000,,'',0,7900,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1700,60800,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3000,,'',0,800,,'',0,6600,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,1000,,'',0,2000,,'',0,7900,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1700,60800,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3000,,'',0,800,,'',0,6600,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,1000,,'',0,2000,,'',0,7900,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1700,60800,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3000,,'',0,800,,'',0,6600,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,1000,,'',0,2000,,'',0,7900,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1700,83300,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'582',1700,60800,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3000,,'',0,800,,'',0,6600,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,1000,,'',0,2000,,'',0,7900,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1501,70200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'584',1501,70200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'585',1501,93300,,'',0,17000,,'',0,20000,,'',0,20000,,'',0,10200,,'',0,10000,,'',0
+'586',1501,83200,,'',0,20000,,'',0,40000,,'',0,27000,,'',0
+'587',1501,70200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'588',1501,70200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'589',1501,70200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'583',1700,60800,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3000,,'',0,800,,'',0,6600,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,1000,,'',0,2000,,'',0,7900,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1700,60800,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3000,,'',0,800,,'',0,6600,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,1000,,'',0,2000,,'',0,7900,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1700,83300,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'586',1700,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',1700,60800,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3000,,'',0,800,,'',0,6600,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,1000,,'',0,2000,,'',0,7900,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1700,60800,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3000,,'',0,800,,'',0,6600,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,1000,,'',0,2000,,'',0,7900,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1700,60800,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3000,,'',0,800,,'',0,6600,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,1000,,'',0,2000,,'',0,7900,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_743 b/src/main/res-current/raw/current_gtfs_schedule_stop_743
index 1f5584f9c..749fd45a9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_743
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_743
@@ -1,14 +1,14 @@
-'576',1501,84900,,'',0,20000,,'',0,40000,,'',0,27000,,'',0
-'577',1501,71900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'578',1501,71900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'579',1501,71900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'580',1501,71900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'581',1501,95000,,'',0,17000,,'',0,20000,,'',0,20000,,'',0,10200,,'',0,10000,,'',0
-'582',1501,71900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'576',1700,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',1700,62000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,4800,,'',0,2200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1700,62000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,4800,,'',0,2200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1700,62000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,4800,,'',0,2200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1700,62000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,4800,,'',0,2200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1700,84600,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'582',1700,62000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,4800,,'',0,2200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1501,71900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'584',1501,71900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'585',1501,95000,,'',0,17000,,'',0,20000,,'',0,20000,,'',0,10200,,'',0,10000,,'',0
+'586',1501,84900,,'',0,20000,,'',0,40000,,'',0,27000,,'',0
+'587',1501,71900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'588',1501,71900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'589',1501,71900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'583',1700,62000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,4800,,'',0,2200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1700,62000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,4800,,'',0,2200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1700,84600,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'586',1700,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',1700,62000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,4800,,'',0,2200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1700,62000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,4800,,'',0,2200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1700,62000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,4800,,'',0,2200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_744 b/src/main/res-current/raw/current_gtfs_schedule_stop_744
index b8a001bf3..4db790684 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_744
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_744
@@ -1,7 +1,7 @@
-'576',1700,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',1700,62000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,4800,,'',0,2200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1700,62000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,4800,,'',0,2200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1700,62000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,4800,,'',0,2200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1700,62000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,4800,,'',0,2200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1700,84600,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'582',1700,62000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,4800,,'',0,2200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1700,62000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,4800,,'',0,2200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1700,62000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,4800,,'',0,2200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1700,84600,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'586',1700,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',1700,62000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,4800,,'',0,2200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1700,62000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,4800,,'',0,2200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1700,62000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,4800,,'',0,2200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_745 b/src/main/res-current/raw/current_gtfs_schedule_stop_745
index 372382f2c..31b83c91a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_745
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_745
@@ -1,7 +1,7 @@
-'576',1700,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',1700,61100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3100,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,1000,,'',0,2000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1700,61100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3100,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,1000,,'',0,2000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1700,61100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3100,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,1000,,'',0,2000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1700,61100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3100,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,1000,,'',0,2000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1700,83500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'582',1700,61100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3100,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,1000,,'',0,2000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1700,61100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3100,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,1000,,'',0,2000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1700,61100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3100,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,1000,,'',0,2000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1700,83500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'586',1700,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',1700,61100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3100,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,1000,,'',0,2000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1700,61100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3100,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,1000,,'',0,2000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1700,61100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3100,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,1000,,'',0,2000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_746 b/src/main/res-current/raw/current_gtfs_schedule_stop_746
index 8959dac56..0a3491e72 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_746
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_746
@@ -1,7 +1,7 @@
-'576',1700,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',1700,62000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1700,62000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1700,62000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1700,62000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1700,84500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'582',1700,62000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1700,62000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1700,62000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1700,84500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'586',1700,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',1700,62000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1700,62000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1700,62000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_747 b/src/main/res-current/raw/current_gtfs_schedule_stop_747
index ea8bde99c..48fac7ad3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_747
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_747
@@ -1,7 +1,7 @@
-'576',1700,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',1700,61100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6600,,'',0,3100,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,1000,,'',0,2000,,'',0,7700,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1700,61100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6600,,'',0,3100,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,1000,,'',0,2000,,'',0,7700,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1700,61100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6600,,'',0,3100,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,1000,,'',0,2000,,'',0,7700,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1700,61100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6600,,'',0,3100,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,1000,,'',0,2000,,'',0,7700,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1700,83500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'582',1700,61100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6600,,'',0,3100,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,1000,,'',0,2000,,'',0,7700,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1700,61100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6600,,'',0,3100,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,1000,,'',0,2000,,'',0,7700,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1700,61100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6600,,'',0,3100,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,1000,,'',0,2000,,'',0,7700,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1700,83500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'586',1700,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',1700,61100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6600,,'',0,3100,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,1000,,'',0,2000,,'',0,7700,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1700,61100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6600,,'',0,3100,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,1000,,'',0,2000,,'',0,7700,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1700,61100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6600,,'',0,3100,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,1000,,'',0,2000,,'',0,7700,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_748 b/src/main/res-current/raw/current_gtfs_schedule_stop_748
index 1076ebb98..5c5e7447b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_748
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_748
@@ -1,7 +1,7 @@
-'576',1700,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',1700,61200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,1000,,'',0,2000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1700,61200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,1000,,'',0,2000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1700,61200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,1000,,'',0,2000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1700,61200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,1000,,'',0,2000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1700,83600,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'582',1700,61200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,1000,,'',0,2000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1700,61200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,1000,,'',0,2000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1700,61200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,1000,,'',0,2000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1700,83600,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'586',1700,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',1700,61200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,1000,,'',0,2000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1700,61200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,1000,,'',0,2000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1700,61200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,1000,,'',0,2000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_749 b/src/main/res-current/raw/current_gtfs_schedule_stop_749
index 3a3a04258..696d6e449 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_749
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_749
@@ -1,7 +1,7 @@
-'576',1700,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',1700,61200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,1000,,'',0,2000,,'',0,7700,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1700,61200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,1000,,'',0,2000,,'',0,7700,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1700,61200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,1000,,'',0,2000,,'',0,7700,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1700,61200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,1000,,'',0,2000,,'',0,7700,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1700,83600,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'582',1700,61200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,1000,,'',0,2000,,'',0,7700,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1700,61200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,1000,,'',0,2000,,'',0,7700,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1700,61200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,1000,,'',0,2000,,'',0,7700,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1700,83600,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'586',1700,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',1700,61200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,1000,,'',0,2000,,'',0,7700,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1700,61200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,1000,,'',0,2000,,'',0,7700,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1700,61200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,1000,,'',0,2000,,'',0,7700,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_74943 b/src/main/res-current/raw/current_gtfs_schedule_stop_74943
index 8c1e07415..1ce7e9dce 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_74943
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_74943
@@ -1,7 +1,7 @@
-'576',200,81200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'577',200,60700,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'578',200,60700,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'579',200,60700,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'580',200,60700,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'581',200,81100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'582',200,60700,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'583',200,60700,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'584',200,60700,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'585',200,81100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
+'586',200,81200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'587',200,60700,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'588',200,60700,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'589',200,60700,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_750 b/src/main/res-current/raw/current_gtfs_schedule_stop_750
index 34b3d51b1..4dcddba2a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_750
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_750
@@ -1,7 +1,7 @@
-'576',1700,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',1700,61900,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1700,61900,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1700,61900,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1700,61900,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1700,84400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'582',1700,61900,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1700,61900,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1700,61900,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1700,84400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'586',1700,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',1700,61900,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1700,61900,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1700,61900,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_751 b/src/main/res-current/raw/current_gtfs_schedule_stop_751
index 2676eb15e..09b0043e6 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_751
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_751
@@ -1,7 +1,7 @@
-'576',1700,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',1700,61300,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,1000,,'',0,2000,,'',0,7700,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1700,61300,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,1000,,'',0,2000,,'',0,7700,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1700,61300,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,1000,,'',0,2000,,'',0,7700,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1700,61300,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,1000,,'',0,2000,,'',0,7700,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1700,83700,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'582',1700,61300,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,1000,,'',0,2000,,'',0,7700,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1700,61300,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,1000,,'',0,2000,,'',0,7700,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1700,61300,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,1000,,'',0,2000,,'',0,7700,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1700,83700,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'586',1700,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',1700,61300,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,1000,,'',0,2000,,'',0,7700,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1700,61300,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,1000,,'',0,2000,,'',0,7700,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1700,61300,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,1000,,'',0,2000,,'',0,7700,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_753 b/src/main/res-current/raw/current_gtfs_schedule_stop_753
index c54ad23d9..e0a229842 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_753
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_753
@@ -1,7 +1,7 @@
-'576',1700,84000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',1700,61700,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,2900,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1700,61700,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,2900,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1700,61700,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,2900,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1700,61700,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,2900,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1700,84100,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'582',1700,61700,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,2900,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1700,61700,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,2900,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1700,61700,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,2900,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1700,84100,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'586',1700,84000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',1700,61700,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,2900,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1700,61700,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,2900,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1700,61700,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,2900,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_754 b/src/main/res-current/raw/current_gtfs_schedule_stop_754
index 09fca0d14..7e8f783a8 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_754
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_754
@@ -1,14 +1,14 @@
-'576',2200,82700,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'576',2201,82700,4,'',0,9700,4,'',0,22800,4,'',0,26900,4,'',0,29400,4,'',0,20000,4,'',0,10300,4,'',0,10000,4,'',0,10000,4,'',0
-'577',2200,61600,,'',0,2300,,'',0,9500,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'577',2201,61600,4,'',0,2300,4,'',0,9500,4,'',0,9100,4,'',0,17700,4,'',0,10000,4,'',0,13000,4,'',0,10000,4,'',0,17100,4,'',0,14000,4,'',0,9300,4,'',0,9300,4,'',0,17500,4,'',0,13700,4,'',0,16900,4,'',0
-'578',2200,61600,,'',0,2300,,'',0,9500,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'578',2201,61600,4,'',0,2300,4,'',0,9500,4,'',0,9100,4,'',0,17700,4,'',0,10000,4,'',0,13000,4,'',0,10000,4,'',0,17100,4,'',0,14000,4,'',0,9300,4,'',0,9300,4,'',0,17500,4,'',0,13700,4,'',0,16900,4,'',0
-'579',2200,61600,,'',0,2300,,'',0,9500,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'579',2201,61600,4,'',0,2300,4,'',0,9500,4,'',0,9100,4,'',0,17700,4,'',0,10000,4,'',0,13000,4,'',0,10000,4,'',0,17100,4,'',0,14000,4,'',0,9300,4,'',0,9300,4,'',0,17500,4,'',0,13700,4,'',0,16900,4,'',0
-'580',2200,61600,,'',0,2300,,'',0,9500,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'580',2201,61600,4,'',0,2300,4,'',0,9500,4,'',0,9100,4,'',0,17700,4,'',0,10000,4,'',0,13000,4,'',0,10000,4,'',0,17100,4,'',0,14000,4,'',0,9300,4,'',0,9300,4,'',0,17500,4,'',0,13700,4,'',0,16900,4,'',0
-'581',2200,85000,,'',0,15100,,'',0,10000,,'',0,14700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
-'581',2201,85000,4,'',0,15100,4,'',0,10000,4,'',0,14700,4,'',0,10200,4,'',0,16800,4,'',0,10000,4,'',0,9600,4,'',0,14000,4,'',0,17700,4,'',0,17500,4,'',0,9800,4,'',0
-'582',2200,61600,,'',0,2300,,'',0,9500,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'582',2201,61600,4,'',0,2300,4,'',0,9500,4,'',0,9100,4,'',0,17700,4,'',0,10000,4,'',0,13000,4,'',0,10000,4,'',0,17100,4,'',0,14000,4,'',0,9300,4,'',0,9300,4,'',0,17500,4,'',0,13700,4,'',0,16900,4,'',0
+'583',2200,61600,,'',0,2300,,'',0,9500,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'583',2201,61600,4,'',0,2300,4,'',0,9500,4,'',0,9100,4,'',0,17700,4,'',0,10000,4,'',0,13000,4,'',0,10000,4,'',0,17100,4,'',0,14000,4,'',0,9300,4,'',0,9300,4,'',0,17500,4,'',0,13700,4,'',0,16900,4,'',0
+'584',2200,61600,,'',0,2300,,'',0,9500,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'584',2201,61600,4,'',0,2300,4,'',0,9500,4,'',0,9100,4,'',0,17700,4,'',0,10000,4,'',0,13000,4,'',0,10000,4,'',0,17100,4,'',0,14000,4,'',0,9300,4,'',0,9300,4,'',0,17500,4,'',0,13700,4,'',0,16900,4,'',0
+'585',2200,85000,,'',0,15100,,'',0,10000,,'',0,14700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
+'585',2201,85000,4,'',0,15100,4,'',0,10000,4,'',0,14700,4,'',0,10200,4,'',0,16800,4,'',0,10000,4,'',0,9600,4,'',0,14000,4,'',0,17700,4,'',0,17500,4,'',0,9800,4,'',0
+'586',2200,82700,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'586',2201,82700,4,'',0,9700,4,'',0,22800,4,'',0,26900,4,'',0,29400,4,'',0,20000,4,'',0,10300,4,'',0,10000,4,'',0,10000,4,'',0
+'587',2200,61600,,'',0,2300,,'',0,9500,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'587',2201,61600,4,'',0,2300,4,'',0,9500,4,'',0,9100,4,'',0,17700,4,'',0,10000,4,'',0,13000,4,'',0,10000,4,'',0,17100,4,'',0,14000,4,'',0,9300,4,'',0,9300,4,'',0,17500,4,'',0,13700,4,'',0,16900,4,'',0
+'588',2200,61600,,'',0,2300,,'',0,9500,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'588',2201,61600,4,'',0,2300,4,'',0,9500,4,'',0,9100,4,'',0,17700,4,'',0,10000,4,'',0,13000,4,'',0,10000,4,'',0,17100,4,'',0,14000,4,'',0,9300,4,'',0,9300,4,'',0,17500,4,'',0,13700,4,'',0,16900,4,'',0
+'589',2200,61600,,'',0,2300,,'',0,9500,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'589',2201,61600,4,'',0,2300,4,'',0,9500,4,'',0,9100,4,'',0,17700,4,'',0,10000,4,'',0,13000,4,'',0,10000,4,'',0,17100,4,'',0,14000,4,'',0,9300,4,'',0,9300,4,'',0,17500,4,'',0,13700,4,'',0,16900,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_755 b/src/main/res-current/raw/current_gtfs_schedule_stop_755
index 60361ce42..894229f67 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_755
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_755
@@ -1,5 +1,5 @@
-'577',1301,72500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'578',1301,72500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'579',1301,72500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'580',1301,72500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'582',1301,72500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'583',1301,72500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'584',1301,72500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'587',1301,72500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'588',1301,72500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'589',1301,72500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_758 b/src/main/res-current/raw/current_gtfs_schedule_stop_758
index ff4b92af8..3898eb378 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_758
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_758
@@ -1,5 +1,5 @@
-'577',1300,72300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'578',1300,72300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'579',1300,72300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'580',1300,72300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'582',1300,72300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'583',1300,72300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'584',1300,72300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'587',1300,72300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'588',1300,72300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'589',1300,72300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_759 b/src/main/res-current/raw/current_gtfs_schedule_stop_759
index aa898d677..c35621056 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_759
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_759
@@ -1,5 +1,5 @@
-'577',1301,72600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'578',1301,72600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'579',1301,72600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'580',1301,72600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'582',1301,72600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'583',1301,72600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'584',1301,72600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'587',1301,72600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'588',1301,72600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'589',1301,72600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_76 b/src/main/res-current/raw/current_gtfs_schedule_stop_76
index 4a021862e..83ca08759 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_76
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_76
@@ -1,7 +1,7 @@
-'576',300,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
-'577',300,73300,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'578',300,73300,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'579',300,73300,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'580',300,73300,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'581',300,82000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'582',300,73300,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'583',300,73300,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'584',300,73300,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'585',300,82000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
+'586',300,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
+'587',300,73300,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'588',300,73300,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'589',300,73300,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_760 b/src/main/res-current/raw/current_gtfs_schedule_stop_760
index 0c5182c70..1df9a7d93 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_760
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_760
@@ -1,5 +1,5 @@
-'577',1301,72400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'578',1301,72400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'579',1301,72400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'580',1301,72400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'582',1301,72400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'583',1301,72400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'584',1301,72400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'587',1301,72400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'588',1301,72400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'589',1301,72400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_761 b/src/main/res-current/raw/current_gtfs_schedule_stop_761
index ff4b92af8..3898eb378 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_761
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_761
@@ -1,5 +1,5 @@
-'577',1300,72300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'578',1300,72300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'579',1300,72300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'580',1300,72300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'582',1300,72300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'583',1300,72300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'584',1300,72300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'587',1300,72300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'588',1300,72300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'589',1300,72300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_762 b/src/main/res-current/raw/current_gtfs_schedule_stop_762
index 397463227..554ccc82e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_762
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_762
@@ -1,10 +1,10 @@
-'577',1300,72400,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,47500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6500,4,'',0,21500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0
-'577',1301,72400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'578',1300,72400,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,47500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6500,4,'',0,21500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0
-'578',1301,72400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'579',1300,72400,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,47500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6500,4,'',0,21500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0
-'579',1301,72400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'580',1300,72400,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,47500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6500,4,'',0,21500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0
-'580',1301,72400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'582',1300,72400,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,47500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6500,4,'',0,21500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0
-'582',1301,72400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'583',1300,72400,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,47500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6500,4,'',0,21500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0
+'583',1301,72400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'584',1300,72400,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,47500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6500,4,'',0,21500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0
+'584',1301,72400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'587',1300,72400,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,47500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6500,4,'',0,21500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0
+'587',1301,72400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'588',1300,72400,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,47500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6500,4,'',0,21500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0
+'588',1301,72400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'589',1300,72400,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,47500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6500,4,'',0,21500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0
+'589',1301,72400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_763 b/src/main/res-current/raw/current_gtfs_schedule_stop_763
index 6bc30cf43..2bb6d2221 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_763
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_763
@@ -1,7 +1,7 @@
-'576',139001,72200,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
-'577',139001,61700,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'578',139001,61700,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'579',139001,61700,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'580',139001,61700,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'581',139001,74100,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
-'582',139001,61700,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'583',139001,61700,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'584',139001,61700,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'585',139001,74100,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
+'586',139001,72200,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
+'587',139001,61700,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'588',139001,61700,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'589',139001,61700,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_764 b/src/main/res-current/raw/current_gtfs_schedule_stop_764
index 3443bdb26..d82147720 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_764
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_764
@@ -1,7 +1,7 @@
-'576',2200,83900,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'577',2200,62500,,'',0,2600,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16700,,'',0
-'578',2200,62500,,'',0,2600,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16700,,'',0
-'579',2200,62500,,'',0,2600,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16700,,'',0
-'580',2200,62500,,'',0,2600,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16700,,'',0
-'581',2200,90300,,'',0,11100,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
-'582',2200,62500,,'',0,2600,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16700,,'',0
+'583',2200,62500,,'',0,2600,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16700,,'',0
+'584',2200,62500,,'',0,2600,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16700,,'',0
+'585',2200,90300,,'',0,11100,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
+'586',2200,83900,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'587',2200,62500,,'',0,2600,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16700,,'',0
+'588',2200,62500,,'',0,2600,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16700,,'',0
+'589',2200,62500,,'',0,2600,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_765 b/src/main/res-current/raw/current_gtfs_schedule_stop_765
index f1179bb24..0a58f30c4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_765
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_765
@@ -1,6 +1,6 @@
-'577',2300,144400,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
-'578',2300,144400,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
-'579',2300,144400,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
-'580',2300,144400,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
-'581',2300,142500,0,'Old Vernon Rd',0
-'582',2300,144400,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'583',2300,144400,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'584',2300,144400,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'585',2300,142500,0,'Old Vernon Rd',0
+'587',2300,144400,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'588',2300,144400,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'589',2300,144400,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_766 b/src/main/res-current/raw/current_gtfs_schedule_stop_766
index 37d931e28..7d41f1954 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_766
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_766
@@ -1,7 +1,7 @@
-'576',1501,84400,,'',0,20000,,'',0,40000,,'',0,27000,,'',0
-'577',1501,71400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'578',1501,71400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'579',1501,71400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'580',1501,71400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'581',1501,94500,,'',0,17000,,'',0,20000,,'',0,20000,,'',0,10200,,'',0,10000,,'',0
-'582',1501,71400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'583',1501,71400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'584',1501,71400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'585',1501,94500,,'',0,17000,,'',0,20000,,'',0,20000,,'',0,10200,,'',0,10000,,'',0
+'586',1501,84400,,'',0,20000,,'',0,40000,,'',0,27000,,'',0
+'587',1501,71400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'588',1501,71400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'589',1501,71400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,70000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_768 b/src/main/res-current/raw/current_gtfs_schedule_stop_768
index 53fb32998..fd477fb7c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_768
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_768
@@ -1,12 +1,12 @@
-'577',1300,71800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'578',1300,71800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'579',1300,71800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'580',1300,71800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'582',1300,71800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'576',2300,75700,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
-'577',2300,55400,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
-'578',2300,55400,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
-'579',2300,55400,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
-'580',2300,55400,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
-'581',2300,70300,,'',0,3100,,'',0,6800,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,10000,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,2600,,'',0,7000,,'',0,3200,,'',0,10400,,'',0,9100,,'',0,10300,,'',0,15300,,'',0,10800,,'',0,11000,,'',0
-'582',2300,55400,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
+'583',1300,71800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'584',1300,71800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'587',1300,71800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'588',1300,71800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'589',1300,71800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'583',2300,55400,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
+'584',2300,55400,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
+'585',2300,70300,,'',0,3100,,'',0,6800,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,10000,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,2600,,'',0,7000,,'',0,3200,,'',0,10400,,'',0,9100,,'',0,10300,,'',0,15300,,'',0,10800,,'',0,11000,,'',0
+'586',2300,75700,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
+'587',2300,55400,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
+'588',2300,55400,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
+'589',2300,55400,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_769 b/src/main/res-current/raw/current_gtfs_schedule_stop_769
index a859283cc..bc95e55e7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_769
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_769
@@ -1,7 +1,7 @@
-'576',3000,75600,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,9200,0,'Downtown',0
-'577',3000,61600,,'',0,2100,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,5100,,'',0,1200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,1800,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,6400,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2300,,'',0,6500,0,'Downtown',0,2500,,'',0,6600,0,'Downtown',0,2500,0,'Downtown',0
-'578',3000,61600,,'',0,2100,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,5100,,'',0,1200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,1800,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,6400,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2300,,'',0,6500,0,'Downtown',0,2500,,'',0,6600,0,'Downtown',0,2500,0,'Downtown',0
-'579',3000,61600,,'',0,2100,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,5100,,'',0,1200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,1800,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,6400,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2300,,'',0,6500,0,'Downtown',0,2500,,'',0,6600,0,'Downtown',0,2500,0,'Downtown',0
-'580',3000,61600,,'',0,2100,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,5100,,'',0,1200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,1800,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,6400,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2300,,'',0,6500,0,'Downtown',0,2500,,'',0,6600,0,'Downtown',0,2500,0,'Downtown',0,8000,0,'Downtown',0,4000,0,'Downtown',0
-'581',3000,70600,,'',0,5000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,0,'Downtown',0,3000,,'',0,7000,0,'Downtown',0,3000,,'',0,7000,0,'Downtown',0,3000,,'',0,7000,0,'Downtown',0,3000,,'',0,7000,0,'Downtown',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,7000,0,'Downtown',0,1700,0,'Downtown',0
-'582',3000,61600,,'',0,2100,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,5100,,'',0,1200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,1800,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,6400,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2300,,'',0,6500,0,'Downtown',0,2500,,'',0,6600,0,'Downtown',0,2500,0,'Downtown',0
+'583',3000,61600,,'',0,2100,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,5100,,'',0,1200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,1800,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,6400,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2300,,'',0,6500,0,'Downtown',0,2500,,'',0,6600,0,'Downtown',0,2500,0,'Downtown',0
+'584',3000,61600,,'',0,2100,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,5100,,'',0,1200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,1800,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,6400,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2300,,'',0,6500,0,'Downtown',0,2500,,'',0,6600,0,'Downtown',0,2500,0,'Downtown',0,8000,0,'Downtown',0,4000,0,'Downtown',0
+'585',3000,70600,,'',0,5000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,0,'Downtown',0,3000,,'',0,7000,0,'Downtown',0,3000,,'',0,7000,0,'Downtown',0,3000,,'',0,7000,0,'Downtown',0,3000,,'',0,7000,0,'Downtown',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,7000,0,'Downtown',0,1700,0,'Downtown',0
+'586',3000,75600,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,9200,0,'Downtown',0
+'587',3000,61600,,'',0,2100,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,5100,,'',0,1200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,1800,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,6400,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2300,,'',0,6500,0,'Downtown',0,2500,,'',0,6600,0,'Downtown',0,2500,0,'Downtown',0
+'588',3000,61600,,'',0,2100,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,5100,,'',0,1200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,1800,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,6400,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2300,,'',0,6500,0,'Downtown',0,2500,,'',0,6600,0,'Downtown',0,2500,0,'Downtown',0
+'589',3000,61600,,'',0,2100,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,5100,,'',0,1200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,1800,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,6400,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2300,,'',0,6500,0,'Downtown',0,2500,,'',0,6600,0,'Downtown',0,2500,0,'Downtown',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_77 b/src/main/res-current/raw/current_gtfs_schedule_stop_77
index a64218c6c..0630148bf 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_77
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_77
@@ -1,7 +1,7 @@
-'576',300,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
-'577',300,73400,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'578',300,73400,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'579',300,73400,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'580',300,73400,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'581',300,82100,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'582',300,73400,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'583',300,73400,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'584',300,73400,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'585',300,82100,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
+'586',300,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
+'587',300,73400,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'588',300,73400,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'589',300,73400,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,50700,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_770 b/src/main/res-current/raw/current_gtfs_schedule_stop_770
index 5faec8380..c8e4a7a7d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_770
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_770
@@ -1,5 +1,5 @@
-'577',2800,70800,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
-'578',2800,70800,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
-'579',2800,70800,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
-'580',2800,70800,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
-'582',2800,70800,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
+'583',2800,70800,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
+'584',2800,70800,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
+'587',2800,70800,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
+'588',2800,70800,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
+'589',2800,70800,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_771 b/src/main/res-current/raw/current_gtfs_schedule_stop_771
index c39e63a31..d0db5437c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_771
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_771
@@ -1,7 +1,7 @@
-'576',3000,75400,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,9200,0,'Downtown',0
-'577',3000,61400,,'',0,2100,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,5200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,4800,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,1800,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,6400,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2400,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
-'578',3000,61400,,'',0,2100,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,5200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,4800,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,1800,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,6400,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2400,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
-'579',3000,61400,,'',0,2100,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,5200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,4800,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,1800,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,6400,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2400,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
-'580',3000,61400,,'',0,2100,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,5200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,4800,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,1800,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,6400,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2400,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0,8000,0,'Downtown',0,4000,0,'Downtown',0
-'581',3000,70400,,'',0,5000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,5700,0,'Downtown',0
-'582',3000,61400,,'',0,2100,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,5200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,4800,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,1800,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,6400,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2400,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
+'583',3000,61400,,'',0,2100,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,5200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,4800,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,1800,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,6400,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2400,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
+'584',3000,61400,,'',0,2100,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,5200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,4800,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,1800,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,6400,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2400,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0,8000,0,'Downtown',0,4000,0,'Downtown',0
+'585',3000,70400,,'',0,5000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,5700,0,'Downtown',0
+'586',3000,75400,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,9200,0,'Downtown',0
+'587',3000,61400,,'',0,2100,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,5200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,4800,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,1800,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,6400,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2400,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
+'588',3000,61400,,'',0,2100,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,5200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,4800,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,1800,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,6400,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2400,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
+'589',3000,61400,,'',0,2100,,'',0,2000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,5200,0,'Downtown',0,1200,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1500,,'',0,5500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,1600,,'',0,5600,0,'Downtown',0,1700,,'',0,1700,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,4800,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,1800,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,6400,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2400,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_772 b/src/main/res-current/raw/current_gtfs_schedule_stop_772
index bceaebefc..e29d0cdaf 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_772
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_772
@@ -1,7 +1,7 @@
-'576',3001,73400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0
-'577',3001,63400,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,700,,'',0,4700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,5000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,800,,'',0,5000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,800,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5500,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2700,,'',0,5900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2700,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
-'578',3001,63400,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,700,,'',0,4700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,5000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,800,,'',0,5000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,800,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5500,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2700,,'',0,5900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2700,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
-'579',3001,63400,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,700,,'',0,4700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,5000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,800,,'',0,5000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,800,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5500,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2700,,'',0,5900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2700,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
-'580',3001,63400,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,700,,'',0,4700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,5000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,800,,'',0,5000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,800,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5500,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2700,,'',0,5900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2700,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,9000,,'',0,8000,,'',0
-'581',3001,73400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'582',3001,63400,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,700,,'',0,4700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,5000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,800,,'',0,5000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,800,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5500,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2700,,'',0,5900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2700,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
+'583',3001,63400,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,700,,'',0,4700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,5000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,800,,'',0,5000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,800,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5500,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2700,,'',0,5900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2700,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
+'584',3001,63400,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,700,,'',0,4700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,5000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,800,,'',0,5000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,800,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5500,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2700,,'',0,5900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2700,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,9000,,'',0,8000,,'',0
+'585',3001,73400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'586',3001,73400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0
+'587',3001,63400,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,700,,'',0,4700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,5000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,800,,'',0,5000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,800,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5500,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2700,,'',0,5900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2700,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
+'588',3001,63400,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,700,,'',0,4700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,5000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,800,,'',0,5000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,800,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5500,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2700,,'',0,5900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2700,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
+'589',3001,63400,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,700,,'',0,4700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,5000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,800,,'',0,5000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,800,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5500,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2700,,'',0,5900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,2500,,'',0,6400,,'',0,2700,,'',0,6300,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_773 b/src/main/res-current/raw/current_gtfs_schedule_stop_773
index 5f360ae7a..429af1d97 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_773
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_773
@@ -1,19 +1,19 @@
-'577',2901,161600,4,'',0
-'578',2901,161600,4,'',0
-'579',2901,161600,4,'',0
-'580',2901,161600,4,'',0
-'582',2901,161600,4,'',0
-'576',3000,74800,4,'',0,10100,4,'',0,10000,4,'',0,10100,4,'',0,10100,4,'',0,10000,4,'',0,10000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,9800,4,'',0,10000,4,'',0
-'576',3001,80900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',3000,60400,4,'',0,3300,4,'',0,2200,4,'',0,5100,4,'',0,1100,4,'',0,1500,4,'',0,1600,4,'',0,5500,4,'',0,1600,4,'',0,1500,4,'',0,1500,4,'',0,5400,4,'',0,1800,4,'',0,2400,4,'',0,7100,4,'',0,3100,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3300,4,'',0,5700,4,'',0,1700,4,'',0,1800,4,'',0,5500,4,'',0,2000,4,'',0,1900,4,'',0,1600,4,'',0,5800,4,'',0,1800,4,'',0,1800,4,'',0,5700,4,'',0,1800,4,'',0,1300,4,'',0,1500,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,5800,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5800,4,'',0,2000,4,'',0,1900,4,'',0,6400,4,'',0,2500,4,'',0,8900,4,'',0,9000,4,'',0,8700,4,'',0,5000,4,'',0
-'577',3001,61000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1400,0,'Downtown',0,5500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,900,0,'Downtown',0,800,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,1000,0,'Downtown',0,5000,,'',0,1400,0,'Downtown',0,1400,,'',0,2000,,'',0,6000,,'',0,1500,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8000,0,'Downtown',0
-'578',3000,60400,4,'',0,3300,4,'',0,2200,4,'',0,5100,4,'',0,1100,4,'',0,1500,4,'',0,1600,4,'',0,5500,4,'',0,1600,4,'',0,1500,4,'',0,1500,4,'',0,5400,4,'',0,1800,4,'',0,2400,4,'',0,7100,4,'',0,3100,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3300,4,'',0,5700,4,'',0,1700,4,'',0,1800,4,'',0,5500,4,'',0,2000,4,'',0,1900,4,'',0,1600,4,'',0,5800,4,'',0,1800,4,'',0,1800,4,'',0,5700,4,'',0,1800,4,'',0,1300,4,'',0,1500,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,5800,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5800,4,'',0,2000,4,'',0,1900,4,'',0,6400,4,'',0,2500,4,'',0,8900,4,'',0,9000,4,'',0,8700,4,'',0,5000,4,'',0
-'578',3001,61000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1400,0,'Downtown',0,5500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,900,0,'Downtown',0,800,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,1000,0,'Downtown',0,5000,,'',0,1400,0,'Downtown',0,1400,,'',0,2000,,'',0,6000,,'',0,1500,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8000,0,'Downtown',0
-'579',3000,60400,4,'',0,3300,4,'',0,2200,4,'',0,5100,4,'',0,1100,4,'',0,1500,4,'',0,1600,4,'',0,5500,4,'',0,1600,4,'',0,1500,4,'',0,1500,4,'',0,5400,4,'',0,1800,4,'',0,2400,4,'',0,7100,4,'',0,3100,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3300,4,'',0,5700,4,'',0,1700,4,'',0,1800,4,'',0,5500,4,'',0,2000,4,'',0,1900,4,'',0,1600,4,'',0,5800,4,'',0,1800,4,'',0,1800,4,'',0,5700,4,'',0,1800,4,'',0,1300,4,'',0,1500,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,5800,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5800,4,'',0,2000,4,'',0,1900,4,'',0,6400,4,'',0,2500,4,'',0,8900,4,'',0,9000,4,'',0,8700,4,'',0,5000,4,'',0
-'579',3001,61000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1400,0,'Downtown',0,5500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,900,0,'Downtown',0,800,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,1000,0,'Downtown',0,5000,,'',0,1400,0,'Downtown',0,1400,,'',0,2000,,'',0,6000,,'',0,1500,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8000,0,'Downtown',0
-'580',3000,60400,4,'',0,3300,4,'',0,2200,4,'',0,5100,4,'',0,1100,4,'',0,1500,4,'',0,1600,4,'',0,5500,4,'',0,1600,4,'',0,1500,4,'',0,1500,4,'',0,5400,4,'',0,1800,4,'',0,2400,4,'',0,7100,4,'',0,3100,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3300,4,'',0,5700,4,'',0,1700,4,'',0,1800,4,'',0,5500,4,'',0,2000,4,'',0,1900,4,'',0,1600,4,'',0,5800,4,'',0,1800,4,'',0,1800,4,'',0,5700,4,'',0,1800,4,'',0,1300,4,'',0,1500,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,5800,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5800,4,'',0,2000,4,'',0,1900,4,'',0,6400,4,'',0,2500,4,'',0,8900,4,'',0,9000,4,'',0,8700,4,'',0,5000,4,'',0
-'580',3001,61000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1400,0,'Downtown',0,5500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,900,0,'Downtown',0,800,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,1000,0,'Downtown',0,5000,,'',0,1400,0,'Downtown',0,1400,,'',0,2000,,'',0,6000,,'',0,1500,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8000,0,'Downtown',0
-'581',3000,72900,4,'',0,9000,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7000,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,7500,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,9800,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'581',3001,70900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',3000,60400,4,'',0,3300,4,'',0,2200,4,'',0,5100,4,'',0,1100,4,'',0,1500,4,'',0,1600,4,'',0,5500,4,'',0,1600,4,'',0,1500,4,'',0,1500,4,'',0,5400,4,'',0,1800,4,'',0,2400,4,'',0,7100,4,'',0,3100,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3300,4,'',0,5700,4,'',0,1700,4,'',0,1800,4,'',0,5500,4,'',0,2000,4,'',0,1900,4,'',0,1600,4,'',0,5800,4,'',0,1800,4,'',0,1800,4,'',0,5700,4,'',0,1800,4,'',0,1300,4,'',0,1500,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,5800,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5800,4,'',0,2000,4,'',0,1900,4,'',0,6400,4,'',0,2500,4,'',0,8900,4,'',0,9000,4,'',0,8700,4,'',0,5000,4,'',0
-'582',3001,61000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1400,0,'Downtown',0,5500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,900,0,'Downtown',0,800,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,1000,0,'Downtown',0,5000,,'',0,1400,0,'Downtown',0,1400,,'',0,2000,,'',0,6000,,'',0,1500,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8000,0,'Downtown',0
+'583',2901,161600,4,'',0
+'584',2901,161600,4,'',0
+'587',2901,161600,4,'',0
+'588',2901,161600,4,'',0
+'589',2901,161600,4,'',0
+'583',3000,60400,4,'',0,3300,4,'',0,2200,4,'',0,5100,4,'',0,1100,4,'',0,1500,4,'',0,1600,4,'',0,5500,4,'',0,1600,4,'',0,1500,4,'',0,1500,4,'',0,5400,4,'',0,1800,4,'',0,2400,4,'',0,7100,4,'',0,3100,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3300,4,'',0,5700,4,'',0,1700,4,'',0,1800,4,'',0,5500,4,'',0,2000,4,'',0,1900,4,'',0,1600,4,'',0,5800,4,'',0,1800,4,'',0,1800,4,'',0,5700,4,'',0,1800,4,'',0,1300,4,'',0,1500,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,5800,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5800,4,'',0,2000,4,'',0,1900,4,'',0,6400,4,'',0,2500,4,'',0,8900,4,'',0,9000,4,'',0,8700,4,'',0,5000,4,'',0
+'583',3001,61000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1400,0,'Downtown',0,5500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,900,0,'Downtown',0,800,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,1000,0,'Downtown',0,5000,,'',0,1400,0,'Downtown',0,1400,,'',0,2000,,'',0,6000,,'',0,1500,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8000,0,'Downtown',0
+'584',3000,60400,4,'',0,3300,4,'',0,2200,4,'',0,5100,4,'',0,1100,4,'',0,1500,4,'',0,1600,4,'',0,5500,4,'',0,1600,4,'',0,1500,4,'',0,1500,4,'',0,5400,4,'',0,1800,4,'',0,2400,4,'',0,7100,4,'',0,3100,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3300,4,'',0,5700,4,'',0,1700,4,'',0,1800,4,'',0,5500,4,'',0,2000,4,'',0,1900,4,'',0,1600,4,'',0,5800,4,'',0,1800,4,'',0,1800,4,'',0,5700,4,'',0,1800,4,'',0,1300,4,'',0,1500,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,5800,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5800,4,'',0,2000,4,'',0,1900,4,'',0,6400,4,'',0,2500,4,'',0,8900,4,'',0,9000,4,'',0,8700,4,'',0,5000,4,'',0
+'584',3001,61000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1400,0,'Downtown',0,5500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,900,0,'Downtown',0,800,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,1000,0,'Downtown',0,5000,,'',0,1400,0,'Downtown',0,1400,,'',0,2000,,'',0,6000,,'',0,1500,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8000,0,'Downtown',0
+'585',3000,72900,4,'',0,9000,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7000,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,7500,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,9800,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'585',3001,70900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',3000,74800,4,'',0,10100,4,'',0,10000,4,'',0,10100,4,'',0,10100,4,'',0,10000,4,'',0,10000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,9800,4,'',0,10000,4,'',0
+'586',3001,80900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',3000,60400,4,'',0,3300,4,'',0,2200,4,'',0,5100,4,'',0,1100,4,'',0,1500,4,'',0,1600,4,'',0,5500,4,'',0,1600,4,'',0,1500,4,'',0,1500,4,'',0,5400,4,'',0,1800,4,'',0,2400,4,'',0,7100,4,'',0,3100,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3300,4,'',0,5700,4,'',0,1700,4,'',0,1800,4,'',0,5500,4,'',0,2000,4,'',0,1900,4,'',0,1600,4,'',0,5800,4,'',0,1800,4,'',0,1800,4,'',0,5700,4,'',0,1800,4,'',0,1300,4,'',0,1500,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,5800,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5800,4,'',0,2000,4,'',0,1900,4,'',0,6400,4,'',0,2500,4,'',0,8900,4,'',0,9000,4,'',0,8700,4,'',0,5000,4,'',0
+'587',3001,61000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1400,0,'Downtown',0,5500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,900,0,'Downtown',0,800,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,1000,0,'Downtown',0,5000,,'',0,1400,0,'Downtown',0,1400,,'',0,2000,,'',0,6000,,'',0,1500,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8000,0,'Downtown',0
+'588',3000,60400,4,'',0,3300,4,'',0,2200,4,'',0,5100,4,'',0,1100,4,'',0,1500,4,'',0,1600,4,'',0,5500,4,'',0,1600,4,'',0,1500,4,'',0,1500,4,'',0,5400,4,'',0,1800,4,'',0,2400,4,'',0,7100,4,'',0,3100,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3300,4,'',0,5700,4,'',0,1700,4,'',0,1800,4,'',0,5500,4,'',0,2000,4,'',0,1900,4,'',0,1600,4,'',0,5800,4,'',0,1800,4,'',0,1800,4,'',0,5700,4,'',0,1800,4,'',0,1300,4,'',0,1500,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,5800,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5800,4,'',0,2000,4,'',0,1900,4,'',0,6400,4,'',0,2500,4,'',0,8900,4,'',0,9000,4,'',0,8700,4,'',0,5000,4,'',0
+'588',3001,61000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1400,0,'Downtown',0,5500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,900,0,'Downtown',0,800,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,1000,0,'Downtown',0,5000,,'',0,1400,0,'Downtown',0,1400,,'',0,2000,,'',0,6000,,'',0,1500,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8000,0,'Downtown',0
+'589',3000,60400,4,'',0,3300,4,'',0,2200,4,'',0,5100,4,'',0,1100,4,'',0,1500,4,'',0,1600,4,'',0,5500,4,'',0,1600,4,'',0,1500,4,'',0,1500,4,'',0,5400,4,'',0,1800,4,'',0,2400,4,'',0,7100,4,'',0,3100,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3300,4,'',0,5700,4,'',0,1700,4,'',0,1800,4,'',0,5500,4,'',0,2000,4,'',0,1900,4,'',0,1600,4,'',0,5800,4,'',0,1800,4,'',0,1800,4,'',0,5700,4,'',0,1800,4,'',0,1300,4,'',0,1500,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,5800,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5800,4,'',0,2000,4,'',0,1900,4,'',0,6400,4,'',0,2500,4,'',0,8900,4,'',0,9000,4,'',0,8700,4,'',0,5000,4,'',0
+'589',3001,61000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1400,0,'Downtown',0,5500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,900,0,'Downtown',0,800,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,1000,0,'Downtown',0,5000,,'',0,1400,0,'Downtown',0,1400,,'',0,2000,,'',0,6000,,'',0,1500,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8000,0,'Downtown',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_774 b/src/main/res-current/raw/current_gtfs_schedule_stop_774
index 1f632fcce..862544696 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_774
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_774
@@ -1,56 +1,56 @@
-'576',2000,83500,4,'',0,10100,4,'',0,10900,4,'',0,10300,4,'',0,10800,4,'',0,10200,4,'',0,14800,4,'',0,9900,4,'',0,10000,4,'',0,10300,4,'',0,10100,4,'',0
-'576',2001,74500,,'',0,10300,,'',0,10400,,'',0,10700,,'',0,14800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'577',2000,64400,4,'',0,7200,4,'',0,10400,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,14400,4,'',0,10200,4,'',0,10600,4,'',0,10400,4,'',0,11100,4,'',0,7700,4,'',0,2900,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,11900,4,'',0,8900,4,'',0,15600,4,'',0,11600,4,'',0
-'577',2001,62600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
-'578',2000,64400,4,'',0,7200,4,'',0,10400,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,14400,4,'',0,10200,4,'',0,10600,4,'',0,10400,4,'',0,11100,4,'',0,7700,4,'',0,2900,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,11900,4,'',0,8900,4,'',0,15600,4,'',0,11600,4,'',0
-'578',2001,62600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
-'579',2000,64400,4,'',0,7200,4,'',0,10400,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,14400,4,'',0,10200,4,'',0,10600,4,'',0,10400,4,'',0,11100,4,'',0,7700,4,'',0,2900,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,11900,4,'',0,8900,4,'',0,15600,4,'',0,11600,4,'',0
-'579',2001,62600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
-'580',2000,64400,4,'',0,7200,4,'',0,10400,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,14400,4,'',0,10200,4,'',0,10600,4,'',0,10400,4,'',0,11100,4,'',0,7700,4,'',0,2900,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,11900,4,'',0,8900,4,'',0,15600,4,'',0,11600,4,'',0
-'580',2001,62600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
-'581',2000,70600,4,'',0,10300,4,'',0,11400,4,'',0,10600,4,'',0,10300,4,'',0,10600,4,'',0,10300,4,'',0,10000,4,'',0,9500,4,'',0,11900,4,'',0,9000,4,'',0,10700,4,'',0,15000,4,'',0,10800,4,'',0,10000,4,'',0
-'581',2001,75100,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,10700,,'',0,16400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'582',2000,64400,4,'',0,7200,4,'',0,10400,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,14400,4,'',0,10200,4,'',0,10600,4,'',0,10400,4,'',0,11100,4,'',0,7700,4,'',0,2900,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,11900,4,'',0,8900,4,'',0,15600,4,'',0,11600,4,'',0
-'582',2001,62600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
-'576',2400,74200,4,'',0,10300,4,'',0,10700,4,'',0,10400,4,'',0,14800,4,'',0,10100,4,'',0,10900,4,'',0,10200,4,'',0,9300,4,'',0,10700,4,'',0,10100,4,'',0,9900,4,'',0
-'576',2401,80500,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
-'577',2400,62300,4,'',0,10400,4,'',0,3200,4,'',0,14300,4,'',0,3400,4,'',0,7200,4,'',0,10300,4,'',0,10400,4,'',0,10300,4,'',0,10800,4,'',0,11400,4,'',0,7100,4,'',0,2900,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,4300,4,'',0,9400,4,'',0,15600,4,'',0,10100,4,'',0
-'577',2401,54400,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,11100,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'578',2400,62300,4,'',0,10400,4,'',0,3200,4,'',0,14300,4,'',0,3400,4,'',0,7200,4,'',0,10300,4,'',0,10400,4,'',0,10300,4,'',0,10800,4,'',0,11400,4,'',0,7100,4,'',0,2900,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,4300,4,'',0,9400,4,'',0,15600,4,'',0,10100,4,'',0
-'578',2401,54400,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,11100,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'579',2400,62300,4,'',0,10400,4,'',0,3200,4,'',0,14300,4,'',0,3400,4,'',0,7200,4,'',0,10300,4,'',0,10400,4,'',0,10300,4,'',0,10800,4,'',0,11400,4,'',0,7100,4,'',0,2900,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,4300,4,'',0,9400,4,'',0,15600,4,'',0,10100,4,'',0
-'579',2401,54400,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,11100,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'580',2400,62300,4,'',0,10400,4,'',0,3200,4,'',0,14300,4,'',0,3400,4,'',0,7200,4,'',0,10300,4,'',0,10400,4,'',0,10300,4,'',0,10800,4,'',0,11400,4,'',0,7100,4,'',0,2900,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,4300,4,'',0,9400,4,'',0,15600,4,'',0,10100,4,'',0
-'580',2401,54400,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,11100,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'581',2400,83600,4,'',0,10000,4,'',0,9800,4,'',0,11100,4,'',0,10400,4,'',0,10700,4,'',0,8900,4,'',0,16300,4,'',0,9400,4,'',0,10200,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0
-'581',2401,71300,,'',0,10000,,'',0,14300,,'',0,15000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,12100,,'',0,6500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'582',2400,62300,4,'',0,10400,4,'',0,3200,4,'',0,14300,4,'',0,3400,4,'',0,7200,4,'',0,10300,4,'',0,10400,4,'',0,10300,4,'',0,10800,4,'',0,11400,4,'',0,7100,4,'',0,2900,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,4300,4,'',0,9400,4,'',0,15600,4,'',0,10100,4,'',0
-'582',2401,54400,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,11100,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'576',2500,104900,4,'',0,26800,4,'',0,29100,4,'',0,22900,4,'',0
-'576',2501,100000,,'',0,22800,,'',0,29500,,'',0,22900,,'',0
-'577',2500,73700,4,'',0,9400,4,'',0,9100,4,'',0,13400,4,'',0,17100,4,'',0,17700,4,'',0,11200,4,'',0,10000,4,'',0,9500,4,'',0,9100,4,'',0
-'577',2501,74200,,'',0,9100,,'',0,9000,,'',0,13500,,'',0,17300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'578',2500,73700,4,'',0,9400,4,'',0,9100,4,'',0,13400,4,'',0,17100,4,'',0,17700,4,'',0,11200,4,'',0,10000,4,'',0,9500,4,'',0,9100,4,'',0
-'578',2501,74200,,'',0,9100,,'',0,9000,,'',0,13500,,'',0,17300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'579',2500,73700,4,'',0,9400,4,'',0,9100,4,'',0,13400,4,'',0,17100,4,'',0,17700,4,'',0,11200,4,'',0,10000,4,'',0,9500,4,'',0,9100,4,'',0
-'579',2501,74200,,'',0,9100,,'',0,9000,,'',0,13500,,'',0,17300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'580',2500,73700,4,'',0,9400,4,'',0,9100,4,'',0,13400,4,'',0,17100,4,'',0,17700,4,'',0,11200,4,'',0,10000,4,'',0,9500,4,'',0,9100,4,'',0
-'580',2501,74200,,'',0,9100,,'',0,9000,,'',0,13500,,'',0,17300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'581',2500,100500,4,'',0,13200,4,'',0,17300,4,'',0,14100,4,'',0,39100,4,'',0
-'581',2501,91500,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,40300,,'',0
-'582',2500,73700,4,'',0,9400,4,'',0,9100,4,'',0,13400,4,'',0,17100,4,'',0,17700,4,'',0,11200,4,'',0,10000,4,'',0,9500,4,'',0,9100,4,'',0
-'582',2501,74200,,'',0,9100,,'',0,9000,,'',0,13500,,'',0,17300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'576',139000,105300,,'',0,26800,,'',0,29100,,'',0,30300,,'',0
-'576',139001,72900,4,'',0,7400,4,'',0,32400,4,'',0,23100,4,'',0,28800,4,'',0,30300,4,'',0
-'577',139000,55000,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'577',139001,62400,4,'',0,7700,4,'',0,3500,4,'',0,7900,4,'',0,3700,4,'',0,15900,4,'',0,12600,4,'',0,17400,4,'',0,13700,4,'',0,7600,4,'',0,3500,4,'',0,7900,4,'',0,7500,4,'',0,4200,4,'',0,6800,4,'',0,11200,4,'',0,17500,4,'',0
-'578',139000,55000,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'578',139001,62400,4,'',0,7700,4,'',0,3500,4,'',0,7900,4,'',0,3700,4,'',0,15900,4,'',0,12600,4,'',0,17400,4,'',0,13700,4,'',0,7600,4,'',0,3500,4,'',0,7900,4,'',0,7500,4,'',0,4200,4,'',0,6800,4,'',0,11200,4,'',0,17500,4,'',0
-'579',139000,55000,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'579',139001,62400,4,'',0,7700,4,'',0,3500,4,'',0,7900,4,'',0,3700,4,'',0,15900,4,'',0,12600,4,'',0,17400,4,'',0,13700,4,'',0,7600,4,'',0,3500,4,'',0,7900,4,'',0,7500,4,'',0,4200,4,'',0,6800,4,'',0,11200,4,'',0,17500,4,'',0
-'580',139000,55000,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'580',139001,62400,4,'',0,7700,4,'',0,3500,4,'',0,7900,4,'',0,3700,4,'',0,15900,4,'',0,12600,4,'',0,17400,4,'',0,13700,4,'',0,7600,4,'',0,3500,4,'',0,7900,4,'',0,7500,4,'',0,4200,4,'',0,6800,4,'',0,11200,4,'',0,17500,4,'',0
-'581',139000,72700,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
-'581',139001,74800,4,'',0,10000,4,'',0,19500,4,'',0,17300,4,'',0,13200,4,'',0,17200,4,'',0,9100,4,'',0,12400,4,'',0,19900,4,'',0,7000,4,'',0,13500,4,'',0
-'582',139000,55000,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'582',139001,62400,4,'',0,7700,4,'',0,3500,4,'',0,7900,4,'',0,3700,4,'',0,15900,4,'',0,12600,4,'',0,17400,4,'',0,13700,4,'',0,7600,4,'',0,3500,4,'',0,7900,4,'',0,7500,4,'',0,4200,4,'',0,6800,4,'',0,11200,4,'',0,17500,4,'',0
+'583',2000,64400,4,'',0,7200,4,'',0,10400,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,14400,4,'',0,10200,4,'',0,10600,4,'',0,10400,4,'',0,11100,4,'',0,7700,4,'',0,2900,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,11900,4,'',0,8900,4,'',0,15600,4,'',0,11600,4,'',0
+'583',2001,62600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
+'584',2000,64400,4,'',0,7200,4,'',0,10400,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,14400,4,'',0,10200,4,'',0,10600,4,'',0,10400,4,'',0,11100,4,'',0,7700,4,'',0,2900,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,11900,4,'',0,8900,4,'',0,15600,4,'',0,11600,4,'',0
+'584',2001,62600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
+'585',2000,70600,4,'',0,10300,4,'',0,11400,4,'',0,10600,4,'',0,10300,4,'',0,10600,4,'',0,10300,4,'',0,10000,4,'',0,9500,4,'',0,11900,4,'',0,9000,4,'',0,10700,4,'',0,15000,4,'',0,10800,4,'',0,10000,4,'',0
+'585',2001,75100,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,10700,,'',0,16400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'586',2000,83500,4,'',0,10100,4,'',0,10900,4,'',0,10300,4,'',0,10800,4,'',0,10200,4,'',0,14800,4,'',0,9900,4,'',0,10000,4,'',0,10300,4,'',0,10100,4,'',0
+'586',2001,74500,,'',0,10300,,'',0,10400,,'',0,10700,,'',0,14800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'587',2000,64400,4,'',0,7200,4,'',0,10400,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,14400,4,'',0,10200,4,'',0,10600,4,'',0,10400,4,'',0,11100,4,'',0,7700,4,'',0,2900,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,11900,4,'',0,8900,4,'',0,15600,4,'',0,11600,4,'',0
+'587',2001,62600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
+'588',2000,64400,4,'',0,7200,4,'',0,10400,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,14400,4,'',0,10200,4,'',0,10600,4,'',0,10400,4,'',0,11100,4,'',0,7700,4,'',0,2900,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,11900,4,'',0,8900,4,'',0,15600,4,'',0,11600,4,'',0
+'588',2001,62600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
+'589',2000,64400,4,'',0,7200,4,'',0,10400,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,14400,4,'',0,10200,4,'',0,10600,4,'',0,10400,4,'',0,11100,4,'',0,7700,4,'',0,2900,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,11900,4,'',0,8900,4,'',0,15600,4,'',0,11600,4,'',0
+'589',2001,62600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
+'583',2400,62300,4,'',0,10400,4,'',0,3200,4,'',0,14300,4,'',0,3400,4,'',0,7200,4,'',0,10300,4,'',0,10400,4,'',0,10300,4,'',0,10800,4,'',0,11400,4,'',0,7100,4,'',0,2900,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,4300,4,'',0,9400,4,'',0,15600,4,'',0,10100,4,'',0
+'583',2401,54400,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,11100,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'584',2400,62300,4,'',0,10400,4,'',0,3200,4,'',0,14300,4,'',0,3400,4,'',0,7200,4,'',0,10300,4,'',0,10400,4,'',0,10300,4,'',0,10800,4,'',0,11400,4,'',0,7100,4,'',0,2900,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,4300,4,'',0,9400,4,'',0,15600,4,'',0,10100,4,'',0
+'584',2401,54400,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,11100,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'585',2400,83600,4,'',0,10000,4,'',0,9800,4,'',0,11100,4,'',0,10400,4,'',0,10700,4,'',0,8900,4,'',0,16300,4,'',0,9400,4,'',0,10200,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0
+'585',2401,71300,,'',0,10000,,'',0,14300,,'',0,15000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,12100,,'',0,6500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'586',2400,74200,4,'',0,10300,4,'',0,10700,4,'',0,10400,4,'',0,14800,4,'',0,10100,4,'',0,10900,4,'',0,10200,4,'',0,9300,4,'',0,10700,4,'',0,10100,4,'',0,9900,4,'',0
+'586',2401,80500,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
+'587',2400,62300,4,'',0,10400,4,'',0,3200,4,'',0,14300,4,'',0,3400,4,'',0,7200,4,'',0,10300,4,'',0,10400,4,'',0,10300,4,'',0,10800,4,'',0,11400,4,'',0,7100,4,'',0,2900,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,4300,4,'',0,9400,4,'',0,15600,4,'',0,10100,4,'',0
+'587',2401,54400,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,11100,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'588',2400,62300,4,'',0,10400,4,'',0,3200,4,'',0,14300,4,'',0,3400,4,'',0,7200,4,'',0,10300,4,'',0,10400,4,'',0,10300,4,'',0,10800,4,'',0,11400,4,'',0,7100,4,'',0,2900,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,4300,4,'',0,9400,4,'',0,15600,4,'',0,10100,4,'',0
+'588',2401,54400,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,11100,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'589',2400,62300,4,'',0,10400,4,'',0,3200,4,'',0,14300,4,'',0,3400,4,'',0,7200,4,'',0,10300,4,'',0,10400,4,'',0,10300,4,'',0,10800,4,'',0,11400,4,'',0,7100,4,'',0,2900,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,4300,4,'',0,9400,4,'',0,15600,4,'',0,10100,4,'',0
+'589',2401,54400,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,11100,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'583',2500,73700,4,'',0,9400,4,'',0,9100,4,'',0,13400,4,'',0,17100,4,'',0,17700,4,'',0,11200,4,'',0,10000,4,'',0,9500,4,'',0,9100,4,'',0
+'583',2501,74200,,'',0,9100,,'',0,9000,,'',0,13500,,'',0,17300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'584',2500,73700,4,'',0,9400,4,'',0,9100,4,'',0,13400,4,'',0,17100,4,'',0,17700,4,'',0,11200,4,'',0,10000,4,'',0,9500,4,'',0,9100,4,'',0
+'584',2501,74200,,'',0,9100,,'',0,9000,,'',0,13500,,'',0,17300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'585',2500,100500,4,'',0,13200,4,'',0,17300,4,'',0,14100,4,'',0,39100,4,'',0
+'585',2501,91500,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,40300,,'',0
+'586',2500,104900,4,'',0,26800,4,'',0,29100,4,'',0,22900,4,'',0
+'586',2501,100000,,'',0,22800,,'',0,29500,,'',0,22900,,'',0
+'587',2500,73700,4,'',0,9400,4,'',0,9100,4,'',0,13400,4,'',0,17100,4,'',0,17700,4,'',0,11200,4,'',0,10000,4,'',0,9500,4,'',0,9100,4,'',0
+'587',2501,74200,,'',0,9100,,'',0,9000,,'',0,13500,,'',0,17300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'588',2500,73700,4,'',0,9400,4,'',0,9100,4,'',0,13400,4,'',0,17100,4,'',0,17700,4,'',0,11200,4,'',0,10000,4,'',0,9500,4,'',0,9100,4,'',0
+'588',2501,74200,,'',0,9100,,'',0,9000,,'',0,13500,,'',0,17300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'589',2500,73700,4,'',0,9400,4,'',0,9100,4,'',0,13400,4,'',0,17100,4,'',0,17700,4,'',0,11200,4,'',0,10000,4,'',0,9500,4,'',0,9100,4,'',0
+'589',2501,74200,,'',0,9100,,'',0,9000,,'',0,13500,,'',0,17300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'583',139000,55000,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'583',139001,62400,4,'',0,7700,4,'',0,3500,4,'',0,7900,4,'',0,3700,4,'',0,15900,4,'',0,12600,4,'',0,17400,4,'',0,13700,4,'',0,7600,4,'',0,3500,4,'',0,7900,4,'',0,7500,4,'',0,4200,4,'',0,6800,4,'',0,11200,4,'',0,17500,4,'',0
+'584',139000,55000,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'584',139001,62400,4,'',0,7700,4,'',0,3500,4,'',0,7900,4,'',0,3700,4,'',0,15900,4,'',0,12600,4,'',0,17400,4,'',0,13700,4,'',0,7600,4,'',0,3500,4,'',0,7900,4,'',0,7500,4,'',0,4200,4,'',0,6800,4,'',0,11200,4,'',0,17500,4,'',0
+'585',139000,72700,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
+'585',139001,74800,4,'',0,10000,4,'',0,19500,4,'',0,17300,4,'',0,13200,4,'',0,17200,4,'',0,9100,4,'',0,12400,4,'',0,19900,4,'',0,7000,4,'',0,13500,4,'',0
+'586',139000,105300,,'',0,26800,,'',0,29100,,'',0,30300,,'',0
+'586',139001,72900,4,'',0,7400,4,'',0,32400,4,'',0,23100,4,'',0,28800,4,'',0,30300,4,'',0
+'587',139000,55000,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'587',139001,62400,4,'',0,7700,4,'',0,3500,4,'',0,7900,4,'',0,3700,4,'',0,15900,4,'',0,12600,4,'',0,17400,4,'',0,13700,4,'',0,7600,4,'',0,3500,4,'',0,7900,4,'',0,7500,4,'',0,4200,4,'',0,6800,4,'',0,11200,4,'',0,17500,4,'',0
+'588',139000,55000,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'588',139001,62400,4,'',0,7700,4,'',0,3500,4,'',0,7900,4,'',0,3700,4,'',0,15900,4,'',0,12600,4,'',0,17400,4,'',0,13700,4,'',0,7600,4,'',0,3500,4,'',0,7900,4,'',0,7500,4,'',0,4200,4,'',0,6800,4,'',0,11200,4,'',0,17500,4,'',0
+'589',139000,55000,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'589',139001,62400,4,'',0,7700,4,'',0,3500,4,'',0,7900,4,'',0,3700,4,'',0,15900,4,'',0,12600,4,'',0,17400,4,'',0,13700,4,'',0,7600,4,'',0,3500,4,'',0,7900,4,'',0,7500,4,'',0,4200,4,'',0,6800,4,'',0,11200,4,'',0,17500,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_775 b/src/main/res-current/raw/current_gtfs_schedule_stop_775
index 6f45dce7b..023f311b2 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_775
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_775
@@ -1,21 +1,21 @@
-'576',2101,73200,,'',0,6800,4,'',0,3700,,'',0,6800,4,'',0,3200,,'',0,6800,4,'',0,4500,,'',0,6800,4,'',0,3400,,'',0,6800,4,'',0,8000,,'',0,2800,4,'',0,7500,,'',0,2800,4,'',0,2400,,'',0,6800,4,'',0,8200,,'',0,2800,4,'',0,7200,,'',0,2800,4,'',0,7600,,'',0,2600,4,'',0
-'577',2101,54900,,'',0,6700,4,'',0,400,,'',0,2700,4,'',0,500,,'',0,6700,4,'',0,200,,'',0,2800,4,'',0,5300,,'',0,2800,4,'',0,400,,'',0,6800,4,'',0,200,,'',0,2800,4,'',0,2700,,'',0,6800,4,'',0,7700,,'',0,2800,4,'',0,7700,,'',0,2800,4,'',0,7600,,'',0,2800,4,'',0,8200,,'',0,2800,4,'',0,5000,,'',0,2800,4,'',0,400,,'',0,6800,4,'',0,400,,'',0,2800,4,'',0,600,,'',0,6800,4,'',0,500,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,3300,,'',0,6500,4,'',0,9000,,'',0,2500,4,'',0,7300,,'',0,2500,4,'',0,8000,,'',0,2500,4,'',0
-'578',2101,54900,,'',0,6700,4,'',0,400,,'',0,2700,4,'',0,500,,'',0,6700,4,'',0,200,,'',0,2800,4,'',0,5300,,'',0,2800,4,'',0,400,,'',0,6800,4,'',0,200,,'',0,2800,4,'',0,2700,,'',0,6800,4,'',0,7700,,'',0,2800,4,'',0,7700,,'',0,2800,4,'',0,7600,,'',0,2800,4,'',0,8200,,'',0,2800,4,'',0,5000,,'',0,2800,4,'',0,400,,'',0,6800,4,'',0,400,,'',0,2800,4,'',0,600,,'',0,6800,4,'',0,500,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,3300,,'',0,6500,4,'',0,9000,,'',0,2500,4,'',0,7300,,'',0,2500,4,'',0,8000,,'',0,2500,4,'',0
-'579',2101,54900,,'',0,6700,4,'',0,400,,'',0,2700,4,'',0,500,,'',0,6700,4,'',0,200,,'',0,2800,4,'',0,5300,,'',0,2800,4,'',0,400,,'',0,6800,4,'',0,200,,'',0,2800,4,'',0,2700,,'',0,6800,4,'',0,7700,,'',0,2800,4,'',0,7700,,'',0,2800,4,'',0,7600,,'',0,2800,4,'',0,8200,,'',0,2800,4,'',0,5000,,'',0,2800,4,'',0,400,,'',0,6800,4,'',0,400,,'',0,2800,4,'',0,600,,'',0,6800,4,'',0,500,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,3300,,'',0,6500,4,'',0,9000,,'',0,2500,4,'',0,7300,,'',0,2500,4,'',0,8000,,'',0,2500,4,'',0
-'580',2101,54900,,'',0,6700,4,'',0,400,,'',0,2700,4,'',0,500,,'',0,6700,4,'',0,200,,'',0,2800,4,'',0,5300,,'',0,2800,4,'',0,400,,'',0,6800,4,'',0,200,,'',0,2800,4,'',0,2700,,'',0,6800,4,'',0,7700,,'',0,2800,4,'',0,7700,,'',0,2800,4,'',0,7600,,'',0,2800,4,'',0,8200,,'',0,2800,4,'',0,5000,,'',0,2800,4,'',0,400,,'',0,6800,4,'',0,400,,'',0,2800,4,'',0,600,,'',0,6800,4,'',0,500,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,3300,,'',0,6500,4,'',0,9000,,'',0,2500,4,'',0,7300,,'',0,2500,4,'',0,8000,,'',0,2500,4,'',0
-'581',2101,63000,,'',0,2700,4,'',0,4600,,'',0,2700,4,'',0,600,,'',0,6800,4,'',0,500,,'',0,2800,4,'',0,100,,'',0,6800,4,'',0,2100,,'',0,2800,4,'',0,7800,,'',0,6800,4,'',0,3600,,'',0,6800,4,'',0,3800,,'',0,6800,4,'',0,3500,,'',0,6800,4,'',0,4100,,'',0,6800,4,'',0,200,,'',0,2800,4,'',0,500,,'',0,6800,4,'',0,500,,'',0,2800,4,'',0,6400,,'',0,2700,4,'',0,700,,'',0,6700,4,'',0,7800,,'',0,2500,4,'',0,8000,,'',0,2500,4,'',0,7900,,'',0,2500,4,'',0,7800,,'',0,2500,4,'',0
-'582',2101,54900,,'',0,6700,4,'',0,400,,'',0,2700,4,'',0,500,,'',0,6700,4,'',0,200,,'',0,2800,4,'',0,5300,,'',0,2800,4,'',0,400,,'',0,6800,4,'',0,200,,'',0,2800,4,'',0,2700,,'',0,6800,4,'',0,7700,,'',0,2800,4,'',0,7700,,'',0,2800,4,'',0,7600,,'',0,2800,4,'',0,8200,,'',0,2800,4,'',0,5000,,'',0,2800,4,'',0,400,,'',0,6800,4,'',0,400,,'',0,2800,4,'',0,600,,'',0,6800,4,'',0,500,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,3300,,'',0,6500,4,'',0,9000,,'',0,2500,4,'',0,7300,,'',0,2500,4,'',0,8000,,'',0,2500,4,'',0
-'576',2200,85300,4,'',0,9700,4,'',0,26800,4,'',0,22900,4,'',0,29400,4,'',0,20000,4,'',0,10300,4,'',0,10000,4,'',0,10000,4,'',0
-'576',2201,80600,,'',0,9600,,'',0,22800,,'',0,22900,,'',0,29500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',2200,63400,4,'',0,6900,4,'',0,5600,4,'',0,14300,4,'',0,12800,4,'',0,10000,4,'',0,17100,4,'',0,10000,4,'',0,13100,4,'',0,17700,4,'',0,9300,4,'',0,5200,4,'',0,17400,4,'',0,17700,4,'',0,12400,4,'',0
-'577',2201,60000,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9000,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'578',2200,63400,4,'',0,6900,4,'',0,5600,4,'',0,14300,4,'',0,12800,4,'',0,10000,4,'',0,17100,4,'',0,10000,4,'',0,13100,4,'',0,17700,4,'',0,9300,4,'',0,5200,4,'',0,17400,4,'',0,17700,4,'',0,12400,4,'',0
-'578',2201,60000,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9000,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'579',2200,63400,4,'',0,6900,4,'',0,5600,4,'',0,14300,4,'',0,12800,4,'',0,10000,4,'',0,17100,4,'',0,10000,4,'',0,13100,4,'',0,17700,4,'',0,9300,4,'',0,5200,4,'',0,17400,4,'',0,17700,4,'',0,12400,4,'',0
-'579',2201,60000,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9000,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'580',2200,63400,4,'',0,6900,4,'',0,5600,4,'',0,14300,4,'',0,12800,4,'',0,10000,4,'',0,17100,4,'',0,10000,4,'',0,13100,4,'',0,17700,4,'',0,9300,4,'',0,5200,4,'',0,17400,4,'',0,17700,4,'',0,12400,4,'',0
-'580',2201,60000,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9000,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'581',2200,93100,4,'',0,9700,4,'',0,10000,4,'',0,19500,4,'',0,9600,4,'',0,13100,4,'',0,9700,4,'',0,9600,4,'',0,17700,4,'',0,13700,4,'',0,17500,4,'',0,9800,4,'',0
-'581',2201,82900,,'',0,11000,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,12800,,'',0,10000,,'',0,9700,,'',0,18000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
-'582',2200,63400,4,'',0,6900,4,'',0,5600,4,'',0,14300,4,'',0,12800,4,'',0,10000,4,'',0,17100,4,'',0,10000,4,'',0,13100,4,'',0,17700,4,'',0,9300,4,'',0,5200,4,'',0,17400,4,'',0,17700,4,'',0,12400,4,'',0
-'582',2201,60000,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9000,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'583',2101,54900,,'',0,6700,4,'',0,400,,'',0,2700,4,'',0,500,,'',0,6700,4,'',0,200,,'',0,2800,4,'',0,5300,,'',0,2800,4,'',0,400,,'',0,6800,4,'',0,200,,'',0,2800,4,'',0,2700,,'',0,6800,4,'',0,7700,,'',0,2800,4,'',0,7700,,'',0,2800,4,'',0,7600,,'',0,2800,4,'',0,8200,,'',0,2800,4,'',0,5000,,'',0,2800,4,'',0,400,,'',0,6800,4,'',0,400,,'',0,2800,4,'',0,600,,'',0,6800,4,'',0,500,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,3300,,'',0,6500,4,'',0,9000,,'',0,2500,4,'',0,7300,,'',0,2500,4,'',0,8000,,'',0,2500,4,'',0
+'584',2101,54900,,'',0,6700,4,'',0,400,,'',0,2700,4,'',0,500,,'',0,6700,4,'',0,200,,'',0,2800,4,'',0,5300,,'',0,2800,4,'',0,400,,'',0,6800,4,'',0,200,,'',0,2800,4,'',0,2700,,'',0,6800,4,'',0,7700,,'',0,2800,4,'',0,7700,,'',0,2800,4,'',0,7600,,'',0,2800,4,'',0,8200,,'',0,2800,4,'',0,5000,,'',0,2800,4,'',0,400,,'',0,6800,4,'',0,400,,'',0,2800,4,'',0,600,,'',0,6800,4,'',0,500,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,3300,,'',0,6500,4,'',0,9000,,'',0,2500,4,'',0,7300,,'',0,2500,4,'',0,8000,,'',0,2500,4,'',0
+'585',2101,63000,,'',0,2700,4,'',0,4600,,'',0,2700,4,'',0,600,,'',0,6800,4,'',0,500,,'',0,2800,4,'',0,100,,'',0,6800,4,'',0,2100,,'',0,2800,4,'',0,7800,,'',0,6800,4,'',0,3600,,'',0,6800,4,'',0,3800,,'',0,6800,4,'',0,3500,,'',0,6800,4,'',0,4100,,'',0,6800,4,'',0,200,,'',0,2800,4,'',0,500,,'',0,6800,4,'',0,500,,'',0,2800,4,'',0,6400,,'',0,2700,4,'',0,700,,'',0,6700,4,'',0,7800,,'',0,2500,4,'',0,8000,,'',0,2500,4,'',0,7900,,'',0,2500,4,'',0,7800,,'',0,2500,4,'',0
+'586',2101,73200,,'',0,6800,4,'',0,3700,,'',0,6800,4,'',0,3200,,'',0,6800,4,'',0,4500,,'',0,6800,4,'',0,3400,,'',0,6800,4,'',0,8000,,'',0,2800,4,'',0,7500,,'',0,2800,4,'',0,2400,,'',0,6800,4,'',0,8200,,'',0,2800,4,'',0,7200,,'',0,2800,4,'',0,7600,,'',0,2600,4,'',0
+'587',2101,54900,,'',0,6700,4,'',0,400,,'',0,2700,4,'',0,500,,'',0,6700,4,'',0,200,,'',0,2800,4,'',0,5300,,'',0,2800,4,'',0,400,,'',0,6800,4,'',0,200,,'',0,2800,4,'',0,2700,,'',0,6800,4,'',0,7700,,'',0,2800,4,'',0,7700,,'',0,2800,4,'',0,7600,,'',0,2800,4,'',0,8200,,'',0,2800,4,'',0,5000,,'',0,2800,4,'',0,400,,'',0,6800,4,'',0,400,,'',0,2800,4,'',0,600,,'',0,6800,4,'',0,500,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,3300,,'',0,6500,4,'',0,9000,,'',0,2500,4,'',0,7300,,'',0,2500,4,'',0,8000,,'',0,2500,4,'',0
+'588',2101,54900,,'',0,6700,4,'',0,400,,'',0,2700,4,'',0,500,,'',0,6700,4,'',0,200,,'',0,2800,4,'',0,5300,,'',0,2800,4,'',0,400,,'',0,6800,4,'',0,200,,'',0,2800,4,'',0,2700,,'',0,6800,4,'',0,7700,,'',0,2800,4,'',0,7700,,'',0,2800,4,'',0,7600,,'',0,2800,4,'',0,8200,,'',0,2800,4,'',0,5000,,'',0,2800,4,'',0,400,,'',0,6800,4,'',0,400,,'',0,2800,4,'',0,600,,'',0,6800,4,'',0,500,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,3300,,'',0,6500,4,'',0,9000,,'',0,2500,4,'',0,7300,,'',0,2500,4,'',0,8000,,'',0,2500,4,'',0
+'589',2101,54900,,'',0,6700,4,'',0,400,,'',0,2700,4,'',0,500,,'',0,6700,4,'',0,200,,'',0,2800,4,'',0,5300,,'',0,2800,4,'',0,400,,'',0,6800,4,'',0,200,,'',0,2800,4,'',0,2700,,'',0,6800,4,'',0,7700,,'',0,2800,4,'',0,7700,,'',0,2800,4,'',0,7600,,'',0,2800,4,'',0,8200,,'',0,2800,4,'',0,5000,,'',0,2800,4,'',0,400,,'',0,6800,4,'',0,400,,'',0,2800,4,'',0,600,,'',0,6800,4,'',0,500,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,3300,,'',0,6500,4,'',0,9000,,'',0,2500,4,'',0,7300,,'',0,2500,4,'',0,8000,,'',0,2500,4,'',0
+'583',2200,63400,4,'',0,6900,4,'',0,5600,4,'',0,14300,4,'',0,12800,4,'',0,10000,4,'',0,17100,4,'',0,10000,4,'',0,13100,4,'',0,17700,4,'',0,9300,4,'',0,5200,4,'',0,17400,4,'',0,17700,4,'',0,12400,4,'',0
+'583',2201,60000,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9000,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'584',2200,63400,4,'',0,6900,4,'',0,5600,4,'',0,14300,4,'',0,12800,4,'',0,10000,4,'',0,17100,4,'',0,10000,4,'',0,13100,4,'',0,17700,4,'',0,9300,4,'',0,5200,4,'',0,17400,4,'',0,17700,4,'',0,12400,4,'',0
+'584',2201,60000,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9000,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'585',2200,93100,4,'',0,9700,4,'',0,10000,4,'',0,19500,4,'',0,9600,4,'',0,13100,4,'',0,9700,4,'',0,9600,4,'',0,17700,4,'',0,13700,4,'',0,17500,4,'',0,9800,4,'',0
+'585',2201,82900,,'',0,11000,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,12800,,'',0,10000,,'',0,9700,,'',0,18000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
+'586',2200,85300,4,'',0,9700,4,'',0,26800,4,'',0,22900,4,'',0,29400,4,'',0,20000,4,'',0,10300,4,'',0,10000,4,'',0,10000,4,'',0
+'586',2201,80600,,'',0,9600,,'',0,22800,,'',0,22900,,'',0,29500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',2200,63400,4,'',0,6900,4,'',0,5600,4,'',0,14300,4,'',0,12800,4,'',0,10000,4,'',0,17100,4,'',0,10000,4,'',0,13100,4,'',0,17700,4,'',0,9300,4,'',0,5200,4,'',0,17400,4,'',0,17700,4,'',0,12400,4,'',0
+'587',2201,60000,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9000,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'588',2200,63400,4,'',0,6900,4,'',0,5600,4,'',0,14300,4,'',0,12800,4,'',0,10000,4,'',0,17100,4,'',0,10000,4,'',0,13100,4,'',0,17700,4,'',0,9300,4,'',0,5200,4,'',0,17400,4,'',0,17700,4,'',0,12400,4,'',0
+'588',2201,60000,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9000,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'589',2200,63400,4,'',0,6900,4,'',0,5600,4,'',0,14300,4,'',0,12800,4,'',0,10000,4,'',0,17100,4,'',0,10000,4,'',0,13100,4,'',0,17700,4,'',0,9300,4,'',0,5200,4,'',0,17400,4,'',0,17700,4,'',0,12400,4,'',0
+'589',2201,60000,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9000,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_776 b/src/main/res-current/raw/current_gtfs_schedule_stop_776
index ac90f7ea7..b9b9e1300 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_776
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_776
@@ -1,7 +1,7 @@
-'576',3001,81700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',3001,61600,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1400,,'',0,1400,0,'Downtown',0,5500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,1700,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5600,,'',0,1800,,'',0,800,0,'Downtown',0,800,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,4900,0,'Downtown',0,1000,,'',0,1400,0,'Downtown',0,1400,,'',0,6000,,'',0,2000,,'',0,1500,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8000,0,'Downtown',0
-'578',3001,61600,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1400,,'',0,1400,0,'Downtown',0,5500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,1700,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5600,,'',0,1800,,'',0,800,0,'Downtown',0,800,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,4900,0,'Downtown',0,1000,,'',0,1400,0,'Downtown',0,1400,,'',0,6000,,'',0,2000,,'',0,1500,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8000,0,'Downtown',0
-'579',3001,61600,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1400,,'',0,1400,0,'Downtown',0,5500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,1700,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5600,,'',0,1800,,'',0,800,0,'Downtown',0,800,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,4900,0,'Downtown',0,1000,,'',0,1400,0,'Downtown',0,1400,,'',0,6000,,'',0,2000,,'',0,1500,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8000,0,'Downtown',0
-'580',3001,61600,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1400,,'',0,1400,0,'Downtown',0,5500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,1700,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5600,,'',0,1800,,'',0,800,0,'Downtown',0,800,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,4900,0,'Downtown',0,1000,,'',0,1400,0,'Downtown',0,1400,,'',0,6000,,'',0,2000,,'',0,1500,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8000,0,'Downtown',0
-'581',3001,71700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',3001,61600,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1400,,'',0,1400,0,'Downtown',0,5500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,1700,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5600,,'',0,1800,,'',0,800,0,'Downtown',0,800,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,4900,0,'Downtown',0,1000,,'',0,1400,0,'Downtown',0,1400,,'',0,6000,,'',0,2000,,'',0,1500,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8000,0,'Downtown',0
+'583',3001,61600,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1400,,'',0,1400,0,'Downtown',0,5500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,1700,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5600,,'',0,1800,,'',0,800,0,'Downtown',0,800,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,4900,0,'Downtown',0,1000,,'',0,1400,0,'Downtown',0,1400,,'',0,6000,,'',0,2000,,'',0,1500,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8000,0,'Downtown',0
+'584',3001,61600,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1400,,'',0,1400,0,'Downtown',0,5500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,1700,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5600,,'',0,1800,,'',0,800,0,'Downtown',0,800,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,4900,0,'Downtown',0,1000,,'',0,1400,0,'Downtown',0,1400,,'',0,6000,,'',0,2000,,'',0,1500,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8000,0,'Downtown',0
+'585',3001,71700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',3001,81700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',3001,61600,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1400,,'',0,1400,0,'Downtown',0,5500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,1700,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5600,,'',0,1800,,'',0,800,0,'Downtown',0,800,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,4900,0,'Downtown',0,1000,,'',0,1400,0,'Downtown',0,1400,,'',0,6000,,'',0,2000,,'',0,1500,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8000,0,'Downtown',0
+'588',3001,61600,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1400,,'',0,1400,0,'Downtown',0,5500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,1700,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5600,,'',0,1800,,'',0,800,0,'Downtown',0,800,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,4900,0,'Downtown',0,1000,,'',0,1400,0,'Downtown',0,1400,,'',0,6000,,'',0,2000,,'',0,1500,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8000,0,'Downtown',0
+'589',3001,61600,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1400,,'',0,1400,0,'Downtown',0,5500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,1700,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5600,,'',0,1800,,'',0,800,0,'Downtown',0,800,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,4900,0,'Downtown',0,1000,,'',0,1400,0,'Downtown',0,1400,,'',0,6000,,'',0,2000,,'',0,1500,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8000,0,'Downtown',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_777 b/src/main/res-current/raw/current_gtfs_schedule_stop_777
index e889999ce..20655f78c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_777
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_777
@@ -1,12 +1,12 @@
-'577',2901,160600,0,'',0
-'578',2901,160600,0,'',0
-'579',2901,160600,0,'',0
-'580',2901,160600,0,'',0
-'582',2901,160600,0,'',0
-'576',3000,73900,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'577',3000,55700,,'',0,7300,,'',0,2100,,'',0,5100,,'',0,1000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5800,,'',0,2400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,1500,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1300,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6400,,'',0,2500,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0
-'578',3000,55700,,'',0,7300,,'',0,2100,,'',0,5100,,'',0,1000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5800,,'',0,2400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,1500,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1300,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6400,,'',0,2500,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0
-'579',3000,55700,,'',0,7300,,'',0,2100,,'',0,5100,,'',0,1000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5800,,'',0,2400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,1500,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1300,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6400,,'',0,2500,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0
-'580',3000,55700,,'',0,7300,,'',0,2100,,'',0,5100,,'',0,1000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5800,,'',0,2400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,1500,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1300,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6400,,'',0,2500,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0
-'581',3000,72000,,'',0,9000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',3000,55700,,'',0,7300,,'',0,2100,,'',0,5100,,'',0,1000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5800,,'',0,2400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,1500,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1300,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6400,,'',0,2500,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0
+'583',2901,160600,0,'',0
+'584',2901,160600,0,'',0
+'587',2901,160600,0,'',0
+'588',2901,160600,0,'',0
+'589',2901,160600,0,'',0
+'583',3000,55700,,'',0,7300,,'',0,2100,,'',0,5100,,'',0,1000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5800,,'',0,2400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,1500,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1300,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6400,,'',0,2500,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0
+'584',3000,55700,,'',0,7300,,'',0,2100,,'',0,5100,,'',0,1000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5800,,'',0,2400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,1500,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1300,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6400,,'',0,2500,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0
+'585',3000,72000,,'',0,9000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',3000,73900,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'587',3000,55700,,'',0,7300,,'',0,2100,,'',0,5100,,'',0,1000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5800,,'',0,2400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,1500,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1300,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6400,,'',0,2500,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0
+'588',3000,55700,,'',0,7300,,'',0,2100,,'',0,5100,,'',0,1000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5800,,'',0,2400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,1500,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1300,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6400,,'',0,2500,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0
+'589',3000,55700,,'',0,7300,,'',0,2100,,'',0,5100,,'',0,1000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5800,,'',0,2400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,1500,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1300,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6400,,'',0,2500,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_778 b/src/main/res-current/raw/current_gtfs_schedule_stop_778
index 68c596e59..5b649f16b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_778
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_778
@@ -1,14 +1,14 @@
-'576',2000,81200,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'576',2001,80700,4,'',0,10300,4,'',0,10400,4,'',0,10700,4,'',0,10800,4,'',0,10100,4,'',0,10900,4,'',0,9300,4,'',0,10200,4,'',0,11100,4,'',0,10000,4,'',0,9700,4,'',0
-'577',2000,62100,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'577',2001,64900,4,'',0,10400,4,'',0,7200,4,'',0,10100,4,'',0,10700,4,'',0,10400,4,'',0,10400,4,'',0,10100,4,'',0,11000,4,'',0,7800,4,'',0,7300,4,'',0,3100,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,11500,4,'',0,9400,4,'',0,11600,4,'',0,10100,4,'',0
-'578',2000,62100,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'578',2001,64900,4,'',0,10400,4,'',0,7200,4,'',0,10100,4,'',0,10700,4,'',0,10400,4,'',0,10400,4,'',0,10100,4,'',0,11000,4,'',0,7800,4,'',0,7300,4,'',0,3100,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,11500,4,'',0,9400,4,'',0,11600,4,'',0,10100,4,'',0
-'579',2000,62100,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'579',2001,64900,4,'',0,10400,4,'',0,7200,4,'',0,10100,4,'',0,10700,4,'',0,10400,4,'',0,10400,4,'',0,10100,4,'',0,11000,4,'',0,7800,4,'',0,7300,4,'',0,3100,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,11500,4,'',0,9400,4,'',0,11600,4,'',0,10100,4,'',0
-'580',2000,62100,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'580',2001,64900,4,'',0,10400,4,'',0,7200,4,'',0,10100,4,'',0,10700,4,'',0,10400,4,'',0,10400,4,'',0,10100,4,'',0,11000,4,'',0,7800,4,'',0,7300,4,'',0,3100,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,11500,4,'',0,9400,4,'',0,11600,4,'',0,10100,4,'',0
-'581',2000,64300,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'581',2001,81300,4,'',0,10000,4,'',0,8800,4,'',0,10300,4,'',0,10600,4,'',0,10400,4,'',0,10700,4,'',0,12400,4,'',0,9100,4,'',0,19300,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0
-'582',2000,62100,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'582',2001,64900,4,'',0,10400,4,'',0,7200,4,'',0,10100,4,'',0,10700,4,'',0,10400,4,'',0,10400,4,'',0,10100,4,'',0,11000,4,'',0,7800,4,'',0,7300,4,'',0,3100,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,11500,4,'',0,9400,4,'',0,11600,4,'',0,10100,4,'',0
+'583',2000,62100,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'583',2001,64900,4,'',0,10400,4,'',0,7200,4,'',0,10100,4,'',0,10700,4,'',0,10400,4,'',0,10400,4,'',0,10100,4,'',0,11000,4,'',0,7800,4,'',0,7300,4,'',0,3100,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,11500,4,'',0,9400,4,'',0,11600,4,'',0,10100,4,'',0
+'584',2000,62100,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'584',2001,64900,4,'',0,10400,4,'',0,7200,4,'',0,10100,4,'',0,10700,4,'',0,10400,4,'',0,10400,4,'',0,10100,4,'',0,11000,4,'',0,7800,4,'',0,7300,4,'',0,3100,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,11500,4,'',0,9400,4,'',0,11600,4,'',0,10100,4,'',0
+'585',2000,64300,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
+'585',2001,81300,4,'',0,10000,4,'',0,8800,4,'',0,10300,4,'',0,10600,4,'',0,10400,4,'',0,10700,4,'',0,12400,4,'',0,9100,4,'',0,19300,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0
+'586',2000,81200,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'586',2001,80700,4,'',0,10300,4,'',0,10400,4,'',0,10700,4,'',0,10800,4,'',0,10100,4,'',0,10900,4,'',0,9300,4,'',0,10200,4,'',0,11100,4,'',0,10000,4,'',0,9700,4,'',0
+'587',2000,62100,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'587',2001,64900,4,'',0,10400,4,'',0,7200,4,'',0,10100,4,'',0,10700,4,'',0,10400,4,'',0,10400,4,'',0,10100,4,'',0,11000,4,'',0,7800,4,'',0,7300,4,'',0,3100,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,11500,4,'',0,9400,4,'',0,11600,4,'',0,10100,4,'',0
+'588',2000,62100,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'588',2001,64900,4,'',0,10400,4,'',0,7200,4,'',0,10100,4,'',0,10700,4,'',0,10400,4,'',0,10400,4,'',0,10100,4,'',0,11000,4,'',0,7800,4,'',0,7300,4,'',0,3100,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,11500,4,'',0,9400,4,'',0,11600,4,'',0,10100,4,'',0
+'589',2000,62100,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'589',2001,64900,4,'',0,10400,4,'',0,7200,4,'',0,10100,4,'',0,10700,4,'',0,10400,4,'',0,10400,4,'',0,10100,4,'',0,11000,4,'',0,7800,4,'',0,7300,4,'',0,3100,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,11500,4,'',0,9400,4,'',0,11600,4,'',0,10100,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_77831 b/src/main/res-current/raw/current_gtfs_schedule_stop_77831
index 81496222b..7e742befc 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_77831
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_77831
@@ -1,24 +1,24 @@
-'576',201,74800,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',201,60700,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'578',201,60700,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'579',201,60700,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'580',201,60700,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'581',201,81300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
-'582',201,60700,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'577',500,64600,,'',0,7700,,'',0,9600,,'',0,69700,,'',0,1500,,'',0,8000,,'',0,9000,,'',0,4000,,'',0
-'578',500,64600,,'',0,7700,,'',0,9600,,'',0,69700,,'',0,1500,,'',0,8000,,'',0,9000,,'',0,4000,,'',0
-'579',500,64600,,'',0,7700,,'',0,9600,,'',0,69700,,'',0,1500,,'',0,8000,,'',0,9000,,'',0,4000,,'',0
-'580',500,64600,,'',0,7700,,'',0,9600,,'',0,69700,,'',0,1500,,'',0,8000,,'',0,9000,,'',0,4000,,'',0
-'582',500,64600,,'',0,7700,,'',0,9600,,'',0,69700,,'',0,1500,,'',0,8000,,'',0,9000,,'',0,4000,,'',0
-'576',801,65100,,'',0,27400,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0
-'577',801,63100,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5000,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'578',801,63100,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5000,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'579',801,63100,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5000,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'580',801,63100,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5000,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'581',801,65100,,'',0,10200,,'',0,8000,,'',0,7600,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'582',801,63100,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5000,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'577',1201,65600,,'',0,8100,,'',0,8000,,'',0,63400,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4600,,'',0
-'578',1201,65600,,'',0,8100,,'',0,8000,,'',0,63400,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4600,,'',0
-'579',1201,65600,,'',0,8100,,'',0,8000,,'',0,63400,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4600,,'',0
-'580',1201,65600,,'',0,8100,,'',0,8000,,'',0,63400,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4600,,'',0
-'582',1201,65600,,'',0,8100,,'',0,8000,,'',0,63400,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4600,,'',0
+'583',201,60700,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'584',201,60700,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'585',201,81300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
+'586',201,74800,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',201,60700,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'588',201,60700,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'589',201,60700,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'583',500,64600,,'',0,7700,,'',0,9600,,'',0,69700,,'',0,1500,,'',0,8000,,'',0,9000,,'',0,4000,,'',0
+'584',500,64600,,'',0,7700,,'',0,9600,,'',0,69700,,'',0,1500,,'',0,8000,,'',0,9000,,'',0,4000,,'',0
+'587',500,64600,,'',0,7700,,'',0,9600,,'',0,69700,,'',0,1500,,'',0,8000,,'',0,9000,,'',0,4000,,'',0
+'588',500,64600,,'',0,7700,,'',0,9600,,'',0,69700,,'',0,1500,,'',0,8000,,'',0,9000,,'',0,4000,,'',0
+'589',500,64600,,'',0,7700,,'',0,9600,,'',0,69700,,'',0,1500,,'',0,8000,,'',0,9000,,'',0,4000,,'',0
+'583',801,63100,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5000,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'584',801,63100,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5000,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'585',801,65100,,'',0,10200,,'',0,8000,,'',0,7600,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
+'586',801,65100,,'',0,27400,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0
+'587',801,63100,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5000,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'588',801,63100,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5000,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'589',801,63100,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5000,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'583',1201,65600,,'',0,8100,,'',0,8000,,'',0,63400,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4600,,'',0
+'584',1201,65600,,'',0,8100,,'',0,8000,,'',0,63400,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4600,,'',0
+'587',1201,65600,,'',0,8100,,'',0,8000,,'',0,63400,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4600,,'',0
+'588',1201,65600,,'',0,8100,,'',0,8000,,'',0,63400,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4600,,'',0
+'589',1201,65600,,'',0,8100,,'',0,8000,,'',0,63400,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_77832 b/src/main/res-current/raw/current_gtfs_schedule_stop_77832
index 9bb90f0fe..36da8cb7b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_77832
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_77832
@@ -1,7 +1,7 @@
-'576',801,85500,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'577',801,60200,,'',0,4500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'578',801,60200,,'',0,4500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'579',801,60200,,'',0,4500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'580',801,60200,,'',0,4500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'581',801,72300,,'',0,8000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
-'582',801,60200,,'',0,4500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'583',801,60200,,'',0,4500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'584',801,60200,,'',0,4500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'585',801,72300,,'',0,8000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
+'586',801,85500,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'587',801,60200,,'',0,4500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'588',801,60200,,'',0,4500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'589',801,60200,,'',0,4500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_77833 b/src/main/res-current/raw/current_gtfs_schedule_stop_77833
index 247b92f75..49a6a0c2a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_77833
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_77833
@@ -1,7 +1,7 @@
-'576',800,72400,,'',0,10600,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
-'577',800,62200,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'578',800,62200,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'579',800,62200,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'580',800,62200,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'581',800,64700,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3300,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
-'582',800,62200,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'583',800,62200,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'584',800,62200,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'585',800,64700,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3300,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
+'586',800,72400,,'',0,10600,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
+'587',800,62200,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'588',800,62200,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'589',800,62200,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_779 b/src/main/res-current/raw/current_gtfs_schedule_stop_779
index 70db9ac8a..e8086974d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_779
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_779
@@ -1,28 +1,28 @@
-'576',2400,72200,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
-'576',2401,82200,4,'',0,10700,4,'',0,10400,4,'',0,10700,4,'',0,10200,4,'',0,10800,4,'',0,10300,4,'',0,9200,4,'',0,10800,4,'',0,10100,4,'',0,10200,4,'',0
-'577',2400,60400,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,14800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'577',2401,60100,4,'',0,10400,4,'',0,3200,4,'',0,10400,4,'',0,7000,4,'',0,3000,4,'',0,10800,4,'',0,10400,4,'',0,10400,4,'',0,14600,4,'',0,11100,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,8000,4,'',0,9700,4,'',0,11600,4,'',0,10100,4,'',0,10400,4,'',0
-'578',2400,60400,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,14800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'578',2401,60100,4,'',0,10400,4,'',0,3200,4,'',0,10400,4,'',0,7000,4,'',0,3000,4,'',0,10800,4,'',0,10400,4,'',0,10400,4,'',0,14600,4,'',0,11100,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,8000,4,'',0,9700,4,'',0,11600,4,'',0,10100,4,'',0,10400,4,'',0
-'579',2400,60400,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,14800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'579',2401,60100,4,'',0,10400,4,'',0,3200,4,'',0,10400,4,'',0,7000,4,'',0,3000,4,'',0,10800,4,'',0,10400,4,'',0,10400,4,'',0,14600,4,'',0,11100,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,8000,4,'',0,9700,4,'',0,11600,4,'',0,10100,4,'',0,10400,4,'',0
-'580',2400,60400,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,14800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'580',2401,60100,4,'',0,10400,4,'',0,3200,4,'',0,10400,4,'',0,7000,4,'',0,3000,4,'',0,10800,4,'',0,10400,4,'',0,10400,4,'',0,14600,4,'',0,11100,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,8000,4,'',0,9700,4,'',0,11600,4,'',0,10100,4,'',0,10400,4,'',0
-'581',2400,81700,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,14500,,'',0
-'581',2401,73000,4,'',0,10000,4,'',0,18300,4,'',0,11000,4,'',0,10400,4,'',0,10600,4,'',0,16900,4,'',0,5100,4,'',0,16100,4,'',0,2500,4,'',0,10800,4,'',0,10500,4,'',0,10500,4,'',0
-'582',2400,60400,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,14800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'582',2401,60100,4,'',0,10400,4,'',0,3200,4,'',0,10400,4,'',0,7000,4,'',0,3000,4,'',0,10800,4,'',0,10400,4,'',0,10400,4,'',0,14600,4,'',0,11100,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,8000,4,'',0,9700,4,'',0,11600,4,'',0,10100,4,'',0,10400,4,'',0
-'576',2500,102600,,'',0,22800,,'',0,29100,,'',0,26900,,'',0
-'576',2501,102200,4,'',0,22800,4,'',0,29500,4,'',0,26900,4,'',0
-'577',2500,71400,,'',0,9400,,'',0,5100,,'',0,17400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'577',2501,80400,4,'',0,5100,4,'',0,9000,4,'',0,17500,4,'',0,13300,4,'',0,17400,4,'',0,11500,4,'',0,10200,4,'',0,9300,4,'',0,8900,4,'',0
-'578',2500,71400,,'',0,9400,,'',0,5100,,'',0,17400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'578',2501,80400,4,'',0,5100,4,'',0,9000,4,'',0,17500,4,'',0,13300,4,'',0,17400,4,'',0,11500,4,'',0,10200,4,'',0,9300,4,'',0,8900,4,'',0
-'579',2500,71400,,'',0,9400,,'',0,5100,,'',0,17400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'579',2501,80400,4,'',0,5100,4,'',0,9000,4,'',0,17500,4,'',0,13300,4,'',0,17400,4,'',0,11500,4,'',0,10200,4,'',0,9300,4,'',0,8900,4,'',0
-'580',2500,71400,,'',0,9400,,'',0,5100,,'',0,17400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'580',2501,80400,4,'',0,5100,4,'',0,9000,4,'',0,17500,4,'',0,13300,4,'',0,17400,4,'',0,11500,4,'',0,10200,4,'',0,9300,4,'',0,8900,4,'',0
-'581',2500,94200,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
-'581',2501,93700,4,'',0,17200,4,'',0,13300,4,'',0,17100,4,'',0,40300,4,'',0
-'582',2500,71400,,'',0,9400,,'',0,5100,,'',0,17400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'582',2501,80400,4,'',0,5100,4,'',0,9000,4,'',0,17500,4,'',0,13300,4,'',0,17400,4,'',0,11500,4,'',0,10200,4,'',0,9300,4,'',0,8900,4,'',0
+'583',2400,60400,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,14800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'583',2401,60100,4,'',0,10400,4,'',0,3200,4,'',0,10400,4,'',0,7000,4,'',0,3000,4,'',0,10800,4,'',0,10400,4,'',0,10400,4,'',0,14600,4,'',0,11100,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,8000,4,'',0,9700,4,'',0,11600,4,'',0,10100,4,'',0,10400,4,'',0
+'584',2400,60400,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,14800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'584',2401,60100,4,'',0,10400,4,'',0,3200,4,'',0,10400,4,'',0,7000,4,'',0,3000,4,'',0,10800,4,'',0,10400,4,'',0,10400,4,'',0,14600,4,'',0,11100,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,8000,4,'',0,9700,4,'',0,11600,4,'',0,10100,4,'',0,10400,4,'',0
+'585',2400,81700,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,14500,,'',0
+'585',2401,73000,4,'',0,10000,4,'',0,18300,4,'',0,11000,4,'',0,10400,4,'',0,10600,4,'',0,16900,4,'',0,5100,4,'',0,16100,4,'',0,2500,4,'',0,10800,4,'',0,10500,4,'',0,10500,4,'',0
+'586',2400,72200,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
+'586',2401,82200,4,'',0,10700,4,'',0,10400,4,'',0,10700,4,'',0,10200,4,'',0,10800,4,'',0,10300,4,'',0,9200,4,'',0,10800,4,'',0,10100,4,'',0,10200,4,'',0
+'587',2400,60400,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,14800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'587',2401,60100,4,'',0,10400,4,'',0,3200,4,'',0,10400,4,'',0,7000,4,'',0,3000,4,'',0,10800,4,'',0,10400,4,'',0,10400,4,'',0,14600,4,'',0,11100,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,8000,4,'',0,9700,4,'',0,11600,4,'',0,10100,4,'',0,10400,4,'',0
+'588',2400,60400,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,14800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'588',2401,60100,4,'',0,10400,4,'',0,3200,4,'',0,10400,4,'',0,7000,4,'',0,3000,4,'',0,10800,4,'',0,10400,4,'',0,10400,4,'',0,14600,4,'',0,11100,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,8000,4,'',0,9700,4,'',0,11600,4,'',0,10100,4,'',0,10400,4,'',0
+'589',2400,60400,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,14800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'589',2401,60100,4,'',0,10400,4,'',0,3200,4,'',0,10400,4,'',0,7000,4,'',0,3000,4,'',0,10800,4,'',0,10400,4,'',0,10400,4,'',0,14600,4,'',0,11100,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,8000,4,'',0,9700,4,'',0,11600,4,'',0,10100,4,'',0,10400,4,'',0
+'583',2500,71400,,'',0,9400,,'',0,5100,,'',0,17400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'583',2501,80400,4,'',0,5100,4,'',0,9000,4,'',0,17500,4,'',0,13300,4,'',0,17400,4,'',0,11500,4,'',0,10200,4,'',0,9300,4,'',0,8900,4,'',0
+'584',2500,71400,,'',0,9400,,'',0,5100,,'',0,17400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'584',2501,80400,4,'',0,5100,4,'',0,9000,4,'',0,17500,4,'',0,13300,4,'',0,17400,4,'',0,11500,4,'',0,10200,4,'',0,9300,4,'',0,8900,4,'',0
+'585',2500,94200,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
+'585',2501,93700,4,'',0,17200,4,'',0,13300,4,'',0,17100,4,'',0,40300,4,'',0
+'586',2500,102600,,'',0,22800,,'',0,29100,,'',0,26900,,'',0
+'586',2501,102200,4,'',0,22800,4,'',0,29500,4,'',0,26900,4,'',0
+'587',2500,71400,,'',0,9400,,'',0,5100,,'',0,17400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'587',2501,80400,4,'',0,5100,4,'',0,9000,4,'',0,17500,4,'',0,13300,4,'',0,17400,4,'',0,11500,4,'',0,10200,4,'',0,9300,4,'',0,8900,4,'',0
+'588',2500,71400,,'',0,9400,,'',0,5100,,'',0,17400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'588',2501,80400,4,'',0,5100,4,'',0,9000,4,'',0,17500,4,'',0,13300,4,'',0,17400,4,'',0,11500,4,'',0,10200,4,'',0,9300,4,'',0,8900,4,'',0
+'589',2500,71400,,'',0,9400,,'',0,5100,,'',0,17400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'589',2501,80400,4,'',0,5100,4,'',0,9000,4,'',0,17500,4,'',0,13300,4,'',0,17400,4,'',0,11500,4,'',0,10200,4,'',0,9300,4,'',0,8900,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_78 b/src/main/res-current/raw/current_gtfs_schedule_stop_78
index 08346fdbc..689490e95 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_78
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_78
@@ -1,7 +1,7 @@
-'576',1001,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'577',1001,63300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'578',1001,63300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'579',1001,63300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'580',1001,63300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'581',1001,81300,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',1001,63300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'583',1001,63300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'584',1001,63300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'585',1001,81300,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',1001,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'587',1001,63300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'588',1001,63300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'589',1001,63300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_780 b/src/main/res-current/raw/current_gtfs_schedule_stop_780
index 03679db7d..3ad0c5a1a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_780
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_780
@@ -1,19 +1,19 @@
-'577',2700,63700,,'',0,7200,4,'',0,900,,'',0,3200,4,'',0,300,,'',0,7200,4,'',0,1100,,'',0,7200,4,'',0,62900,,'',0,7200,4,'',0,400,,'',0,3200,4,'',0,300,,'',0,7200,4,'',0,500,,'',0,3200,4,'',0,8500,,'',0,7200,4,'',0
-'578',2700,63700,,'',0,7200,4,'',0,900,,'',0,3200,4,'',0,300,,'',0,7200,4,'',0,1100,,'',0,7200,4,'',0,62900,,'',0,7200,4,'',0,400,,'',0,3200,4,'',0,300,,'',0,7200,4,'',0,500,,'',0,3200,4,'',0,8500,,'',0,7200,4,'',0
-'579',2700,63700,,'',0,7200,4,'',0,900,,'',0,3200,4,'',0,300,,'',0,7200,4,'',0,1100,,'',0,7200,4,'',0,62900,,'',0,7200,4,'',0,400,,'',0,3200,4,'',0,300,,'',0,7200,4,'',0,500,,'',0,3200,4,'',0,8500,,'',0,7200,4,'',0
-'580',2700,63700,,'',0,7200,4,'',0,900,,'',0,3200,4,'',0,300,,'',0,7200,4,'',0,1100,,'',0,7200,4,'',0,62900,,'',0,7200,4,'',0,400,,'',0,3200,4,'',0,300,,'',0,7200,4,'',0,500,,'',0,3200,4,'',0,8500,,'',0,7200,4,'',0
-'582',2700,63700,,'',0,7200,4,'',0,900,,'',0,3200,4,'',0,300,,'',0,7200,4,'',0,1100,,'',0,7200,4,'',0,62900,,'',0,7200,4,'',0,400,,'',0,3200,4,'',0,300,,'',0,7200,4,'',0,500,,'',0,3200,4,'',0,8500,,'',0,7200,4,'',0
-'576',139000,110900,4,'',0,22800,4,'',0,29100,4,'',0,30300,4,'',0
-'576',139001,71400,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
-'577',139000,60500,4,'',0,3500,4,'',0,7900,4,'',0,3700,4,'',0,7700,4,'',0,7700,4,'',0,11900,4,'',0,12400,4,'',0,17600,4,'',0,17400,4,'',0,4000,4,'',0,7700,4,'',0,3500,4,'',0,7600,4,'',0,10700,4,'',0,21300,4,'',0,17500,4,'',0
-'577',139001,60800,,'',0,3700,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,8200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
-'578',139000,60500,4,'',0,3500,4,'',0,7900,4,'',0,3700,4,'',0,7700,4,'',0,7700,4,'',0,11900,4,'',0,12400,4,'',0,17600,4,'',0,17400,4,'',0,4000,4,'',0,7700,4,'',0,3500,4,'',0,7600,4,'',0,10700,4,'',0,21300,4,'',0,17500,4,'',0
-'578',139001,60800,,'',0,3700,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,8200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
-'579',139000,60500,4,'',0,3500,4,'',0,7900,4,'',0,3700,4,'',0,7700,4,'',0,7700,4,'',0,11900,4,'',0,12400,4,'',0,17600,4,'',0,17400,4,'',0,4000,4,'',0,7700,4,'',0,3500,4,'',0,7600,4,'',0,10700,4,'',0,21300,4,'',0,17500,4,'',0
-'579',139001,60800,,'',0,3700,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,8200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
-'580',139000,60500,4,'',0,3500,4,'',0,7900,4,'',0,3700,4,'',0,7700,4,'',0,7700,4,'',0,11900,4,'',0,12400,4,'',0,17600,4,'',0,17400,4,'',0,4000,4,'',0,7700,4,'',0,3500,4,'',0,7600,4,'',0,10700,4,'',0,21300,4,'',0,17500,4,'',0
-'580',139001,60800,,'',0,3700,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,8200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
-'581',139000,74300,4,'',0,11400,4,'',0,16800,4,'',0,13300,4,'',0,17200,4,'',0,17600,4,'',0,12300,4,'',0,9000,4,'',0,19700,4,'',0,2800,4,'',0,17700,4,'',0
-'581',139001,73300,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,5100,,'',0,16400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
-'582',139000,60500,4,'',0,3500,4,'',0,7900,4,'',0,3700,4,'',0,7700,4,'',0,7700,4,'',0,11900,4,'',0,12400,4,'',0,17600,4,'',0,17400,4,'',0,4000,4,'',0,7700,4,'',0,3500,4,'',0,7600,4,'',0,10700,4,'',0,21300,4,'',0,17500,4,'',0
-'582',139001,60800,,'',0,3700,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,8200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
+'583',2700,63700,,'',0,7200,4,'',0,900,,'',0,3200,4,'',0,300,,'',0,7200,4,'',0,1100,,'',0,7200,4,'',0,62900,,'',0,7200,4,'',0,400,,'',0,3200,4,'',0,300,,'',0,7200,4,'',0,500,,'',0,3200,4,'',0,8500,,'',0,7200,4,'',0
+'584',2700,63700,,'',0,7200,4,'',0,900,,'',0,3200,4,'',0,300,,'',0,7200,4,'',0,1100,,'',0,7200,4,'',0,62900,,'',0,7200,4,'',0,400,,'',0,3200,4,'',0,300,,'',0,7200,4,'',0,500,,'',0,3200,4,'',0,8500,,'',0,7200,4,'',0
+'587',2700,63700,,'',0,7200,4,'',0,900,,'',0,3200,4,'',0,300,,'',0,7200,4,'',0,1100,,'',0,7200,4,'',0,62900,,'',0,7200,4,'',0,400,,'',0,3200,4,'',0,300,,'',0,7200,4,'',0,500,,'',0,3200,4,'',0,8500,,'',0,7200,4,'',0
+'588',2700,63700,,'',0,7200,4,'',0,900,,'',0,3200,4,'',0,300,,'',0,7200,4,'',0,1100,,'',0,7200,4,'',0,62900,,'',0,7200,4,'',0,400,,'',0,3200,4,'',0,300,,'',0,7200,4,'',0,500,,'',0,3200,4,'',0,8500,,'',0,7200,4,'',0
+'589',2700,63700,,'',0,7200,4,'',0,900,,'',0,3200,4,'',0,300,,'',0,7200,4,'',0,1100,,'',0,7200,4,'',0,62900,,'',0,7200,4,'',0,400,,'',0,3200,4,'',0,300,,'',0,7200,4,'',0,500,,'',0,3200,4,'',0,8500,,'',0,7200,4,'',0
+'583',139000,60500,4,'',0,3500,4,'',0,7900,4,'',0,3700,4,'',0,7700,4,'',0,7700,4,'',0,11900,4,'',0,12400,4,'',0,17600,4,'',0,17400,4,'',0,4000,4,'',0,7700,4,'',0,3500,4,'',0,7600,4,'',0,10700,4,'',0,21300,4,'',0,17500,4,'',0
+'583',139001,60800,,'',0,3700,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,8200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
+'584',139000,60500,4,'',0,3500,4,'',0,7900,4,'',0,3700,4,'',0,7700,4,'',0,7700,4,'',0,11900,4,'',0,12400,4,'',0,17600,4,'',0,17400,4,'',0,4000,4,'',0,7700,4,'',0,3500,4,'',0,7600,4,'',0,10700,4,'',0,21300,4,'',0,17500,4,'',0
+'584',139001,60800,,'',0,3700,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,8200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
+'585',139000,74300,4,'',0,11400,4,'',0,16800,4,'',0,13300,4,'',0,17200,4,'',0,17600,4,'',0,12300,4,'',0,9000,4,'',0,19700,4,'',0,2800,4,'',0,17700,4,'',0
+'585',139001,73300,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,5100,,'',0,16400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
+'586',139000,110900,4,'',0,22800,4,'',0,29100,4,'',0,30300,4,'',0
+'586',139001,71400,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
+'587',139000,60500,4,'',0,3500,4,'',0,7900,4,'',0,3700,4,'',0,7700,4,'',0,7700,4,'',0,11900,4,'',0,12400,4,'',0,17600,4,'',0,17400,4,'',0,4000,4,'',0,7700,4,'',0,3500,4,'',0,7600,4,'',0,10700,4,'',0,21300,4,'',0,17500,4,'',0
+'587',139001,60800,,'',0,3700,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,8200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
+'588',139000,60500,4,'',0,3500,4,'',0,7900,4,'',0,3700,4,'',0,7700,4,'',0,7700,4,'',0,11900,4,'',0,12400,4,'',0,17600,4,'',0,17400,4,'',0,4000,4,'',0,7700,4,'',0,3500,4,'',0,7600,4,'',0,10700,4,'',0,21300,4,'',0,17500,4,'',0
+'588',139001,60800,,'',0,3700,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,8200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
+'589',139000,60500,4,'',0,3500,4,'',0,7900,4,'',0,3700,4,'',0,7700,4,'',0,7700,4,'',0,11900,4,'',0,12400,4,'',0,17600,4,'',0,17400,4,'',0,4000,4,'',0,7700,4,'',0,3500,4,'',0,7600,4,'',0,10700,4,'',0,21300,4,'',0,17500,4,'',0
+'589',139001,60800,,'',0,3700,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,8200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_781 b/src/main/res-current/raw/current_gtfs_schedule_stop_781
index 024bae25a..06acf4d05 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_781
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_781
@@ -1,7 +1,7 @@
-'576',601,82500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'577',601,63300,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'578',601,63300,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'579',601,63300,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'580',601,63300,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'581',601,81000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'582',601,63300,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'583',601,63300,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'584',601,63300,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'585',601,81000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
+'586',601,82500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'587',601,63300,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'588',601,63300,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'589',601,63300,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_782 b/src/main/res-current/raw/current_gtfs_schedule_stop_782
index 3bca5c16b..8fd79ee14 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_782
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_782
@@ -1,5 +1,5 @@
-'577',2700,65600,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'578',2700,65600,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'579',2700,65600,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'580',2700,65600,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'582',2700,65600,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'583',2700,65600,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'584',2700,65600,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'587',2700,65600,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'588',2700,65600,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'589',2700,65600,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_783 b/src/main/res-current/raw/current_gtfs_schedule_stop_783
index a4bfc0d15..92e144400 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_783
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_783
@@ -1,5 +1,5 @@
-'577',2800,65500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'578',2800,65500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'579',2800,65500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'580',2800,65500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'582',2800,65500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'583',2800,65500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'584',2800,65500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'587',2800,65500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'588',2800,65500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'589',2800,65500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_784 b/src/main/res-current/raw/current_gtfs_schedule_stop_784
index a4bfc0d15..92e144400 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_784
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_784
@@ -1,5 +1,5 @@
-'577',2800,65500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'578',2800,65500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'579',2800,65500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'580',2800,65500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'582',2800,65500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'583',2800,65500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'584',2800,65500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'587',2800,65500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'588',2800,65500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'589',2800,65500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_785 b/src/main/res-current/raw/current_gtfs_schedule_stop_785
index d3060d0a3..b822f1ecb 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_785
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_785
@@ -1,7 +1,7 @@
-'576',601,80700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',601,61700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'578',601,61700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'579',601,61700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'580',601,61700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'581',601,75200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'582',601,61700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'583',601,61700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'584',601,61700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'585',601,75200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
+'586',601,80700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',601,61700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'588',601,61700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'589',601,61700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_786 b/src/main/res-current/raw/current_gtfs_schedule_stop_786
index cfd9d58d7..6bb4228af 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_786
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_786
@@ -1,7 +1,7 @@
-'576',601,80800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',601,61800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'578',601,61800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'579',601,61800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'580',601,61800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'581',601,75300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'582',601,61800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'583',601,61800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'584',601,61800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'585',601,75300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
+'586',601,80800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',601,61800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'588',601,61800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'589',601,61800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_787 b/src/main/res-current/raw/current_gtfs_schedule_stop_787
index fcbe72f94..4f2786707 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_787
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_787
@@ -1,7 +1,7 @@
-'576',601,80900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',601,61900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'578',601,61900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'579',601,61900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'580',601,61900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'581',601,75400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'582',601,61900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'583',601,61900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'584',601,61900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'585',601,75400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
+'586',601,80900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',601,61900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'588',601,61900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'589',601,61900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_788 b/src/main/res-current/raw/current_gtfs_schedule_stop_788
index 602da4e49..b44fee7e7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_788
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_788
@@ -1,7 +1,7 @@
-'576',601,81000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',601,62000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'578',601,62000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'579',601,62000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'580',601,62000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'581',601,75500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'582',601,62000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'583',601,62000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'584',601,62000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'585',601,75500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
+'586',601,81000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',601,62000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'588',601,62000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'589',601,62000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_789 b/src/main/res-current/raw/current_gtfs_schedule_stop_789
index a31a1c438..758831780 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_789
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_789
@@ -1,7 +1,7 @@
-'576',601,81200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'577',601,62100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'578',601,62100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'579',601,62100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'580',601,62100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'581',601,75700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'582',601,62100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'583',601,62100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'584',601,62100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'585',601,75700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
+'586',601,81200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'587',601,62100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'588',601,62100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'589',601,62100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_79 b/src/main/res-current/raw/current_gtfs_schedule_stop_79
index 007223fe8..4138be405 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_79
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_79
@@ -1,7 +1,7 @@
-'576',901,115200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',901,90700,,'',0,22000,,'',0,38000,,'',0
-'578',901,90700,,'',0,22000,,'',0,38000,,'',0
-'579',901,90700,,'',0,22000,,'',0,38000,,'',0
-'580',901,90700,,'',0,22000,,'',0,38000,,'',0
-'581',901,115200,,'',0,8500,,'',0,29000,,'',0,8500,,'',0
-'582',901,90700,,'',0,22000,,'',0,38000,,'',0
+'583',901,90700,,'',0,22000,,'',0,38000,,'',0
+'584',901,90700,,'',0,22000,,'',0,38000,,'',0
+'585',901,115200,,'',0,8500,,'',0,29000,,'',0,8500,,'',0
+'586',901,115200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',901,90700,,'',0,22000,,'',0,38000,,'',0
+'588',901,90700,,'',0,22000,,'',0,38000,,'',0
+'589',901,90700,,'',0,22000,,'',0,38000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_790 b/src/main/res-current/raw/current_gtfs_schedule_stop_790
index b5fbd876e..4103bc293 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_790
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_790
@@ -1,7 +1,7 @@
-'576',601,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'577',601,62200,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'578',601,62200,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'579',601,62200,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'580',601,62200,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'581',601,75800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'582',601,62200,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'583',601,62200,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'584',601,62200,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'585',601,75800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
+'586',601,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'587',601,62200,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'588',601,62200,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'589',601,62200,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_791 b/src/main/res-current/raw/current_gtfs_schedule_stop_791
index 7ab1a4bf2..a4f73ff2f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_791
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_791
@@ -1,7 +1,7 @@
-'576',601,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'577',601,62700,,'',0,3000,,'',0,7200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'578',601,62700,,'',0,3000,,'',0,7200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'579',601,62700,,'',0,3000,,'',0,7200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'580',601,62700,,'',0,3000,,'',0,7200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'581',601,80400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'582',601,62700,,'',0,3000,,'',0,7200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'583',601,62700,,'',0,3000,,'',0,7200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'584',601,62700,,'',0,3000,,'',0,7200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'585',601,80400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
+'586',601,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'587',601,62700,,'',0,3000,,'',0,7200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'588',601,62700,,'',0,3000,,'',0,7200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'589',601,62700,,'',0,3000,,'',0,7200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_792 b/src/main/res-current/raw/current_gtfs_schedule_stop_792
index d5b06f321..ecd11216c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_792
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_792
@@ -1,7 +1,7 @@
-'576',601,82000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'577',601,62800,,'',0,3000,,'',0,7200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'578',601,62800,,'',0,3000,,'',0,7200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'579',601,62800,,'',0,3000,,'',0,7200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'580',601,62800,,'',0,3000,,'',0,7200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'581',601,80500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'582',601,62800,,'',0,3000,,'',0,7200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'583',601,62800,,'',0,3000,,'',0,7200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'584',601,62800,,'',0,3000,,'',0,7200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'585',601,80500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
+'586',601,82000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'587',601,62800,,'',0,3000,,'',0,7200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'588',601,62800,,'',0,3000,,'',0,7200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'589',601,62800,,'',0,3000,,'',0,7200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_793 b/src/main/res-current/raw/current_gtfs_schedule_stop_793
index 0c405811c..49754acff 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_793
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_793
@@ -1,7 +1,7 @@
-'576',601,82200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'577',601,63000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'578',601,63000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'579',601,63000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'580',601,63000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'581',601,80700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'582',601,63000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'583',601,63000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'584',601,63000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'585',601,80700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
+'586',601,82200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'587',601,63000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'588',601,63000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'589',601,63000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_794 b/src/main/res-current/raw/current_gtfs_schedule_stop_794
index 8b31ccd33..b9ef69188 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_794
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_794
@@ -1,7 +1,7 @@
-'576',601,82300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'577',601,63100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'578',601,63100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'579',601,63100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'580',601,63100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'581',601,80800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'582',601,63100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'583',601,63100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'584',601,63100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'585',601,80800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
+'586',601,82300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'587',601,63100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'588',601,63100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'589',601,63100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_795 b/src/main/res-current/raw/current_gtfs_schedule_stop_795
index c72e1f967..f950d8873 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_795
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_795
@@ -1,7 +1,7 @@
-'576',600,90400,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',600,61600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'578',600,61600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'579',600,61600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'580',600,61600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'581',600,75000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',600,61600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'583',600,61600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'584',600,61600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'585',600,75000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',600,90400,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',600,61600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'588',600,61600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'589',600,61600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_796 b/src/main/res-current/raw/current_gtfs_schedule_stop_796
index 5b87e82a3..9808681a2 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_796
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_796
@@ -1,7 +1,7 @@
-'576',600,90500,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',600,61700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'578',600,61700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'579',600,61700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'580',600,61700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'581',600,75100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',600,61700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'583',600,61700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'584',600,61700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'585',600,75100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',600,90500,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',600,61700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'588',600,61700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'589',600,61700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_797 b/src/main/res-current/raw/current_gtfs_schedule_stop_797
index 6b1b7beae..80c785bda 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_797
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_797
@@ -1,7 +1,7 @@
-'576',600,90600,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',600,61800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'578',600,61800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'579',600,61800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'580',600,61800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'581',600,75200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',600,61800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'583',600,61800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'584',600,61800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'585',600,75200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',600,90600,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',600,61800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'588',600,61800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'589',600,61800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_798 b/src/main/res-current/raw/current_gtfs_schedule_stop_798
index d62354893..8f8563ae8 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_798
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_798
@@ -1,7 +1,7 @@
-'576',600,90800,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',600,62000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'578',600,62000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'579',600,62000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'580',600,62000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'581',600,75400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',600,62000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'583',600,62000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'584',600,62000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'585',600,75400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',600,90800,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',600,62000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'588',600,62000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'589',600,62000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_799 b/src/main/res-current/raw/current_gtfs_schedule_stop_799
index d62354893..8f8563ae8 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_799
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_799
@@ -1,7 +1,7 @@
-'576',600,90800,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',600,62000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'578',600,62000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'579',600,62000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'580',600,62000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'581',600,75400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',600,62000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'583',600,62000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'584',600,62000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'585',600,75400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',600,90800,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',600,62000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'588',600,62000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'589',600,62000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_8 b/src/main/res-current/raw/current_gtfs_schedule_stop_8
index 0b3569656..eadbd85f0 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_8
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_8
@@ -1,14 +1,14 @@
-'576',600,92400,4,'',0,3000,4,'',0,17000,4,'',0,3000,4,'',0,17000,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,9900,4,'',0
-'576',601,80500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',600,63600,4,'',0,7000,4,'',0,3100,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9700,4,'',0,7300,4,'',0,3000,4,'',0,1200,4,'',0,6000,4,'',0,3000,4,'',0,6800,4,'',0,2900,4,'',0,7000,4,'',0,9900,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0
-'577',601,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'578',600,63600,4,'',0,7000,4,'',0,3100,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9700,4,'',0,7300,4,'',0,3000,4,'',0,1200,4,'',0,6000,4,'',0,3000,4,'',0,6800,4,'',0,2900,4,'',0,7000,4,'',0,9900,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0
-'578',601,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'579',600,63600,4,'',0,7000,4,'',0,3100,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9700,4,'',0,7300,4,'',0,3000,4,'',0,1200,4,'',0,6000,4,'',0,3000,4,'',0,6800,4,'',0,2900,4,'',0,7000,4,'',0,9900,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0
-'579',601,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'580',600,63600,4,'',0,7000,4,'',0,3100,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9700,4,'',0,7300,4,'',0,3000,4,'',0,1200,4,'',0,6000,4,'',0,3000,4,'',0,6800,4,'',0,2900,4,'',0,7000,4,'',0,9900,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0
-'580',601,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'581',600,81000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,11900,4,'',0,9900,4,'',0,9900,4,'',0,10000,4,'',0
-'581',601,75000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'582',600,63600,4,'',0,7000,4,'',0,3100,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9700,4,'',0,7300,4,'',0,3000,4,'',0,1200,4,'',0,6000,4,'',0,3000,4,'',0,6800,4,'',0,2900,4,'',0,7000,4,'',0,9900,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0
-'582',601,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'583',600,63600,4,'',0,7000,4,'',0,3100,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9700,4,'',0,7300,4,'',0,3000,4,'',0,1200,4,'',0,6000,4,'',0,3000,4,'',0,6800,4,'',0,2900,4,'',0,7000,4,'',0,9900,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0
+'583',601,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'584',600,63600,4,'',0,7000,4,'',0,3100,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9700,4,'',0,7300,4,'',0,3000,4,'',0,1200,4,'',0,6000,4,'',0,3000,4,'',0,6800,4,'',0,2900,4,'',0,7000,4,'',0,9900,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0
+'584',601,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'585',600,81000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,11900,4,'',0,9900,4,'',0,9900,4,'',0,10000,4,'',0
+'585',601,75000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
+'586',600,92400,4,'',0,3000,4,'',0,17000,4,'',0,3000,4,'',0,17000,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,9900,4,'',0
+'586',601,80500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',600,63600,4,'',0,7000,4,'',0,3100,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9700,4,'',0,7300,4,'',0,3000,4,'',0,1200,4,'',0,6000,4,'',0,3000,4,'',0,6800,4,'',0,2900,4,'',0,7000,4,'',0,9900,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0
+'587',601,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'588',600,63600,4,'',0,7000,4,'',0,3100,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9700,4,'',0,7300,4,'',0,3000,4,'',0,1200,4,'',0,6000,4,'',0,3000,4,'',0,6800,4,'',0,2900,4,'',0,7000,4,'',0,9900,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0
+'588',601,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'589',600,63600,4,'',0,7000,4,'',0,3100,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9700,4,'',0,7300,4,'',0,3000,4,'',0,1200,4,'',0,6000,4,'',0,3000,4,'',0,6800,4,'',0,2900,4,'',0,7000,4,'',0,9900,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0
+'589',601,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_80 b/src/main/res-current/raw/current_gtfs_schedule_stop_80
index c6cc6aa9b..76ea6b853 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_80
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_80
@@ -1,7 +1,7 @@
-'576',1101,74600,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
-'577',1101,65300,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'578',1101,65300,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'579',1101,65300,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'580',1101,65300,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'581',1101,80700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'582',1101,65300,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'583',1101,65300,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'584',1101,65300,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'585',1101,80700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'586',1101,74600,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
+'587',1101,65300,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'588',1101,65300,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'589',1101,65300,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_800 b/src/main/res-current/raw/current_gtfs_schedule_stop_800
index 69daaf267..f39887512 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_800
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_800
@@ -1,7 +1,7 @@
-'576',600,90900,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',600,62100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'578',600,62100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'579',600,62100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'580',600,62100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'581',600,75500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',600,62100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'583',600,62100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'584',600,62100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'585',600,75500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',600,90900,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',600,62100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'588',600,62100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'589',600,62100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_801 b/src/main/res-current/raw/current_gtfs_schedule_stop_801
index f33840309..adf45f014 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_801
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_801
@@ -1,7 +1,7 @@
-'576',600,91100,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'577',600,62300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1100,,'',0,2000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'578',600,62300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1100,,'',0,2000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'579',600,62300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1100,,'',0,2000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'580',600,62300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1100,,'',0,2000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'581',600,75700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'582',600,62300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1100,,'',0,2000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'583',600,62300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1100,,'',0,2000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'584',600,62300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1100,,'',0,2000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'585',600,75700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'586',600,91100,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'587',600,62300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1100,,'',0,2000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'588',600,62300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1100,,'',0,2000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'589',600,62300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1100,,'',0,2000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_802 b/src/main/res-current/raw/current_gtfs_schedule_stop_802
index 4ff47dc6f..8b03b955a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_802
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_802
@@ -1,7 +1,7 @@
-'576',600,91100,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',600,62300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1100,,'',0,2000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'578',600,62300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1100,,'',0,2000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'579',600,62300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1100,,'',0,2000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'580',600,62300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1100,,'',0,2000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'581',600,75700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',600,62300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1100,,'',0,2000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'583',600,62300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1100,,'',0,2000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'584',600,62300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1100,,'',0,2000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'585',600,75700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',600,91100,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',600,62300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1100,,'',0,2000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'588',600,62300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1100,,'',0,2000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'589',600,62300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1100,,'',0,2000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_803 b/src/main/res-current/raw/current_gtfs_schedule_stop_803
index 51ebc47a9..2e8d05d7a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_803
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_803
@@ -1,7 +1,7 @@
-'576',600,91300,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'577',600,62500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1200,,'',0,2000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'578',600,62500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1200,,'',0,2000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'579',600,62500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1200,,'',0,2000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'580',600,62500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1200,,'',0,2000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'581',600,75900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'582',600,62500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1200,,'',0,2000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'583',600,62500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1200,,'',0,2000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'584',600,62500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1200,,'',0,2000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'585',600,75900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'586',600,91300,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'587',600,62500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1200,,'',0,2000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'588',600,62500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1200,,'',0,2000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'589',600,62500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1200,,'',0,2000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_804 b/src/main/res-current/raw/current_gtfs_schedule_stop_804
index bc7379166..7485a99b9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_804
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_804
@@ -1,7 +1,7 @@
-'576',600,91400,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'577',600,62600,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1200,,'',0,2000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'578',600,62600,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1200,,'',0,2000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'579',600,62600,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1200,,'',0,2000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'580',600,62600,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1200,,'',0,2000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'581',600,80000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'582',600,62600,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1200,,'',0,2000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'583',600,62600,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1200,,'',0,2000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'584',600,62600,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1200,,'',0,2000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'585',600,80000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'586',600,91400,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'587',600,62600,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1200,,'',0,2000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'588',600,62600,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1200,,'',0,2000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'589',600,62600,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1200,,'',0,2000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_805 b/src/main/res-current/raw/current_gtfs_schedule_stop_805
index d7e642418..d229b4a61 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_805
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_805
@@ -1,7 +1,7 @@
-'576',600,91500,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'577',600,62700,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'578',600,62700,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'579',600,62700,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'580',600,62700,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'581',600,80100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'582',600,62700,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'583',600,62700,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'584',600,62700,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'585',600,80100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'586',600,91500,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'587',600,62700,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'588',600,62700,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'589',600,62700,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_806 b/src/main/res-current/raw/current_gtfs_schedule_stop_806
index 24b697ffe..a8a67ea94 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_806
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_806
@@ -1,7 +1,7 @@
-'576',600,91700,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'577',600,62900,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,5900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'578',600,62900,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,5900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'579',600,62900,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,5900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'580',600,62900,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,5900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'581',600,80300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'582',600,62900,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,5900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'583',600,62900,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,5900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'584',600,62900,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,5900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'585',600,80300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'586',600,91700,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'587',600,62900,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,5900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'588',600,62900,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,5900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'589',600,62900,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,5900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_807 b/src/main/res-current/raw/current_gtfs_schedule_stop_807
index 268c8947d..a968fc276 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_807
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_807
@@ -1,7 +1,7 @@
-'576',600,91900,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'577',600,63100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'578',600,63100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'579',600,63100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'580',600,63100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'581',600,80500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'582',600,63100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'583',600,63100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'584',600,63100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'585',600,80500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'586',600,91900,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'587',600,63100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'588',600,63100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'589',600,63100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_808 b/src/main/res-current/raw/current_gtfs_schedule_stop_808
index ea222acd3..1de374656 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_808
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_808
@@ -1,7 +1,7 @@
-'576',600,92000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'577',600,63200,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'578',600,63200,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'579',600,63200,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'580',600,63200,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'581',600,80600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'582',600,63200,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'583',600,63200,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'584',600,63200,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'585',600,80600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'586',600,92000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'587',600,63200,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'588',600,63200,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'589',600,63200,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_809 b/src/main/res-current/raw/current_gtfs_schedule_stop_809
index b3bf2b041..261e6a3d7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_809
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_809
@@ -1,7 +1,7 @@
-'576',600,92200,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0
-'577',600,63400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'578',600,63400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'579',600,63400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'580',600,63400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'581',600,80800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
-'582',600,63400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'583',600,63400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'584',600,63400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'585',600,80800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'586',600,92200,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,17000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0
+'587',600,63400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'588',600,63400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'589',600,63400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_81 b/src/main/res-current/raw/current_gtfs_schedule_stop_81
index f86774a12..df26d7155 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_81
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_81
@@ -1,7 +1,7 @@
-'576',601,81500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'577',601,62300,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'578',601,62300,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'579',601,62300,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'580',601,62300,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'581',601,80000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'582',601,62300,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'583',601,62300,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'584',601,62300,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'585',601,80000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
+'586',601,81500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'587',601,62300,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'588',601,62300,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'589',601,62300,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_810 b/src/main/res-current/raw/current_gtfs_schedule_stop_810
index 564b052a8..4702ed260 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_810
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_810
@@ -1,7 +1,7 @@
-'576',800,70200,,'',0,10200,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
-'577',800,60000,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
-'578',800,60000,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
-'579',800,60000,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
-'580',800,60000,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
-'581',800,70000,,'',0,4500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'582',800,60000,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'583',800,60000,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'584',800,60000,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'585',800,70000,,'',0,4500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
+'586',800,70200,,'',0,10200,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
+'587',800,60000,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'588',800,60000,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'589',800,60000,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_811 b/src/main/res-current/raw/current_gtfs_schedule_stop_811
index 7013796ce..c5aece4ea 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_811
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_811
@@ -1,7 +1,7 @@
-'576',801,64500,,'',0,27400,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
-'577',801,62500,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'578',801,62500,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'579',801,62500,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'580',801,62500,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'581',801,64600,,'',0,10200,,'',0,8000,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'582',801,62500,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'583',801,62500,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'584',801,62500,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'585',801,64600,,'',0,10200,,'',0,8000,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
+'586',801,64500,,'',0,27400,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
+'587',801,62500,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'588',801,62500,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'589',801,62500,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_812 b/src/main/res-current/raw/current_gtfs_schedule_stop_812
index 995d2a016..6723b3885 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_812
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_812
@@ -1,7 +1,7 @@
-'576',801,64600,,'',0,27400,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
-'577',801,62600,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'578',801,62600,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'579',801,62600,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'580',801,62600,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'581',801,64700,,'',0,10200,,'',0,8000,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'582',801,62600,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'583',801,62600,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'584',801,62600,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'585',801,64700,,'',0,10200,,'',0,8000,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
+'586',801,64600,,'',0,27400,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
+'587',801,62600,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'588',801,62600,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'589',801,62600,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_813 b/src/main/res-current/raw/current_gtfs_schedule_stop_813
index 26a801640..cca3fa59d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_813
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_813
@@ -1,7 +1,7 @@
-'576',800,70200,,'',0,10200,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
-'577',800,60000,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'578',800,60000,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'579',800,60000,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'580',800,60000,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'581',800,65900,,'',0,8500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'582',800,60000,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'583',800,60000,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'584',800,60000,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'585',800,65900,,'',0,8500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
+'586',800,70200,,'',0,10200,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
+'587',800,60000,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'588',800,60000,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'589',800,60000,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_814 b/src/main/res-current/raw/current_gtfs_schedule_stop_814
index 789965fd7..559eb9d23 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_814
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_814
@@ -1,7 +1,7 @@
-'576',801,64400,,'',0,27400,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
-'577',801,62400,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8400,,'',0
-'578',801,62400,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8400,,'',0
-'579',801,62400,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8400,,'',0
-'580',801,62400,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8400,,'',0
-'581',801,64500,,'',0,10200,,'',0,8000,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'582',801,62400,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8400,,'',0
+'583',801,62400,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8400,,'',0
+'584',801,62400,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8400,,'',0
+'585',801,64500,,'',0,10200,,'',0,8000,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
+'586',801,64400,,'',0,27400,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
+'587',801,62400,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8400,,'',0
+'588',801,62400,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8400,,'',0
+'589',801,62400,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_815 b/src/main/res-current/raw/current_gtfs_schedule_stop_815
index a941a0c36..0c7e5bebe 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_815
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_815
@@ -1,7 +1,7 @@
-'576',3001,73200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0
-'577',3001,63100,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,700,,'',0,700,,'',0,4700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,500,,'',0,5400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,5000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,800,,'',0,4900,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,800,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2700,,'',0,6000,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,3300,,'',0,6200,,'',0,2500,,'',0,6400,,'',0,2700,,'',0,2300,,'',0,6600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
-'578',3001,63100,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,700,,'',0,700,,'',0,4700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,500,,'',0,5400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,5000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,800,,'',0,4900,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,800,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2700,,'',0,6000,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,3300,,'',0,6200,,'',0,2500,,'',0,6400,,'',0,2700,,'',0,2300,,'',0,6600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
-'579',3001,63100,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,700,,'',0,700,,'',0,4700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,500,,'',0,5400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,5000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,800,,'',0,4900,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,800,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2700,,'',0,6000,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,3300,,'',0,6200,,'',0,2500,,'',0,6400,,'',0,2700,,'',0,2300,,'',0,6600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
-'580',3001,63100,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,700,,'',0,700,,'',0,4700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,500,,'',0,5400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,5000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,800,,'',0,4900,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,800,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2700,,'',0,6000,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,3300,,'',0,6200,,'',0,2500,,'',0,6400,,'',0,2700,,'',0,2300,,'',0,6600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,9000,,'',0,8000,,'',0
-'581',3001,73200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'582',3001,63100,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,700,,'',0,700,,'',0,4700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,500,,'',0,5400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,5000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,800,,'',0,4900,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,800,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2700,,'',0,6000,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,3300,,'',0,6200,,'',0,2500,,'',0,6400,,'',0,2700,,'',0,2300,,'',0,6600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
+'583',3001,63100,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,700,,'',0,700,,'',0,4700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,500,,'',0,5400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,5000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,800,,'',0,4900,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,800,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2700,,'',0,6000,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,3300,,'',0,6200,,'',0,2500,,'',0,6400,,'',0,2700,,'',0,2300,,'',0,6600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
+'584',3001,63100,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,700,,'',0,700,,'',0,4700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,500,,'',0,5400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,5000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,800,,'',0,4900,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,800,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2700,,'',0,6000,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,3300,,'',0,6200,,'',0,2500,,'',0,6400,,'',0,2700,,'',0,2300,,'',0,6600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,9000,,'',0,8000,,'',0
+'585',3001,73200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'586',3001,73200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0
+'587',3001,63100,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,700,,'',0,700,,'',0,4700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,500,,'',0,5400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,5000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,800,,'',0,4900,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,800,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2700,,'',0,6000,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,3300,,'',0,6200,,'',0,2500,,'',0,6400,,'',0,2700,,'',0,2300,,'',0,6600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
+'588',3001,63100,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,700,,'',0,700,,'',0,4700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,500,,'',0,5400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,5000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,800,,'',0,4900,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,800,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2700,,'',0,6000,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,3300,,'',0,6200,,'',0,2500,,'',0,6400,,'',0,2700,,'',0,2300,,'',0,6600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
+'589',3001,63100,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,800,,'',0,700,,'',0,700,,'',0,4700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,500,,'',0,5400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,5000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,800,,'',0,800,,'',0,4900,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,900,,'',0,800,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2700,,'',0,6000,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,3300,,'',0,6200,,'',0,2500,,'',0,6400,,'',0,2700,,'',0,2300,,'',0,6600,,'',0,2300,,'',0,6500,,'',0,2400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_816 b/src/main/res-current/raw/current_gtfs_schedule_stop_816
index 329c86828..589404d1c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_816
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_816
@@ -1,19 +1,19 @@
-'577',600,63000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,5900,,'',0,10000,,'',0
-'578',600,63000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,5900,,'',0,10000,,'',0
-'579',600,63000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,5900,,'',0,10000,,'',0
-'580',600,63000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,5900,,'',0,10000,,'',0
-'582',600,63000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,5900,,'',0,10000,,'',0
-'576',700,85900,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'577',700,71000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'578',700,71000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'579',700,71000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'580',700,71000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'581',700,82200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',700,71000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'576',1801,82500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'577',1801,64200,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
-'578',1801,64200,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
-'579',1801,64200,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
-'580',1801,64200,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
-'581',1801,75600,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'582',1801,64200,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
+'583',600,63000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,5900,,'',0,10000,,'',0
+'584',600,63000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,5900,,'',0,10000,,'',0
+'587',600,63000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,5900,,'',0,10000,,'',0
+'588',600,63000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,5900,,'',0,10000,,'',0
+'589',600,63000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,5900,,'',0,10000,,'',0
+'583',700,71000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'584',700,71000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'585',700,82200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',700,85900,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
+'587',700,71000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'588',700,71000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'589',700,71000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'583',1801,64200,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
+'584',1801,64200,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
+'585',1801,75600,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'586',1801,82500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'587',1801,64200,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
+'588',1801,64200,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
+'589',1801,64200,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_817 b/src/main/res-current/raw/current_gtfs_schedule_stop_817
index b60c6beb2..4675bd798 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_817
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_817
@@ -1,14 +1,14 @@
-'576',701,80400,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'577',701,61900,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
-'578',701,61900,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
-'579',701,61900,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
-'580',701,61900,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
-'581',701,80900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',701,61900,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
-'576',1800,73400,,'',0,10100,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11400,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'577',1800,61900,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
-'578',1800,61900,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
-'579',1800,61900,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
-'580',1800,61900,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
-'581',1800,73400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'582',1800,61900,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
+'583',701,61900,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
+'584',701,61900,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
+'585',701,80900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',701,80400,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'587',701,61900,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
+'588',701,61900,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
+'589',701,61900,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,21000,,'',0
+'583',1800,61900,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
+'584',1800,61900,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
+'585',1800,73400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'586',1800,73400,,'',0,10100,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11400,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'587',1800,61900,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
+'588',1800,61900,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
+'589',1800,61900,,'',0,3500,,'',0,6600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_819 b/src/main/res-current/raw/current_gtfs_schedule_stop_819
index 5c978e8ba..4d49f8d2c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_819
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_819
@@ -1,14 +1,14 @@
-'576',200,81900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
-'577',200,61400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'578',200,61400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'579',200,61400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'580',200,61400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'581',200,81800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'582',200,61400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'576',800,70000,,'',0,10200,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
-'577',800,55800,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'578',800,55800,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'579',800,55800,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'580',800,55800,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'581',800,65700,,'',0,8500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'582',800,55800,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'583',200,61400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'584',200,61400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'585',200,81800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
+'586',200,81900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
+'587',200,61400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'588',200,61400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'589',200,61400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'583',800,55800,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'584',800,55800,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'585',800,65700,,'',0,8500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
+'586',800,70000,,'',0,10200,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
+'587',800,55800,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'588',800,55800,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'589',800,55800,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_82 b/src/main/res-current/raw/current_gtfs_schedule_stop_82
index abefa1924..851f5e8ed 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_82
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_82
@@ -1,7 +1,7 @@
-'576',800,70300,,'',0,10200,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
-'577',800,60200,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'578',800,60200,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'579',800,60200,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'580',800,60200,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'581',800,70100,,'',0,4500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'582',800,60200,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'583',800,60200,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'584',800,60200,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'585',800,70100,,'',0,4500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
+'586',800,70300,,'',0,10200,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
+'587',800,60200,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'588',800,60200,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'589',800,60200,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_820 b/src/main/res-current/raw/current_gtfs_schedule_stop_820
index 4533c5499..bd3dc801e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_820
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_820
@@ -1,5 +1,5 @@
-'577',2800,64700,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'578',2800,64700,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'579',2800,64700,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'580',2800,64700,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'582',2800,64700,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'583',2800,64700,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'584',2800,64700,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'587',2800,64700,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'588',2800,64700,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'589',2800,64700,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_821 b/src/main/res-current/raw/current_gtfs_schedule_stop_821
index 453554b05..d44bbea47 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_821
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_821
@@ -1,7 +1,7 @@
-'576',1001,83900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'577',1001,63400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'578',1001,63400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'579',1001,63400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'580',1001,63400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'581',1001,81400,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',1001,63400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'583',1001,63400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'584',1001,63400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'585',1001,81400,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',1001,83900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'587',1001,63400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'588',1001,63400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'589',1001,63400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_822 b/src/main/res-current/raw/current_gtfs_schedule_stop_822
index 1b5c2ecf7..36724bf03 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_822
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_822
@@ -1,5 +1,5 @@
-'577',2601,72100,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'578',2601,72100,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'579',2601,72100,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'580',2601,72100,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'582',2601,72100,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'583',2601,72100,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'584',2601,72100,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'587',2601,72100,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'588',2601,72100,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'589',2601,72100,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_823 b/src/main/res-current/raw/current_gtfs_schedule_stop_823
index 6e4a5ac1d..d27f72ce8 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_823
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_823
@@ -1,5 +1,5 @@
-'577',2601,72300,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'578',2601,72300,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'579',2601,72300,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'580',2601,72300,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'582',2601,72300,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'583',2601,72300,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'584',2601,72300,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'587',2601,72300,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'588',2601,72300,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'589',2601,72300,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_824 b/src/main/res-current/raw/current_gtfs_schedule_stop_824
index e011b4192..347fb4965 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_824
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_824
@@ -1,5 +1,5 @@
-'577',2601,72400,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'578',2601,72400,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'579',2601,72400,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'580',2601,72400,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'582',2601,72400,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'583',2601,72400,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'584',2601,72400,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'587',2601,72400,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'588',2601,72400,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'589',2601,72400,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_825 b/src/main/res-current/raw/current_gtfs_schedule_stop_825
index e011b4192..347fb4965 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_825
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_825
@@ -1,5 +1,5 @@
-'577',2601,72400,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'578',2601,72400,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'579',2601,72400,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'580',2601,72400,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'582',2601,72400,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'583',2601,72400,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'584',2601,72400,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'587',2601,72400,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'588',2601,72400,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'589',2601,72400,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_826 b/src/main/res-current/raw/current_gtfs_schedule_stop_826
index cd9a41298..f42769d91 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_826
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_826
@@ -1,5 +1,5 @@
-'577',2601,72500,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'578',2601,72500,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'579',2601,72500,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'580',2601,72500,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'582',2601,72500,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'583',2601,72500,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'584',2601,72500,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'587',2601,72500,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'588',2601,72500,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'589',2601,72500,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_827 b/src/main/res-current/raw/current_gtfs_schedule_stop_827
index 12e94774b..4f1c6b96f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_827
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_827
@@ -1,5 +1,5 @@
-'577',2601,72600,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'578',2601,72600,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'579',2601,72600,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'580',2601,72600,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'582',2601,72600,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'583',2601,72600,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'584',2601,72600,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'587',2601,72600,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'588',2601,72600,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'589',2601,72600,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_828 b/src/main/res-current/raw/current_gtfs_schedule_stop_828
index 12e94774b..4f1c6b96f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_828
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_828
@@ -1,5 +1,5 @@
-'577',2601,72600,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'578',2601,72600,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'579',2601,72600,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'580',2601,72600,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
-'582',2601,72600,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'583',2601,72600,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'584',2601,72600,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'587',2601,72600,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'588',2601,72600,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
+'589',2601,72600,,'',0,9300,,'',0,69800,,'',0,9000,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_829 b/src/main/res-current/raw/current_gtfs_schedule_stop_829
index 6310672fb..cbcee5dea 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_829
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_829
@@ -1,17 +1,17 @@
-'576',2001,80200,,'',0,10300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'577',2001,64400,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'578',2001,64400,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'579',2001,64400,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'580',2001,64400,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'581',2001,80800,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,14600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'582',2001,64400,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'577',2700,70400,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'578',2700,70400,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'579',2700,70400,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'580',2700,70400,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'582',2700,70400,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'577',2901,160100,0,'',0
-'578',2901,160100,0,'',0
-'579',2901,160100,0,'',0
-'580',2901,160100,0,'',0
-'582',2901,160100,0,'',0
+'583',2001,64400,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'584',2001,64400,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'585',2001,80800,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,14600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'586',2001,80200,,'',0,10300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'587',2001,64400,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'588',2001,64400,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'589',2001,64400,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'583',2700,70400,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'584',2700,70400,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'587',2700,70400,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'588',2700,70400,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'589',2700,70400,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'583',2901,160100,0,'',0
+'584',2901,160100,0,'',0
+'587',2901,160100,0,'',0
+'588',2901,160100,0,'',0
+'589',2901,160100,0,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_83 b/src/main/res-current/raw/current_gtfs_schedule_stop_83
index c6aff7bde..7089473df 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_83
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_83
@@ -1,7 +1,7 @@
-'576',900,121500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',900,93200,,'',0,31200,,'',0,28800,,'',0
-'578',900,93200,,'',0,31200,,'',0,28800,,'',0
-'579',900,93200,,'',0,31200,,'',0,28800,,'',0
-'580',900,93200,,'',0,31200,,'',0,28800,,'',0
-'581',900,121500,,'',0,8500,,'',0,20500,,'',0,4500,,'',0
-'582',900,93200,,'',0,31200,,'',0,28800,,'',0
+'583',900,93200,,'',0,31200,,'',0,28800,,'',0
+'584',900,93200,,'',0,31200,,'',0,28800,,'',0
+'585',900,121500,,'',0,8500,,'',0,20500,,'',0,4500,,'',0
+'586',900,121500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',900,93200,,'',0,31200,,'',0,28800,,'',0
+'588',900,93200,,'',0,31200,,'',0,28800,,'',0
+'589',900,93200,,'',0,31200,,'',0,28800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_830 b/src/main/res-current/raw/current_gtfs_schedule_stop_830
index 3d7e7d5f6..0d6ed9c83 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_830
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_830
@@ -1,7 +1,7 @@
-'576',2000,81500,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'577',2000,62400,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'578',2000,62400,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'579',2000,62400,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'580',2000,62400,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'581',2000,64600,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'582',2000,62400,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'583',2000,62400,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'584',2000,62400,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'585',2000,64600,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
+'586',2000,81500,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'587',2000,62400,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'588',2000,62400,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'589',2000,62400,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_831 b/src/main/res-current/raw/current_gtfs_schedule_stop_831
index 2c364b34f..4a60e6d26 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_831
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_831
@@ -1,7 +1,7 @@
-'576',2501,100400,,'',0,22800,,'',0,29500,,'',0,22900,,'',0
-'577',2501,74600,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'578',2501,74600,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'579',2501,74600,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'580',2501,74600,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'581',2501,91900,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,40300,,'',0
-'582',2501,74600,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'583',2501,74600,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'584',2501,74600,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'585',2501,91900,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,40300,,'',0
+'586',2501,100400,,'',0,22800,,'',0,29500,,'',0,22900,,'',0
+'587',2501,74600,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'588',2501,74600,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'589',2501,74600,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_832 b/src/main/res-current/raw/current_gtfs_schedule_stop_832
index d655b7083..af0aa77a1 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_832
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_832
@@ -1,7 +1,7 @@
-'576',2501,100500,,'',0,22800,,'',0,29500,,'',0,22900,,'',0
-'577',2501,74700,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'578',2501,74700,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'579',2501,74700,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'580',2501,74700,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'581',2501,92000,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,40300,,'',0
-'582',2501,74700,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'583',2501,74700,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'584',2501,74700,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'585',2501,92000,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,40300,,'',0
+'586',2501,100500,,'',0,22800,,'',0,29500,,'',0,22900,,'',0
+'587',2501,74700,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'588',2501,74700,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'589',2501,74700,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_833 b/src/main/res-current/raw/current_gtfs_schedule_stop_833
index 622c4553e..eb589e5fa 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_833
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_833
@@ -1,5 +1,5 @@
-'577',2700,64100,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'578',2700,64100,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'579',2700,64100,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'580',2700,64100,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
-'582',2700,64100,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'583',2700,64100,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'584',2700,64100,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'587',2700,64100,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'588',2700,64100,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'589',2700,64100,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_835 b/src/main/res-current/raw/current_gtfs_schedule_stop_835
index 76edf70fe..47e1e61ba 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_835
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_835
@@ -1,7 +1,7 @@
-'576',3001,81200,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',3001,61200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1400,0,'Downtown',0,5500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,800,0,'Downtown',0,800,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,1000,0,'Downtown',0,5000,,'',0,1400,0,'Downtown',0,1400,,'',0,2000,,'',0,6000,,'',0,1500,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8000,0,'Downtown',0
-'578',3001,61200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1400,0,'Downtown',0,5500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,800,0,'Downtown',0,800,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,1000,0,'Downtown',0,5000,,'',0,1400,0,'Downtown',0,1400,,'',0,2000,,'',0,6000,,'',0,1500,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8000,0,'Downtown',0
-'579',3001,61200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1400,0,'Downtown',0,5500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,800,0,'Downtown',0,800,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,1000,0,'Downtown',0,5000,,'',0,1400,0,'Downtown',0,1400,,'',0,2000,,'',0,6000,,'',0,1500,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8000,0,'Downtown',0
-'580',3001,61200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1400,0,'Downtown',0,5500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,800,0,'Downtown',0,800,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,1000,0,'Downtown',0,5000,,'',0,1400,0,'Downtown',0,1400,,'',0,2000,,'',0,6000,,'',0,1500,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8000,0,'Downtown',0
-'581',3001,71200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',3001,61200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1400,0,'Downtown',0,5500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,800,0,'Downtown',0,800,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,1000,0,'Downtown',0,5000,,'',0,1400,0,'Downtown',0,1400,,'',0,2000,,'',0,6000,,'',0,1500,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8000,0,'Downtown',0
+'583',3001,61200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1400,0,'Downtown',0,5500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,800,0,'Downtown',0,800,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,1000,0,'Downtown',0,5000,,'',0,1400,0,'Downtown',0,1400,,'',0,2000,,'',0,6000,,'',0,1500,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8000,0,'Downtown',0
+'584',3001,61200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1400,0,'Downtown',0,5500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,800,0,'Downtown',0,800,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,1000,0,'Downtown',0,5000,,'',0,1400,0,'Downtown',0,1400,,'',0,2000,,'',0,6000,,'',0,1500,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8000,0,'Downtown',0
+'585',3001,71200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',3001,81200,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',3001,61200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1400,0,'Downtown',0,5500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,800,0,'Downtown',0,800,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,1000,0,'Downtown',0,5000,,'',0,1400,0,'Downtown',0,1400,,'',0,2000,,'',0,6000,,'',0,1500,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8000,0,'Downtown',0
+'588',3001,61200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1400,0,'Downtown',0,5500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,800,0,'Downtown',0,800,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,1000,0,'Downtown',0,5000,,'',0,1400,0,'Downtown',0,1400,,'',0,2000,,'',0,6000,,'',0,1500,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8000,0,'Downtown',0
+'589',3001,61200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1400,0,'Downtown',0,5500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,800,0,'Downtown',0,800,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,1000,0,'Downtown',0,5000,,'',0,1400,0,'Downtown',0,1400,,'',0,2000,,'',0,6000,,'',0,1500,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8000,0,'Downtown',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_836 b/src/main/res-current/raw/current_gtfs_schedule_stop_836
index cb04c1bca..7e0eb16ed 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_836
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_836
@@ -1,7 +1,7 @@
-'576',3000,74600,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'577',3000,60200,,'',0,3300,,'',0,2200,,'',0,5100,,'',0,1100,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1800,,'',0,2400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,1600,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1300,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6400,,'',0,2500,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,5000,,'',0
-'578',3000,60200,,'',0,3300,,'',0,2200,,'',0,5100,,'',0,1100,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1800,,'',0,2400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,1600,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1300,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6400,,'',0,2500,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,5000,,'',0
-'579',3000,60200,,'',0,3300,,'',0,2200,,'',0,5100,,'',0,1100,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1800,,'',0,2400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,1600,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1300,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6400,,'',0,2500,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,5000,,'',0
-'580',3000,60200,,'',0,3300,,'',0,2200,,'',0,5100,,'',0,1100,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1800,,'',0,2400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,1600,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1300,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6400,,'',0,2500,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,5000,,'',0
-'581',3000,72700,,'',0,9000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',3000,60200,,'',0,3300,,'',0,2200,,'',0,5100,,'',0,1100,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1800,,'',0,2400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,1600,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1300,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6400,,'',0,2500,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,5000,,'',0
+'583',3000,60200,,'',0,3300,,'',0,2200,,'',0,5100,,'',0,1100,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1800,,'',0,2400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,1600,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1300,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6400,,'',0,2500,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,5000,,'',0
+'584',3000,60200,,'',0,3300,,'',0,2200,,'',0,5100,,'',0,1100,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1800,,'',0,2400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,1600,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1300,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6400,,'',0,2500,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,5000,,'',0
+'585',3000,72700,,'',0,9000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',3000,74600,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'587',3000,60200,,'',0,3300,,'',0,2200,,'',0,5100,,'',0,1100,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1800,,'',0,2400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,1600,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1300,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6400,,'',0,2500,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,5000,,'',0
+'588',3000,60200,,'',0,3300,,'',0,2200,,'',0,5100,,'',0,1100,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1800,,'',0,2400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,1600,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1300,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6400,,'',0,2500,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,5000,,'',0
+'589',3000,60200,,'',0,3300,,'',0,2200,,'',0,5100,,'',0,1100,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1800,,'',0,2400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,1600,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1300,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6400,,'',0,2500,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,5000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_837 b/src/main/res-current/raw/current_gtfs_schedule_stop_837
index 38618532c..17995260e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_837
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_837
@@ -1,7 +1,7 @@
-'576',3001,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',3001,61800,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1400,,'',0,1400,0,'Downtown',0,5500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,1700,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5600,,'',0,1800,,'',0,800,0,'Downtown',0,800,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,4900,0,'Downtown',0,1000,,'',0,1400,0,'Downtown',0,1400,,'',0,6000,,'',0,2000,,'',0,1500,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8000,0,'Downtown',0
-'578',3001,61800,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1400,,'',0,1400,0,'Downtown',0,5500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,1700,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5600,,'',0,1800,,'',0,800,0,'Downtown',0,800,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,4900,0,'Downtown',0,1000,,'',0,1400,0,'Downtown',0,1400,,'',0,6000,,'',0,2000,,'',0,1500,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8000,0,'Downtown',0
-'579',3001,61800,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1400,,'',0,1400,0,'Downtown',0,5500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,1700,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5600,,'',0,1800,,'',0,800,0,'Downtown',0,800,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,4900,0,'Downtown',0,1000,,'',0,1400,0,'Downtown',0,1400,,'',0,6000,,'',0,2000,,'',0,1500,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8000,0,'Downtown',0
-'580',3001,61800,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1400,,'',0,1400,0,'Downtown',0,5500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,1700,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5600,,'',0,1800,,'',0,800,0,'Downtown',0,800,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,4900,0,'Downtown',0,1000,,'',0,1400,0,'Downtown',0,1400,,'',0,6000,,'',0,2000,,'',0,1500,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8000,0,'Downtown',0
-'581',3001,71900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',3001,61800,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1400,,'',0,1400,0,'Downtown',0,5500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,1700,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5600,,'',0,1800,,'',0,800,0,'Downtown',0,800,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,4900,0,'Downtown',0,1000,,'',0,1400,0,'Downtown',0,1400,,'',0,6000,,'',0,2000,,'',0,1500,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8000,0,'Downtown',0
+'583',3001,61800,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1400,,'',0,1400,0,'Downtown',0,5500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,1700,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5600,,'',0,1800,,'',0,800,0,'Downtown',0,800,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,4900,0,'Downtown',0,1000,,'',0,1400,0,'Downtown',0,1400,,'',0,6000,,'',0,2000,,'',0,1500,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8000,0,'Downtown',0
+'584',3001,61800,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1400,,'',0,1400,0,'Downtown',0,5500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,1700,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5600,,'',0,1800,,'',0,800,0,'Downtown',0,800,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,4900,0,'Downtown',0,1000,,'',0,1400,0,'Downtown',0,1400,,'',0,6000,,'',0,2000,,'',0,1500,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8000,0,'Downtown',0
+'585',3001,71900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',3001,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',3001,61800,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1400,,'',0,1400,0,'Downtown',0,5500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,1700,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5600,,'',0,1800,,'',0,800,0,'Downtown',0,800,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,4900,0,'Downtown',0,1000,,'',0,1400,0,'Downtown',0,1400,,'',0,6000,,'',0,2000,,'',0,1500,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8000,0,'Downtown',0
+'588',3001,61800,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1400,,'',0,1400,0,'Downtown',0,5500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,1700,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5600,,'',0,1800,,'',0,800,0,'Downtown',0,800,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,4900,0,'Downtown',0,1000,,'',0,1400,0,'Downtown',0,1400,,'',0,6000,,'',0,2000,,'',0,1500,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8000,0,'Downtown',0
+'589',3001,61800,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1400,,'',0,1400,0,'Downtown',0,5500,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,1700,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5600,,'',0,1800,,'',0,800,0,'Downtown',0,800,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,4900,0,'Downtown',0,1000,,'',0,1400,0,'Downtown',0,1400,,'',0,6000,,'',0,2000,,'',0,1500,0,'Downtown',0,1500,,'',0,6000,,'',0,1500,0,'Downtown',0,1800,,'',0,6200,,'',0,2500,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8000,0,'Downtown',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_838 b/src/main/res-current/raw/current_gtfs_schedule_stop_838
index 408ab874a..f85595423 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_838
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_838
@@ -1,7 +1,7 @@
-'576',3000,73700,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'577',3000,55500,,'',0,7300,,'',0,2100,,'',0,5100,,'',0,1000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5800,,'',0,2400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1400,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6400,,'',0,2500,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0
-'578',3000,55500,,'',0,7300,,'',0,2100,,'',0,5100,,'',0,1000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5800,,'',0,2400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1400,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6400,,'',0,2500,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0
-'579',3000,55500,,'',0,7300,,'',0,2100,,'',0,5100,,'',0,1000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5800,,'',0,2400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1400,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6400,,'',0,2500,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0
-'580',3000,55500,,'',0,7300,,'',0,2100,,'',0,5100,,'',0,1000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5800,,'',0,2400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1400,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6400,,'',0,2500,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0
-'581',3000,71800,,'',0,9000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',3000,55500,,'',0,7300,,'',0,2100,,'',0,5100,,'',0,1000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5800,,'',0,2400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1400,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6400,,'',0,2500,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0
+'583',3000,55500,,'',0,7300,,'',0,2100,,'',0,5100,,'',0,1000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5800,,'',0,2400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1400,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6400,,'',0,2500,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0
+'584',3000,55500,,'',0,7300,,'',0,2100,,'',0,5100,,'',0,1000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5800,,'',0,2400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1400,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6400,,'',0,2500,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0
+'585',3000,71800,,'',0,9000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',3000,73700,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'587',3000,55500,,'',0,7300,,'',0,2100,,'',0,5100,,'',0,1000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5800,,'',0,2400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1400,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6400,,'',0,2500,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0
+'588',3000,55500,,'',0,7300,,'',0,2100,,'',0,5100,,'',0,1000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5800,,'',0,2400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1400,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6400,,'',0,2500,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0
+'589',3000,55500,,'',0,7300,,'',0,2100,,'',0,5100,,'',0,1000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5800,,'',0,2400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1400,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6400,,'',0,2500,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_839 b/src/main/res-current/raw/current_gtfs_schedule_stop_839
index 2c3c18a2d..551acb46f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_839
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_839
@@ -1,5 +1,5 @@
-'577',2800,65000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'578',2800,65000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'579',2800,65000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'580',2800,65000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'582',2800,65000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'583',2800,65000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'584',2800,65000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'587',2800,65000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'588',2800,65000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'589',2800,65000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_84 b/src/main/res-current/raw/current_gtfs_schedule_stop_84
index 8282a02c3..4b3c074f3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_84
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_84
@@ -1,7 +1,7 @@
-'576',1100,81800,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,10000,,'',0,10000,,'',0
-'577',1100,70000,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'578',1100,70000,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'579',1100,70000,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'580',1100,70000,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'581',1100,80500,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
-'582',1100,70000,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'583',1100,70000,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'584',1100,70000,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'585',1100,80500,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
+'586',1100,81800,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,10000,,'',0,10000,,'',0
+'587',1100,70000,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'588',1100,70000,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'589',1100,70000,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_840 b/src/main/res-current/raw/current_gtfs_schedule_stop_840
index 6cf1640a7..91fefbc91 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_840
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_840
@@ -1,5 +1,5 @@
-'577',2800,64900,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'578',2800,64900,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'579',2800,64900,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'580',2800,64900,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'582',2800,64900,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'583',2800,64900,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'584',2800,64900,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'587',2800,64900,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'588',2800,64900,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'589',2800,64900,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_841 b/src/main/res-current/raw/current_gtfs_schedule_stop_841
index b023eb899..3b0dbc155 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_841
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_841
@@ -1,5 +1,5 @@
-'577',2800,64800,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'578',2800,64800,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'579',2800,64800,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'580',2800,64800,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'582',2800,64800,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'583',2800,64800,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'584',2800,64800,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'587',2800,64800,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'588',2800,64800,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'589',2800,64800,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_842 b/src/main/res-current/raw/current_gtfs_schedule_stop_842
index 2b55cccc4..01863cee0 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_842
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_842
@@ -1,5 +1,5 @@
-'577',2800,71200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
-'578',2800,71200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
-'579',2800,71200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
-'580',2800,71200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
-'582',2800,71200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'583',2800,71200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'584',2800,71200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'587',2800,71200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'588',2800,71200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'589',2800,71200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_843 b/src/main/res-current/raw/current_gtfs_schedule_stop_843
index fad4cd624..b7b2edf05 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_843
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_843
@@ -1,5 +1,5 @@
-'577',2800,64000,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
-'578',2800,64000,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
-'579',2800,64000,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
-'580',2800,64000,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
-'582',2800,64000,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'583',2800,64000,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'584',2800,64000,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'587',2800,64000,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'588',2800,64000,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'589',2800,64000,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_844 b/src/main/res-current/raw/current_gtfs_schedule_stop_844
index 350d5b48d..5ffb8a8fb 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_844
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_844
@@ -1,5 +1,5 @@
-'577',2800,64100,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
-'578',2800,64100,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
-'579',2800,64100,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
-'580',2800,64100,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
-'582',2800,64100,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'583',2800,64100,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'584',2800,64100,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'587',2800,64100,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'588',2800,64100,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'589',2800,64100,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_845 b/src/main/res-current/raw/current_gtfs_schedule_stop_845
index 513e1f168..61c1411cc 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_845
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_845
@@ -1,5 +1,5 @@
-'577',2800,64100,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
-'578',2800,64100,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
-'579',2800,64100,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
-'580',2800,64100,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
-'582',2800,64100,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'583',2800,64100,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'584',2800,64100,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'587',2800,64100,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'588',2800,64100,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'589',2800,64100,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_846 b/src/main/res-current/raw/current_gtfs_schedule_stop_846
index c15bd2805..b445b8c6f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_846
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_846
@@ -1,5 +1,5 @@
-'577',2800,64200,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
-'578',2800,64200,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
-'579',2800,64200,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
-'580',2800,64200,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
-'582',2800,64200,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'583',2800,64200,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'584',2800,64200,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'587',2800,64200,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'588',2800,64200,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'589',2800,64200,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_847 b/src/main/res-current/raw/current_gtfs_schedule_stop_847
index c15bd2805..b445b8c6f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_847
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_847
@@ -1,5 +1,5 @@
-'577',2800,64200,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
-'578',2800,64200,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
-'579',2800,64200,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
-'580',2800,64200,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
-'582',2800,64200,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'583',2800,64200,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'584',2800,64200,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'587',2800,64200,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'588',2800,64200,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'589',2800,64200,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_848 b/src/main/res-current/raw/current_gtfs_schedule_stop_848
index ddf3c525a..f4144a7b5 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_848
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_848
@@ -1,5 +1,5 @@
-'577',2800,64300,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
-'578',2800,64300,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
-'579',2800,64300,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
-'580',2800,64300,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
-'582',2800,64300,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'583',2800,64300,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'584',2800,64300,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'587',2800,64300,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'588',2800,64300,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'589',2800,64300,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_849 b/src/main/res-current/raw/current_gtfs_schedule_stop_849
index 3a9c84355..5a80767e6 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_849
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_849
@@ -1,5 +1,5 @@
-'577',2800,64400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
-'578',2800,64400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
-'579',2800,64400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
-'580',2800,64400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
-'582',2800,64400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'583',2800,64400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'584',2800,64400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'587',2800,64400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'588',2800,64400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'589',2800,64400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_85 b/src/main/res-current/raw/current_gtfs_schedule_stop_85
index 3e18e157e..c035f77f3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_85
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_85
@@ -1,7 +1,7 @@
-'576',1101,74600,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
-'577',1101,65300,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'578',1101,65300,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'579',1101,65300,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'580',1101,65300,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'581',1101,80700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'582',1101,65300,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'583',1101,65300,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'584',1101,65300,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'585',1101,80700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'586',1101,74600,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
+'587',1101,65300,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'588',1101,65300,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'589',1101,65300,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_850 b/src/main/res-current/raw/current_gtfs_schedule_stop_850
index d33314fb3..7160ec8cc 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_850
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_850
@@ -1,5 +1,5 @@
-'577',2800,64500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'578',2800,64500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'579',2800,64500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'580',2800,64500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'582',2800,64500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'583',2800,64500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'584',2800,64500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'587',2800,64500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'588',2800,64500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'589',2800,64500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_851 b/src/main/res-current/raw/current_gtfs_schedule_stop_851
index 4533c5499..bd3dc801e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_851
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_851
@@ -1,5 +1,5 @@
-'577',2800,64700,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'578',2800,64700,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'579',2800,64700,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'580',2800,64700,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'582',2800,64700,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'583',2800,64700,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'584',2800,64700,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'587',2800,64700,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'588',2800,64700,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'589',2800,64700,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_852 b/src/main/res-current/raw/current_gtfs_schedule_stop_852
index 5faec8380..c8e4a7a7d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_852
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_852
@@ -1,5 +1,5 @@
-'577',2800,70800,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
-'578',2800,70800,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
-'579',2800,70800,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
-'580',2800,70800,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
-'582',2800,70800,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
+'583',2800,70800,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
+'584',2800,70800,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
+'587',2800,70800,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
+'588',2800,70800,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
+'589',2800,70800,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_853 b/src/main/res-current/raw/current_gtfs_schedule_stop_853
index 88cd1f506..efb6af3cb 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_853
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_853
@@ -1,5 +1,5 @@
-'577',2800,70700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
-'578',2800,70700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
-'579',2800,70700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
-'580',2800,70700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
-'582',2800,70700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
+'583',2800,70700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
+'584',2800,70700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
+'587',2800,70700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
+'588',2800,70700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
+'589',2800,70700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_854 b/src/main/res-current/raw/current_gtfs_schedule_stop_854
index 88cd1f506..efb6af3cb 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_854
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_854
@@ -1,5 +1,5 @@
-'577',2800,70700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
-'578',2800,70700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
-'579',2800,70700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
-'580',2800,70700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
-'582',2800,70700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
+'583',2800,70700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
+'584',2800,70700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
+'587',2800,70700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
+'588',2800,70700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
+'589',2800,70700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_855 b/src/main/res-current/raw/current_gtfs_schedule_stop_855
index 7e71ab57d..69dada75e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_855
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_855
@@ -1,5 +1,5 @@
-'577',2800,65200,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'578',2800,65200,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'579',2800,65200,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'580',2800,65200,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'582',2800,65200,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'583',2800,65200,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'584',2800,65200,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'587',2800,65200,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'588',2800,65200,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'589',2800,65200,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_856 b/src/main/res-current/raw/current_gtfs_schedule_stop_856
index e0677e707..5ae687be9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_856
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_856
@@ -1,7 +1,7 @@
-'576',2500,103500,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
-'577',2500,72300,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
-'578',2500,72300,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
-'579',2500,72300,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
-'580',2500,72300,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
-'581',2500,95100,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
-'582',2500,72300,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
+'583',2500,72300,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
+'584',2500,72300,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
+'585',2500,95100,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
+'586',2500,103500,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
+'587',2500,72300,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
+'588',2500,72300,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
+'589',2500,72300,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_857 b/src/main/res-current/raw/current_gtfs_schedule_stop_857
index ab26d89b3..83dad060d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_857
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_857
@@ -1,7 +1,7 @@
-'576',2501,101300,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
-'577',2501,75500,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'578',2501,75500,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'579',2501,75500,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'580',2501,75500,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'581',2501,92800,,'',0,17200,,'',0,13300,,'',0,17100,,'',0,40300,,'',0
-'582',2501,75500,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'583',2501,75500,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'584',2501,75500,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'585',2501,92800,,'',0,17200,,'',0,13300,,'',0,17100,,'',0,40300,,'',0
+'586',2501,101300,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
+'587',2501,75500,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'588',2501,75500,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'589',2501,75500,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_858 b/src/main/res-current/raw/current_gtfs_schedule_stop_858
index 683774697..69f8b6c67 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_858
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_858
@@ -1,5 +1,5 @@
-'577',2800,71100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
-'578',2800,71100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
-'579',2800,71100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
-'580',2800,71100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
-'582',2800,71100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'583',2800,71100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'584',2800,71100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'587',2800,71100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'588',2800,71100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'589',2800,71100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_859 b/src/main/res-current/raw/current_gtfs_schedule_stop_859
index 2b20a6be5..216ffb9af 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_859
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_859
@@ -1,2 +1,2 @@
-'576',2301,84200,4,'',0,9500,4,'',0,9500,4,'',0,9500,4,'',0,9500,4,'',0,18000,4,'',0,5500,4,'',0,9500,4,'',0,9500,4,'',0,9000,4,'',0,9400,4,'',0,9400,4,'',0,9500,4,'',0,12500,4,'',0,9800,4,'',0
-'581',2301,74700,4,'',0,7100,4,'',0,3200,4,'',0,6600,4,'',0,19500,4,'',0,9000,4,'',0,2700,4,'',0,3000,4,'',0,7000,4,'',0,10000,4,'',0,8000,4,'',0,2000,4,'',0,18000,4,'',0,9500,4,'',0,13500,4,'',0,19500,4,'',0,11200,4,'',0,10800,4,'',0,15000,4,'',0
+'585',2301,74700,4,'',0,7100,4,'',0,3200,4,'',0,6600,4,'',0,19500,4,'',0,9000,4,'',0,2700,4,'',0,3000,4,'',0,7000,4,'',0,10000,4,'',0,8000,4,'',0,2000,4,'',0,18000,4,'',0,9500,4,'',0,13500,4,'',0,19500,4,'',0,11200,4,'',0,10800,4,'',0,15000,4,'',0
+'586',2301,84200,4,'',0,9500,4,'',0,9500,4,'',0,9500,4,'',0,9500,4,'',0,18000,4,'',0,5500,4,'',0,9500,4,'',0,9500,4,'',0,9000,4,'',0,9400,4,'',0,9400,4,'',0,9500,4,'',0,12500,4,'',0,9800,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_86 b/src/main/res-current/raw/current_gtfs_schedule_stop_86
index c6aff7bde..7089473df 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_86
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_86
@@ -1,7 +1,7 @@
-'576',900,121500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',900,93200,,'',0,31200,,'',0,28800,,'',0
-'578',900,93200,,'',0,31200,,'',0,28800,,'',0
-'579',900,93200,,'',0,31200,,'',0,28800,,'',0
-'580',900,93200,,'',0,31200,,'',0,28800,,'',0
-'581',900,121500,,'',0,8500,,'',0,20500,,'',0,4500,,'',0
-'582',900,93200,,'',0,31200,,'',0,28800,,'',0
+'583',900,93200,,'',0,31200,,'',0,28800,,'',0
+'584',900,93200,,'',0,31200,,'',0,28800,,'',0
+'585',900,121500,,'',0,8500,,'',0,20500,,'',0,4500,,'',0
+'586',900,121500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',900,93200,,'',0,31200,,'',0,28800,,'',0
+'588',900,93200,,'',0,31200,,'',0,28800,,'',0
+'589',900,93200,,'',0,31200,,'',0,28800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_860 b/src/main/res-current/raw/current_gtfs_schedule_stop_860
index 3f06a9495..c11b85442 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_860
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_860
@@ -1,12 +1,12 @@
-'577',501,60700,,'',0,3800,,'',0,8500,,'',0,8500,,'',0,59500,,'',0,11500,,'',0,9000,,'',0,4000,,'',0,9000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
-'578',501,60700,,'',0,3800,,'',0,8500,,'',0,8500,,'',0,59500,,'',0,11500,,'',0,9000,,'',0,4000,,'',0,9000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
-'579',501,60700,,'',0,3800,,'',0,8500,,'',0,8500,,'',0,59500,,'',0,11500,,'',0,9000,,'',0,4000,,'',0,9000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
-'580',501,60700,,'',0,3800,,'',0,8500,,'',0,8500,,'',0,59500,,'',0,11500,,'',0,9000,,'',0,4000,,'',0,9000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
-'582',501,60700,,'',0,3800,,'',0,8500,,'',0,8500,,'',0,59500,,'',0,11500,,'',0,9000,,'',0,4000,,'',0,9000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
-'576',700,84000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'577',700,65000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'578',700,65000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'579',700,65000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'580',700,65000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'581',700,80300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',700,65000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
+'583',501,60700,,'',0,3800,,'',0,8500,,'',0,8500,,'',0,59500,,'',0,11500,,'',0,9000,,'',0,4000,,'',0,9000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
+'584',501,60700,,'',0,3800,,'',0,8500,,'',0,8500,,'',0,59500,,'',0,11500,,'',0,9000,,'',0,4000,,'',0,9000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
+'587',501,60700,,'',0,3800,,'',0,8500,,'',0,8500,,'',0,59500,,'',0,11500,,'',0,9000,,'',0,4000,,'',0,9000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
+'588',501,60700,,'',0,3800,,'',0,8500,,'',0,8500,,'',0,59500,,'',0,11500,,'',0,9000,,'',0,4000,,'',0,9000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
+'589',501,60700,,'',0,3800,,'',0,8500,,'',0,8500,,'',0,59500,,'',0,11500,,'',0,9000,,'',0,4000,,'',0,9000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
+'583',700,65000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
+'584',700,65000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
+'585',700,80300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',700,84000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
+'587',700,65000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
+'588',700,65000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
+'589',700,65000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_861 b/src/main/res-current/raw/current_gtfs_schedule_stop_861
index 2878872d8..8cce7f00e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_861
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_861
@@ -1,12 +1,12 @@
-'577',500,71600,4,'',0,3800,4,'',0,10000,4,'',0,9200,4,'',0,60600,4,'',0,5500,4,'',0,3700,4,'',0,8900,4,'',0,8000,4,'',0
-'578',500,71600,4,'',0,3800,4,'',0,10000,4,'',0,9200,4,'',0,60600,4,'',0,5500,4,'',0,3700,4,'',0,8900,4,'',0,8000,4,'',0
-'579',500,71600,4,'',0,3800,4,'',0,10000,4,'',0,9200,4,'',0,60600,4,'',0,5500,4,'',0,3700,4,'',0,8900,4,'',0,8000,4,'',0
-'580',500,71600,4,'',0,3800,4,'',0,10000,4,'',0,9200,4,'',0,60600,4,'',0,5500,4,'',0,3700,4,'',0,8900,4,'',0,8000,4,'',0
-'582',500,71600,4,'',0,3800,4,'',0,10000,4,'',0,9200,4,'',0,60600,4,'',0,5500,4,'',0,3700,4,'',0,8900,4,'',0,8000,4,'',0
-'576',701,82900,4,'',0,12000,4,'',0,16000,4,'',0,12000,4,'',0,12000,4,'',0,16000,4,'',0,12000,4,'',0,12000,4,'',0
-'577',701,64200,4,'',0,7500,4,'',0,3600,4,'',0,5600,4,'',0,2000,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,11000,4,'',0,11000,4,'',0,11000,4,'',0,7500,4,'',0,3500,4,'',0,7000,4,'',0,500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,11000,4,'',0,11000,4,'',0,20900,4,'',0
-'578',701,64200,4,'',0,7500,4,'',0,3600,4,'',0,5600,4,'',0,2000,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,11000,4,'',0,11000,4,'',0,11000,4,'',0,7500,4,'',0,3500,4,'',0,7000,4,'',0,500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,11000,4,'',0,11000,4,'',0,20900,4,'',0
-'579',701,64200,4,'',0,7500,4,'',0,3600,4,'',0,5600,4,'',0,2000,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,11000,4,'',0,11000,4,'',0,11000,4,'',0,7500,4,'',0,3500,4,'',0,7000,4,'',0,500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,11000,4,'',0,11000,4,'',0,20900,4,'',0
-'580',701,64200,4,'',0,7500,4,'',0,3600,4,'',0,5600,4,'',0,2000,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,11000,4,'',0,11000,4,'',0,11000,4,'',0,7500,4,'',0,3500,4,'',0,7000,4,'',0,500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,11000,4,'',0,11000,4,'',0,20900,4,'',0
-'581',701,83400,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'582',701,64200,4,'',0,7500,4,'',0,3600,4,'',0,5600,4,'',0,2000,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,11000,4,'',0,11000,4,'',0,11000,4,'',0,7500,4,'',0,3500,4,'',0,7000,4,'',0,500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,11000,4,'',0,11000,4,'',0,20900,4,'',0
+'583',500,71600,4,'',0,3800,4,'',0,10000,4,'',0,9200,4,'',0,60600,4,'',0,5500,4,'',0,3700,4,'',0,8900,4,'',0,8000,4,'',0
+'584',500,71600,4,'',0,3800,4,'',0,10000,4,'',0,9200,4,'',0,60600,4,'',0,5500,4,'',0,3700,4,'',0,8900,4,'',0,8000,4,'',0
+'587',500,71600,4,'',0,3800,4,'',0,10000,4,'',0,9200,4,'',0,60600,4,'',0,5500,4,'',0,3700,4,'',0,8900,4,'',0,8000,4,'',0
+'588',500,71600,4,'',0,3800,4,'',0,10000,4,'',0,9200,4,'',0,60600,4,'',0,5500,4,'',0,3700,4,'',0,8900,4,'',0,8000,4,'',0
+'589',500,71600,4,'',0,3800,4,'',0,10000,4,'',0,9200,4,'',0,60600,4,'',0,5500,4,'',0,3700,4,'',0,8900,4,'',0,8000,4,'',0
+'583',701,64200,4,'',0,7500,4,'',0,3600,4,'',0,5600,4,'',0,2000,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,11000,4,'',0,11000,4,'',0,11000,4,'',0,7500,4,'',0,3500,4,'',0,7000,4,'',0,500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,11000,4,'',0,11000,4,'',0,20900,4,'',0
+'584',701,64200,4,'',0,7500,4,'',0,3600,4,'',0,5600,4,'',0,2000,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,11000,4,'',0,11000,4,'',0,11000,4,'',0,7500,4,'',0,3500,4,'',0,7000,4,'',0,500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,11000,4,'',0,11000,4,'',0,20900,4,'',0
+'585',701,83400,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'586',701,82900,4,'',0,12000,4,'',0,16000,4,'',0,12000,4,'',0,12000,4,'',0,16000,4,'',0,12000,4,'',0,12000,4,'',0
+'587',701,64200,4,'',0,7500,4,'',0,3600,4,'',0,5600,4,'',0,2000,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,11000,4,'',0,11000,4,'',0,11000,4,'',0,7500,4,'',0,3500,4,'',0,7000,4,'',0,500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,11000,4,'',0,11000,4,'',0,20900,4,'',0
+'588',701,64200,4,'',0,7500,4,'',0,3600,4,'',0,5600,4,'',0,2000,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,11000,4,'',0,11000,4,'',0,11000,4,'',0,7500,4,'',0,3500,4,'',0,7000,4,'',0,500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,11000,4,'',0,11000,4,'',0,20900,4,'',0
+'589',701,64200,4,'',0,7500,4,'',0,3600,4,'',0,5600,4,'',0,2000,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,11000,4,'',0,11000,4,'',0,11000,4,'',0,7500,4,'',0,3500,4,'',0,7000,4,'',0,500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,11000,4,'',0,11000,4,'',0,20900,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_862 b/src/main/res-current/raw/current_gtfs_schedule_stop_862
index 012512ecf..6839d8b2c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_862
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_862
@@ -1,14 +1,14 @@
-'576',800,73200,4,'',0,10600,4,'',0,9000,4,'',0,9400,4,'',0,9000,4,'',0,9000,4,'',0,5000,4,'',0,9000,4,'',0,7500,4,'',0,3000,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,4500,4,'',0,8600,4,'',0,8800,4,'',0,9000,4,'',0,9000,4,'',0,5000,4,'',0,17000,4,'',0
-'576',801,84900,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4500,,'',0,8800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'577',800,63000,4,'',0,2600,4,'',0,6400,4,'',0,2300,4,'',0,1500,4,'',0,5400,4,'',0,1300,4,'',0,1200,4,'',0,1200,4,'',0,5200,4,'',0,1100,4,'',0,1300,4,'',0,1200,4,'',0,1200,4,'',0,5300,4,'',0,1300,4,'',0,1300,4,'',0,1500,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1700,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1700,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1700,4,'',0,1700,4,'',0,1200,4,'',0,5300,4,'',0,1400,4,'',0,1200,4,'',0,1200,4,'',0,5200,4,'',0,1200,4,'',0,1200,4,'',0,1100,4,'',0,1100,4,'',0,5200,4,'',0,1100,4,'',0,1200,4,'',0,1100,4,'',0,1000,4,'',0,1200,4,'',0,5200,4,'',0,1500,4,'',0,1800,4,'',0,5900,4,'',0,2000,4,'',0,2000,4,'',0,1900,4,'',0,6200,4,'',0,2300,4,'',0,6500,4,'',0,2300,4,'',0,2400,4,'',0,6500,4,'',0,8300,4,'',0,4300,4,'',0,8300,4,'',0,8500,4,'',0
-'577',801,55500,,'',0,8500,,'',0,6400,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
-'578',800,63000,4,'',0,2600,4,'',0,6400,4,'',0,2300,4,'',0,1500,4,'',0,5400,4,'',0,1300,4,'',0,1200,4,'',0,1200,4,'',0,5200,4,'',0,1100,4,'',0,1300,4,'',0,1200,4,'',0,1200,4,'',0,5300,4,'',0,1300,4,'',0,1300,4,'',0,1500,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1700,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1700,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1700,4,'',0,1700,4,'',0,1200,4,'',0,5300,4,'',0,1400,4,'',0,1200,4,'',0,1200,4,'',0,5200,4,'',0,1200,4,'',0,1200,4,'',0,1100,4,'',0,1100,4,'',0,5200,4,'',0,1100,4,'',0,1200,4,'',0,1100,4,'',0,1000,4,'',0,1200,4,'',0,5200,4,'',0,1500,4,'',0,1800,4,'',0,5900,4,'',0,2000,4,'',0,2000,4,'',0,1900,4,'',0,6200,4,'',0,2300,4,'',0,6500,4,'',0,2300,4,'',0,2400,4,'',0,6500,4,'',0,8300,4,'',0,4300,4,'',0,8300,4,'',0,8500,4,'',0
-'578',801,55500,,'',0,8500,,'',0,6400,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
-'579',800,63000,4,'',0,2600,4,'',0,6400,4,'',0,2300,4,'',0,1500,4,'',0,5400,4,'',0,1300,4,'',0,1200,4,'',0,1200,4,'',0,5200,4,'',0,1100,4,'',0,1300,4,'',0,1200,4,'',0,1200,4,'',0,5300,4,'',0,1300,4,'',0,1300,4,'',0,1500,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1700,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1700,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1700,4,'',0,1700,4,'',0,1200,4,'',0,5300,4,'',0,1400,4,'',0,1200,4,'',0,1200,4,'',0,5200,4,'',0,1200,4,'',0,1200,4,'',0,1100,4,'',0,1100,4,'',0,5200,4,'',0,1100,4,'',0,1200,4,'',0,1100,4,'',0,1000,4,'',0,1200,4,'',0,5200,4,'',0,1500,4,'',0,1800,4,'',0,5900,4,'',0,2000,4,'',0,2000,4,'',0,1900,4,'',0,6200,4,'',0,2300,4,'',0,6500,4,'',0,2300,4,'',0,2400,4,'',0,6500,4,'',0,8300,4,'',0,4300,4,'',0,8300,4,'',0,8500,4,'',0
-'579',801,55500,,'',0,8500,,'',0,6400,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
-'580',800,63000,4,'',0,2600,4,'',0,6400,4,'',0,2300,4,'',0,1500,4,'',0,5400,4,'',0,1300,4,'',0,1200,4,'',0,1200,4,'',0,5200,4,'',0,1100,4,'',0,1300,4,'',0,1200,4,'',0,1200,4,'',0,5300,4,'',0,1300,4,'',0,1300,4,'',0,1500,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1700,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1700,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1700,4,'',0,1700,4,'',0,1200,4,'',0,5300,4,'',0,1400,4,'',0,1200,4,'',0,1200,4,'',0,5200,4,'',0,1200,4,'',0,1200,4,'',0,1100,4,'',0,1100,4,'',0,5200,4,'',0,1100,4,'',0,1200,4,'',0,1100,4,'',0,1000,4,'',0,1200,4,'',0,5200,4,'',0,1500,4,'',0,1800,4,'',0,5900,4,'',0,2000,4,'',0,2000,4,'',0,1900,4,'',0,6200,4,'',0,2300,4,'',0,6500,4,'',0,2300,4,'',0,2400,4,'',0,6500,4,'',0,8300,4,'',0,4300,4,'',0,8300,4,'',0,8500,4,'',0
-'580',801,55500,,'',0,8500,,'',0,6400,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
-'581',800,65500,4,'',0,7600,4,'',0,8600,4,'',0,3700,4,'',0,7500,4,'',0,7300,4,'',0,3700,4,'',0,7500,4,'',0,3000,4,'',0,7500,4,'',0,3500,4,'',0,7000,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,7000,4,'',0,3500,4,'',0,7400,4,'',0,2900,4,'',0,7000,4,'',0,3500,4,'',0,7000,4,'',0,8000,4,'',0,4400,4,'',0,14900,4,'',0,11000,4,'',0,11000,4,'',0
-'581',801,71600,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
-'582',800,63000,4,'',0,2600,4,'',0,6400,4,'',0,2300,4,'',0,1500,4,'',0,5400,4,'',0,1300,4,'',0,1200,4,'',0,1200,4,'',0,5200,4,'',0,1100,4,'',0,1300,4,'',0,1200,4,'',0,1200,4,'',0,5300,4,'',0,1300,4,'',0,1300,4,'',0,1500,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1700,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1700,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1700,4,'',0,1700,4,'',0,1200,4,'',0,5300,4,'',0,1400,4,'',0,1200,4,'',0,1200,4,'',0,5200,4,'',0,1200,4,'',0,1200,4,'',0,1100,4,'',0,1100,4,'',0,5200,4,'',0,1100,4,'',0,1200,4,'',0,1100,4,'',0,1000,4,'',0,1200,4,'',0,5200,4,'',0,1500,4,'',0,1800,4,'',0,5900,4,'',0,2000,4,'',0,2000,4,'',0,1900,4,'',0,6200,4,'',0,2300,4,'',0,6500,4,'',0,2300,4,'',0,2400,4,'',0,6500,4,'',0,8300,4,'',0,4300,4,'',0,8300,4,'',0,8500,4,'',0
-'582',801,55500,,'',0,8500,,'',0,6400,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'583',800,63000,4,'',0,2600,4,'',0,6400,4,'',0,2300,4,'',0,1500,4,'',0,5400,4,'',0,1300,4,'',0,1200,4,'',0,1200,4,'',0,5200,4,'',0,1100,4,'',0,1300,4,'',0,1200,4,'',0,1200,4,'',0,5300,4,'',0,1300,4,'',0,1300,4,'',0,1500,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1700,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1700,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1700,4,'',0,1700,4,'',0,1200,4,'',0,5300,4,'',0,1400,4,'',0,1200,4,'',0,1200,4,'',0,5200,4,'',0,1200,4,'',0,1200,4,'',0,1100,4,'',0,1100,4,'',0,5200,4,'',0,1100,4,'',0,1200,4,'',0,1100,4,'',0,1000,4,'',0,1200,4,'',0,5200,4,'',0,1500,4,'',0,1800,4,'',0,5900,4,'',0,2000,4,'',0,2000,4,'',0,1900,4,'',0,6200,4,'',0,2300,4,'',0,6500,4,'',0,2300,4,'',0,2400,4,'',0,6500,4,'',0,8300,4,'',0,4300,4,'',0,8300,4,'',0,8500,4,'',0
+'583',801,55500,,'',0,8500,,'',0,6400,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'584',800,63000,4,'',0,2600,4,'',0,6400,4,'',0,2300,4,'',0,1500,4,'',0,5400,4,'',0,1300,4,'',0,1200,4,'',0,1200,4,'',0,5200,4,'',0,1100,4,'',0,1300,4,'',0,1200,4,'',0,1200,4,'',0,5300,4,'',0,1300,4,'',0,1300,4,'',0,1500,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1700,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1700,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1700,4,'',0,1700,4,'',0,1200,4,'',0,5300,4,'',0,1400,4,'',0,1200,4,'',0,1200,4,'',0,5200,4,'',0,1200,4,'',0,1200,4,'',0,1100,4,'',0,1100,4,'',0,5200,4,'',0,1100,4,'',0,1200,4,'',0,1100,4,'',0,1000,4,'',0,1200,4,'',0,5200,4,'',0,1500,4,'',0,1800,4,'',0,5900,4,'',0,2000,4,'',0,2000,4,'',0,1900,4,'',0,6200,4,'',0,2300,4,'',0,6500,4,'',0,2300,4,'',0,2400,4,'',0,6500,4,'',0,8300,4,'',0,4300,4,'',0,8300,4,'',0,8500,4,'',0
+'584',801,55500,,'',0,8500,,'',0,6400,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'585',800,65500,4,'',0,7600,4,'',0,8600,4,'',0,3700,4,'',0,7500,4,'',0,7300,4,'',0,3700,4,'',0,7500,4,'',0,3000,4,'',0,7500,4,'',0,3500,4,'',0,7000,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,7000,4,'',0,3500,4,'',0,7400,4,'',0,2900,4,'',0,7000,4,'',0,3500,4,'',0,7000,4,'',0,8000,4,'',0,4400,4,'',0,14900,4,'',0,11000,4,'',0,11000,4,'',0
+'585',801,71600,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
+'586',800,73200,4,'',0,10600,4,'',0,9000,4,'',0,9400,4,'',0,9000,4,'',0,9000,4,'',0,5000,4,'',0,9000,4,'',0,7500,4,'',0,3000,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,4500,4,'',0,8600,4,'',0,8800,4,'',0,9000,4,'',0,9000,4,'',0,5000,4,'',0,17000,4,'',0
+'586',801,84900,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4500,,'',0,8800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'587',800,63000,4,'',0,2600,4,'',0,6400,4,'',0,2300,4,'',0,1500,4,'',0,5400,4,'',0,1300,4,'',0,1200,4,'',0,1200,4,'',0,5200,4,'',0,1100,4,'',0,1300,4,'',0,1200,4,'',0,1200,4,'',0,5300,4,'',0,1300,4,'',0,1300,4,'',0,1500,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1700,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1700,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1700,4,'',0,1700,4,'',0,1200,4,'',0,5300,4,'',0,1400,4,'',0,1200,4,'',0,1200,4,'',0,5200,4,'',0,1200,4,'',0,1200,4,'',0,1100,4,'',0,1100,4,'',0,5200,4,'',0,1100,4,'',0,1200,4,'',0,1100,4,'',0,1000,4,'',0,1200,4,'',0,5200,4,'',0,1500,4,'',0,1800,4,'',0,5900,4,'',0,2000,4,'',0,2000,4,'',0,1900,4,'',0,6200,4,'',0,2300,4,'',0,6500,4,'',0,2300,4,'',0,2400,4,'',0,6500,4,'',0,8300,4,'',0,4300,4,'',0,8300,4,'',0,8500,4,'',0
+'587',801,55500,,'',0,8500,,'',0,6400,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'588',800,63000,4,'',0,2600,4,'',0,6400,4,'',0,2300,4,'',0,1500,4,'',0,5400,4,'',0,1300,4,'',0,1200,4,'',0,1200,4,'',0,5200,4,'',0,1100,4,'',0,1300,4,'',0,1200,4,'',0,1200,4,'',0,5300,4,'',0,1300,4,'',0,1300,4,'',0,1500,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1700,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1700,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1700,4,'',0,1700,4,'',0,1200,4,'',0,5300,4,'',0,1400,4,'',0,1200,4,'',0,1200,4,'',0,5200,4,'',0,1200,4,'',0,1200,4,'',0,1100,4,'',0,1100,4,'',0,5200,4,'',0,1100,4,'',0,1200,4,'',0,1100,4,'',0,1000,4,'',0,1200,4,'',0,5200,4,'',0,1500,4,'',0,1800,4,'',0,5900,4,'',0,2000,4,'',0,2000,4,'',0,1900,4,'',0,6200,4,'',0,2300,4,'',0,6500,4,'',0,2300,4,'',0,2400,4,'',0,6500,4,'',0,8300,4,'',0,4300,4,'',0,8300,4,'',0,8500,4,'',0
+'588',801,55500,,'',0,8500,,'',0,6400,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'589',800,63000,4,'',0,2600,4,'',0,6400,4,'',0,2300,4,'',0,1500,4,'',0,5400,4,'',0,1300,4,'',0,1200,4,'',0,1200,4,'',0,5200,4,'',0,1100,4,'',0,1300,4,'',0,1200,4,'',0,1200,4,'',0,5300,4,'',0,1300,4,'',0,1300,4,'',0,1500,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1700,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1700,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1700,4,'',0,1700,4,'',0,1200,4,'',0,5300,4,'',0,1400,4,'',0,1200,4,'',0,1200,4,'',0,5200,4,'',0,1200,4,'',0,1200,4,'',0,1100,4,'',0,1100,4,'',0,5200,4,'',0,1100,4,'',0,1200,4,'',0,1100,4,'',0,1000,4,'',0,1200,4,'',0,5200,4,'',0,1500,4,'',0,1800,4,'',0,5900,4,'',0,2000,4,'',0,2000,4,'',0,1900,4,'',0,6200,4,'',0,2300,4,'',0,6500,4,'',0,2300,4,'',0,2400,4,'',0,6500,4,'',0,8300,4,'',0,4300,4,'',0,8300,4,'',0,8500,4,'',0
+'589',801,55500,,'',0,8500,,'',0,6400,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_863 b/src/main/res-current/raw/current_gtfs_schedule_stop_863
index 7eeb1a1d0..53c558c3f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_863
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_863
@@ -1,14 +1,14 @@
-'576',3000,73800,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,9300,0,'Downtown',0
-'576',3001,75300,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6800,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,2900,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,10000,4,'',0
-'577',3000,55800,,'',0,6000,,'',0,2000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,1200,0,'Downtown',0,5200,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1600,,'',0,1600,0,'Downtown',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,4800,,'',0,800,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
-'577',3001,55500,4,'',0,7800,4,'',0,2000,4,'',0,5500,4,'',0,1500,4,'',0,1700,4,'',0,1800,4,'',0,4800,4,'',0,700,4,'',0,800,4,'',0,700,4,'',0,700,4,'',0,700,4,'',0,700,4,'',0,700,4,'',0,4700,4,'',0,700,4,'',0,700,4,'',0,500,4,'',0,1400,4,'',0,1600,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1700,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1700,4,'',0,5600,4,'',0,1600,4,'',0,1800,4,'',0,5700,4,'',0,1500,4,'',0,1000,4,'',0,1000,4,'',0,900,4,'',0,900,4,'',0,4800,4,'',0,800,4,'',0,900,4,'',0,1100,4,'',0,800,4,'',0,800,4,'',0,900,4,'',0,4800,4,'',0,900,4,'',0,800,4,'',0,1700,4,'',0,1500,4,'',0,5800,4,'',0,1400,4,'',0,1600,4,'',0,1500,4,'',0,5700,4,'',0,1800,4,'',0,1900,4,'',0,6600,4,'',0,1900,4,'',0,2000,4,'',0,6900,4,'',0,2000,4,'',0,7300,4,'',0,2200,4,'',0,6400,4,'',0,2400,4,'',0,2500,4,'',0,6300,4,'',0,2600,4,'',0,6300,4,'',0,2500,4,'',0,2400,4,'',0
-'578',3000,55800,,'',0,6000,,'',0,2000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,1200,0,'Downtown',0,5200,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1600,,'',0,1600,0,'Downtown',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,4800,,'',0,800,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
-'578',3001,55500,4,'',0,7800,4,'',0,2000,4,'',0,5500,4,'',0,1500,4,'',0,1700,4,'',0,1800,4,'',0,4800,4,'',0,700,4,'',0,800,4,'',0,700,4,'',0,700,4,'',0,700,4,'',0,700,4,'',0,700,4,'',0,4700,4,'',0,700,4,'',0,700,4,'',0,500,4,'',0,1400,4,'',0,1600,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1700,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1700,4,'',0,5600,4,'',0,1600,4,'',0,1800,4,'',0,5700,4,'',0,1500,4,'',0,1000,4,'',0,1000,4,'',0,900,4,'',0,900,4,'',0,4800,4,'',0,800,4,'',0,900,4,'',0,1100,4,'',0,800,4,'',0,800,4,'',0,900,4,'',0,4800,4,'',0,900,4,'',0,800,4,'',0,1700,4,'',0,1500,4,'',0,5800,4,'',0,1400,4,'',0,1600,4,'',0,1500,4,'',0,5700,4,'',0,1800,4,'',0,1900,4,'',0,6600,4,'',0,1900,4,'',0,2000,4,'',0,6900,4,'',0,2000,4,'',0,7300,4,'',0,2200,4,'',0,6400,4,'',0,2400,4,'',0,2500,4,'',0,6300,4,'',0,2600,4,'',0,6300,4,'',0,2500,4,'',0,2400,4,'',0
-'579',3000,55800,,'',0,6000,,'',0,2000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,1200,0,'Downtown',0,5200,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1600,,'',0,1600,0,'Downtown',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,4800,,'',0,800,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
-'579',3001,55500,4,'',0,7800,4,'',0,2000,4,'',0,5500,4,'',0,1500,4,'',0,1700,4,'',0,1800,4,'',0,4800,4,'',0,700,4,'',0,800,4,'',0,700,4,'',0,700,4,'',0,700,4,'',0,700,4,'',0,700,4,'',0,4700,4,'',0,700,4,'',0,700,4,'',0,500,4,'',0,1400,4,'',0,1600,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1700,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1700,4,'',0,5600,4,'',0,1600,4,'',0,1800,4,'',0,5700,4,'',0,1500,4,'',0,1000,4,'',0,1000,4,'',0,900,4,'',0,900,4,'',0,4800,4,'',0,800,4,'',0,900,4,'',0,1100,4,'',0,800,4,'',0,800,4,'',0,900,4,'',0,4800,4,'',0,900,4,'',0,800,4,'',0,1700,4,'',0,1500,4,'',0,5800,4,'',0,1400,4,'',0,1600,4,'',0,1500,4,'',0,5700,4,'',0,1800,4,'',0,1900,4,'',0,6600,4,'',0,1900,4,'',0,2000,4,'',0,6900,4,'',0,2000,4,'',0,7300,4,'',0,2200,4,'',0,6400,4,'',0,2400,4,'',0,2500,4,'',0,6300,4,'',0,2600,4,'',0,6300,4,'',0,2500,4,'',0,2400,4,'',0
-'580',3000,55800,,'',0,6000,,'',0,2000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,1200,0,'Downtown',0,5200,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1600,,'',0,1600,0,'Downtown',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,4800,,'',0,800,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0,4000,0,'Downtown',0,8000,0,'Downtown',0
-'580',3001,55500,4,'',0,7800,4,'',0,2000,4,'',0,5500,4,'',0,1500,4,'',0,1700,4,'',0,1800,4,'',0,4800,4,'',0,700,4,'',0,800,4,'',0,700,4,'',0,700,4,'',0,700,4,'',0,700,4,'',0,700,4,'',0,4700,4,'',0,700,4,'',0,700,4,'',0,500,4,'',0,1400,4,'',0,1600,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1700,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1700,4,'',0,5600,4,'',0,1600,4,'',0,1800,4,'',0,5700,4,'',0,1500,4,'',0,1000,4,'',0,1000,4,'',0,900,4,'',0,900,4,'',0,4800,4,'',0,800,4,'',0,900,4,'',0,1100,4,'',0,800,4,'',0,800,4,'',0,900,4,'',0,4800,4,'',0,900,4,'',0,800,4,'',0,1700,4,'',0,1500,4,'',0,5800,4,'',0,1400,4,'',0,1600,4,'',0,1500,4,'',0,5700,4,'',0,1800,4,'',0,1900,4,'',0,6600,4,'',0,1900,4,'',0,2000,4,'',0,6900,4,'',0,2000,4,'',0,7300,4,'',0,2200,4,'',0,6400,4,'',0,2400,4,'',0,2500,4,'',0,6300,4,'',0,2600,4,'',0,6300,4,'',0,2500,4,'',0,2400,4,'',0,9000,4,'',0,8000,4,'',0
-'581',3000,73700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7100,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,5700,0,'Downtown',0
-'581',3001,75300,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,7000,4,'',0,3400,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,2900,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,7300,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,2800,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0
-'582',3000,55800,,'',0,6000,,'',0,2000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,1200,0,'Downtown',0,5200,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1600,,'',0,1600,0,'Downtown',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,4800,,'',0,800,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
-'582',3001,55500,4,'',0,7800,4,'',0,2000,4,'',0,5500,4,'',0,1500,4,'',0,1700,4,'',0,1800,4,'',0,4800,4,'',0,700,4,'',0,800,4,'',0,700,4,'',0,700,4,'',0,700,4,'',0,700,4,'',0,700,4,'',0,4700,4,'',0,700,4,'',0,700,4,'',0,500,4,'',0,1400,4,'',0,1600,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1700,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1700,4,'',0,5600,4,'',0,1600,4,'',0,1800,4,'',0,5700,4,'',0,1500,4,'',0,1000,4,'',0,1000,4,'',0,900,4,'',0,900,4,'',0,4800,4,'',0,800,4,'',0,900,4,'',0,1100,4,'',0,800,4,'',0,800,4,'',0,900,4,'',0,4800,4,'',0,900,4,'',0,800,4,'',0,1700,4,'',0,1500,4,'',0,5800,4,'',0,1400,4,'',0,1600,4,'',0,1500,4,'',0,5700,4,'',0,1800,4,'',0,1900,4,'',0,6600,4,'',0,1900,4,'',0,2000,4,'',0,6900,4,'',0,2000,4,'',0,7300,4,'',0,2200,4,'',0,6400,4,'',0,2400,4,'',0,2500,4,'',0,6300,4,'',0,2600,4,'',0,6300,4,'',0,2500,4,'',0,2400,4,'',0
+'583',3000,55800,,'',0,6000,,'',0,2000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,1200,0,'Downtown',0,5200,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1600,,'',0,1600,0,'Downtown',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,4800,,'',0,800,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
+'583',3001,55500,4,'',0,7800,4,'',0,2000,4,'',0,5500,4,'',0,1500,4,'',0,1700,4,'',0,1800,4,'',0,4800,4,'',0,700,4,'',0,800,4,'',0,700,4,'',0,700,4,'',0,700,4,'',0,700,4,'',0,700,4,'',0,4700,4,'',0,700,4,'',0,700,4,'',0,500,4,'',0,1400,4,'',0,1600,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1700,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1700,4,'',0,5600,4,'',0,1600,4,'',0,1800,4,'',0,5700,4,'',0,1500,4,'',0,1000,4,'',0,1000,4,'',0,900,4,'',0,900,4,'',0,4800,4,'',0,800,4,'',0,900,4,'',0,1100,4,'',0,800,4,'',0,800,4,'',0,900,4,'',0,4800,4,'',0,900,4,'',0,800,4,'',0,1700,4,'',0,1500,4,'',0,5800,4,'',0,1400,4,'',0,1600,4,'',0,1500,4,'',0,5700,4,'',0,1800,4,'',0,1900,4,'',0,6600,4,'',0,1900,4,'',0,2000,4,'',0,6900,4,'',0,2000,4,'',0,7300,4,'',0,2200,4,'',0,6400,4,'',0,2400,4,'',0,2500,4,'',0,6300,4,'',0,2600,4,'',0,6300,4,'',0,2500,4,'',0,2400,4,'',0
+'584',3000,55800,,'',0,6000,,'',0,2000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,1200,0,'Downtown',0,5200,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1600,,'',0,1600,0,'Downtown',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,4800,,'',0,800,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0,4000,0,'Downtown',0,8000,0,'Downtown',0
+'584',3001,55500,4,'',0,7800,4,'',0,2000,4,'',0,5500,4,'',0,1500,4,'',0,1700,4,'',0,1800,4,'',0,4800,4,'',0,700,4,'',0,800,4,'',0,700,4,'',0,700,4,'',0,700,4,'',0,700,4,'',0,700,4,'',0,4700,4,'',0,700,4,'',0,700,4,'',0,500,4,'',0,1400,4,'',0,1600,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1700,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1700,4,'',0,5600,4,'',0,1600,4,'',0,1800,4,'',0,5700,4,'',0,1500,4,'',0,1000,4,'',0,1000,4,'',0,900,4,'',0,900,4,'',0,4800,4,'',0,800,4,'',0,900,4,'',0,1100,4,'',0,800,4,'',0,800,4,'',0,900,4,'',0,4800,4,'',0,900,4,'',0,800,4,'',0,1700,4,'',0,1500,4,'',0,5800,4,'',0,1400,4,'',0,1600,4,'',0,1500,4,'',0,5700,4,'',0,1800,4,'',0,1900,4,'',0,6600,4,'',0,1900,4,'',0,2000,4,'',0,6900,4,'',0,2000,4,'',0,7300,4,'',0,2200,4,'',0,6400,4,'',0,2400,4,'',0,2500,4,'',0,6300,4,'',0,2600,4,'',0,6300,4,'',0,2500,4,'',0,2400,4,'',0,9000,4,'',0,8000,4,'',0
+'585',3000,73700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7100,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,5700,0,'Downtown',0
+'585',3001,75300,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,7000,4,'',0,3400,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,2900,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,7300,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,2800,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0
+'586',3000,73800,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,9300,0,'Downtown',0
+'586',3001,75300,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6800,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,2900,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,10000,4,'',0
+'587',3000,55800,,'',0,6000,,'',0,2000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,1200,0,'Downtown',0,5200,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1600,,'',0,1600,0,'Downtown',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,4800,,'',0,800,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
+'587',3001,55500,4,'',0,7800,4,'',0,2000,4,'',0,5500,4,'',0,1500,4,'',0,1700,4,'',0,1800,4,'',0,4800,4,'',0,700,4,'',0,800,4,'',0,700,4,'',0,700,4,'',0,700,4,'',0,700,4,'',0,700,4,'',0,4700,4,'',0,700,4,'',0,700,4,'',0,500,4,'',0,1400,4,'',0,1600,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1700,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1700,4,'',0,5600,4,'',0,1600,4,'',0,1800,4,'',0,5700,4,'',0,1500,4,'',0,1000,4,'',0,1000,4,'',0,900,4,'',0,900,4,'',0,4800,4,'',0,800,4,'',0,900,4,'',0,1100,4,'',0,800,4,'',0,800,4,'',0,900,4,'',0,4800,4,'',0,900,4,'',0,800,4,'',0,1700,4,'',0,1500,4,'',0,5800,4,'',0,1400,4,'',0,1600,4,'',0,1500,4,'',0,5700,4,'',0,1800,4,'',0,1900,4,'',0,6600,4,'',0,1900,4,'',0,2000,4,'',0,6900,4,'',0,2000,4,'',0,7300,4,'',0,2200,4,'',0,6400,4,'',0,2400,4,'',0,2500,4,'',0,6300,4,'',0,2600,4,'',0,6300,4,'',0,2500,4,'',0,2400,4,'',0
+'588',3000,55800,,'',0,6000,,'',0,2000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,1200,0,'Downtown',0,5200,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1600,,'',0,1600,0,'Downtown',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,4800,,'',0,800,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
+'588',3001,55500,4,'',0,7800,4,'',0,2000,4,'',0,5500,4,'',0,1500,4,'',0,1700,4,'',0,1800,4,'',0,4800,4,'',0,700,4,'',0,800,4,'',0,700,4,'',0,700,4,'',0,700,4,'',0,700,4,'',0,700,4,'',0,4700,4,'',0,700,4,'',0,700,4,'',0,500,4,'',0,1400,4,'',0,1600,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1700,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1700,4,'',0,5600,4,'',0,1600,4,'',0,1800,4,'',0,5700,4,'',0,1500,4,'',0,1000,4,'',0,1000,4,'',0,900,4,'',0,900,4,'',0,4800,4,'',0,800,4,'',0,900,4,'',0,1100,4,'',0,800,4,'',0,800,4,'',0,900,4,'',0,4800,4,'',0,900,4,'',0,800,4,'',0,1700,4,'',0,1500,4,'',0,5800,4,'',0,1400,4,'',0,1600,4,'',0,1500,4,'',0,5700,4,'',0,1800,4,'',0,1900,4,'',0,6600,4,'',0,1900,4,'',0,2000,4,'',0,6900,4,'',0,2000,4,'',0,7300,4,'',0,2200,4,'',0,6400,4,'',0,2400,4,'',0,2500,4,'',0,6300,4,'',0,2600,4,'',0,6300,4,'',0,2500,4,'',0,2400,4,'',0
+'589',3000,55800,,'',0,6000,,'',0,2000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,1200,0,'Downtown',0,5200,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1600,,'',0,1600,0,'Downtown',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,4800,,'',0,800,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,4900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
+'589',3001,55500,4,'',0,7800,4,'',0,2000,4,'',0,5500,4,'',0,1500,4,'',0,1700,4,'',0,1800,4,'',0,4800,4,'',0,700,4,'',0,800,4,'',0,700,4,'',0,700,4,'',0,700,4,'',0,700,4,'',0,700,4,'',0,4700,4,'',0,700,4,'',0,700,4,'',0,500,4,'',0,1400,4,'',0,1600,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1700,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1700,4,'',0,5600,4,'',0,1600,4,'',0,1800,4,'',0,5700,4,'',0,1500,4,'',0,1000,4,'',0,1000,4,'',0,900,4,'',0,900,4,'',0,4800,4,'',0,800,4,'',0,900,4,'',0,1100,4,'',0,800,4,'',0,800,4,'',0,900,4,'',0,4800,4,'',0,900,4,'',0,800,4,'',0,1700,4,'',0,1500,4,'',0,5800,4,'',0,1400,4,'',0,1600,4,'',0,1500,4,'',0,5700,4,'',0,1800,4,'',0,1900,4,'',0,6600,4,'',0,1900,4,'',0,2000,4,'',0,6900,4,'',0,2000,4,'',0,7300,4,'',0,2200,4,'',0,6400,4,'',0,2400,4,'',0,2500,4,'',0,6300,4,'',0,2600,4,'',0,6300,4,'',0,2500,4,'',0,2400,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_864 b/src/main/res-current/raw/current_gtfs_schedule_stop_864
index a77e177a8..28a136bfd 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_864
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_864
@@ -1,13 +1,13 @@
-'576',2300,75500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,16500,,'',0,5800,,'',0
-'577',2300,55000,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3100,0,'Old Vernon Rd',0,2000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1000,0,'Old Vernon Rd',0,2000,,'',0,2100,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,10200,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
-'577',2301,60600,4,'',0,3700,4,'',0,7600,4,'',0,3600,4,'',0,5300,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,2100,4,'',0,3000,4,'',0,7400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7800,4,'',0,1300,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1300,4,'',0,2100,4,'',0,6800,4,'',0,3500,4,'',0,7500,4,'',0,10000,4,'',0,10500,4,'',0,10000,4,'',0,10600,4,'',0
-'578',2300,55000,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3100,0,'Old Vernon Rd',0,2000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1000,0,'Old Vernon Rd',0,2000,,'',0,2100,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,10200,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
-'578',2301,60600,4,'',0,3700,4,'',0,7600,4,'',0,3600,4,'',0,5300,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,2100,4,'',0,3000,4,'',0,7400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7800,4,'',0,1300,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1300,4,'',0,2100,4,'',0,6800,4,'',0,3500,4,'',0,7500,4,'',0,10000,4,'',0,10500,4,'',0,10000,4,'',0,10600,4,'',0
-'579',2300,55000,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3100,0,'Old Vernon Rd',0,2000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1000,0,'Old Vernon Rd',0,2000,,'',0,2100,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,10200,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
-'579',2301,60600,4,'',0,3700,4,'',0,7600,4,'',0,3600,4,'',0,5300,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,2100,4,'',0,3000,4,'',0,7400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7800,4,'',0,1300,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1300,4,'',0,2100,4,'',0,6800,4,'',0,3500,4,'',0,7500,4,'',0,10000,4,'',0,10500,4,'',0,10000,4,'',0,10600,4,'',0
-'580',2300,55000,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3100,0,'Old Vernon Rd',0,2000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1000,0,'Old Vernon Rd',0,2000,,'',0,2100,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,10200,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
-'580',2301,60600,4,'',0,3700,4,'',0,7600,4,'',0,3600,4,'',0,5300,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,2100,4,'',0,3000,4,'',0,7400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7800,4,'',0,1300,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1300,4,'',0,2100,4,'',0,6800,4,'',0,3500,4,'',0,7500,4,'',0,10000,4,'',0,10500,4,'',0,10000,4,'',0,10600,4,'',0
-'581',2300,65900,,'',0,7300,,'',0,2600,,'',0,7100,,'',0,2700,,'',0,6900,,'',0,3200,,'',0,6700,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7000,0,'Old Vernon Rd',0,3000,,'',0,7600,,'',0,3100,,'',0,7300,,'',0,2400,,'',0,7200,,'',0,3000,,'',0,10600,,'',0,9100,,'',0,10100,,'',0,15500,,'',0,10800,,'',0,11000,,'',0
-'581',2301,95100,4,'',0,7100,4,'',0,3000,4,'',0,8900,4,'',0,26100,4,'',0,20700,4,'',0,3400,4,'',0,9600,4,'',0,10000,4,'',0,19300,4,'',0
-'582',2300,55000,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3100,0,'Old Vernon Rd',0,2000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1000,0,'Old Vernon Rd',0,2000,,'',0,2100,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,10200,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
-'582',2301,60600,4,'',0,3700,4,'',0,7600,4,'',0,3600,4,'',0,5300,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,2100,4,'',0,3000,4,'',0,7400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7800,4,'',0,1300,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1300,4,'',0,2100,4,'',0,6800,4,'',0,3500,4,'',0,7500,4,'',0,10000,4,'',0,10500,4,'',0,10000,4,'',0,10600,4,'',0
+'583',2300,55000,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3100,0,'Old Vernon Rd',0,2000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1000,0,'Old Vernon Rd',0,2000,,'',0,2100,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,10200,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
+'583',2301,60600,4,'',0,3700,4,'',0,7600,4,'',0,3600,4,'',0,5300,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,2100,4,'',0,3000,4,'',0,7400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7800,4,'',0,1300,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1300,4,'',0,2100,4,'',0,6800,4,'',0,3500,4,'',0,7500,4,'',0,10000,4,'',0,10500,4,'',0,10000,4,'',0,10600,4,'',0
+'584',2300,55000,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3100,0,'Old Vernon Rd',0,2000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1000,0,'Old Vernon Rd',0,2000,,'',0,2100,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,10200,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
+'584',2301,60600,4,'',0,3700,4,'',0,7600,4,'',0,3600,4,'',0,5300,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,2100,4,'',0,3000,4,'',0,7400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7800,4,'',0,1300,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1300,4,'',0,2100,4,'',0,6800,4,'',0,3500,4,'',0,7500,4,'',0,10000,4,'',0,10500,4,'',0,10000,4,'',0,10600,4,'',0
+'585',2300,65900,,'',0,7300,,'',0,2600,,'',0,7100,,'',0,2700,,'',0,6900,,'',0,3200,,'',0,6700,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7000,0,'Old Vernon Rd',0,3000,,'',0,7600,,'',0,3100,,'',0,7300,,'',0,2400,,'',0,7200,,'',0,3000,,'',0,10600,,'',0,9100,,'',0,10100,,'',0,15500,,'',0,10800,,'',0,11000,,'',0
+'585',2301,95100,4,'',0,7100,4,'',0,3000,4,'',0,8900,4,'',0,26100,4,'',0,20700,4,'',0,3400,4,'',0,9600,4,'',0,10000,4,'',0,19300,4,'',0
+'586',2300,75500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,16500,,'',0,5800,,'',0
+'587',2300,55000,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3100,0,'Old Vernon Rd',0,2000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1000,0,'Old Vernon Rd',0,2000,,'',0,2100,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,10200,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
+'587',2301,60600,4,'',0,3700,4,'',0,7600,4,'',0,3600,4,'',0,5300,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,2100,4,'',0,3000,4,'',0,7400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7800,4,'',0,1300,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1300,4,'',0,2100,4,'',0,6800,4,'',0,3500,4,'',0,7500,4,'',0,10000,4,'',0,10500,4,'',0,10000,4,'',0,10600,4,'',0
+'588',2300,55000,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3100,0,'Old Vernon Rd',0,2000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1000,0,'Old Vernon Rd',0,2000,,'',0,2100,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,10200,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
+'588',2301,60600,4,'',0,3700,4,'',0,7600,4,'',0,3600,4,'',0,5300,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,2100,4,'',0,3000,4,'',0,7400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7800,4,'',0,1300,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1300,4,'',0,2100,4,'',0,6800,4,'',0,3500,4,'',0,7500,4,'',0,10000,4,'',0,10500,4,'',0,10000,4,'',0,10600,4,'',0
+'589',2300,55000,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3100,0,'Old Vernon Rd',0,2000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1000,0,'Old Vernon Rd',0,2000,,'',0,2100,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,10200,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
+'589',2301,60600,4,'',0,3700,4,'',0,7600,4,'',0,3600,4,'',0,5300,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,2100,4,'',0,3000,4,'',0,7400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7800,4,'',0,1300,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1300,4,'',0,2100,4,'',0,6800,4,'',0,3500,4,'',0,7500,4,'',0,10000,4,'',0,10500,4,'',0,10000,4,'',0,10600,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_865 b/src/main/res-current/raw/current_gtfs_schedule_stop_865
index 7451c7e24..4fde10d0b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_865
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_865
@@ -1,10 +1,10 @@
-'577',1300,71500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'577',1301,73400,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,43500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,21500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0
-'578',1300,71500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'578',1301,73400,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,43500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,21500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0
-'579',1300,71500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'579',1301,73400,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,43500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,21500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0
-'580',1300,71500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'580',1301,73400,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,43500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,21500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0
-'582',1300,71500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'582',1301,73400,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,43500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,21500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0
+'583',1300,71500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'583',1301,73400,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,43500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,21500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0
+'584',1300,71500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'584',1301,73400,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,43500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,21500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0
+'587',1300,71500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'587',1301,73400,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,43500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,21500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0
+'588',1300,71500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'588',1301,73400,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,43500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,21500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0
+'589',1300,71500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'589',1301,73400,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,43500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,21500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_8655 b/src/main/res-current/raw/current_gtfs_schedule_stop_8655
index 2ae1f3195..81d599c78 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_8655
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_8655
@@ -1,6 +1,6 @@
-'577',2300,143600,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
-'578',2300,143600,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
-'579',2300,143600,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
-'580',2300,143600,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
-'581',2300,141700,0,'Old Vernon Rd',0
-'582',2300,143600,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'583',2300,143600,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'584',2300,143600,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'585',2300,141700,0,'Old Vernon Rd',0
+'587',2300,143600,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'588',2300,143600,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'589',2300,143600,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_866 b/src/main/res-current/raw/current_gtfs_schedule_stop_866
index 0dedf1f03..04ba7805d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_866
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_866
@@ -1,13 +1,13 @@
-'576',801,85300,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'577',801,55900,,'',0,8500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
-'578',801,55900,,'',0,8500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
-'579',801,55900,,'',0,8500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
-'580',801,55900,,'',0,8500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
-'581',801,72000,,'',0,8000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
-'582',801,55900,,'',0,8500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
-'577',2300,143500,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
-'578',2300,143500,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
-'579',2300,143500,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
-'580',2300,143500,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
-'581',2300,141500,0,'Old Vernon Rd',0
-'582',2300,143500,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'583',801,55900,,'',0,8500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'584',801,55900,,'',0,8500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'585',801,72000,,'',0,8000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
+'586',801,85300,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'587',801,55900,,'',0,8500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'588',801,55900,,'',0,8500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'589',801,55900,,'',0,8500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'583',2300,143500,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'584',2300,143500,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'585',2300,141500,0,'Old Vernon Rd',0
+'587',2300,143500,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'588',2300,143500,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'589',2300,143500,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_867 b/src/main/res-current/raw/current_gtfs_schedule_stop_867
index 0b61ccecb..bf1c6087c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_867
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_867
@@ -1,13 +1,13 @@
-'576',800,72700,,'',0,10600,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4500,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,17000,,'',0
-'577',800,62500,,'',0,2600,,'',0,6400,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1000,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'578',800,62500,,'',0,2600,,'',0,6400,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1000,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'579',800,62500,,'',0,2600,,'',0,6400,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1000,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'580',800,62500,,'',0,2600,,'',0,6400,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1000,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'581',800,65000,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3300,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,8000,,'',0,4400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
-'582',800,62500,,'',0,2600,,'',0,6400,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1000,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'577',2301,75100,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
-'578',2301,75100,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
-'579',2301,75100,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
-'580',2301,75100,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
-'581',2301,101600,0,'Old Vernon Rd',0
-'582',2301,75100,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'583',800,62500,,'',0,2600,,'',0,6400,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1000,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'584',800,62500,,'',0,2600,,'',0,6400,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1000,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'585',800,65000,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3300,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,8000,,'',0,4400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
+'586',800,72700,,'',0,10600,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4500,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,17000,,'',0
+'587',800,62500,,'',0,2600,,'',0,6400,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1000,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'588',800,62500,,'',0,2600,,'',0,6400,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1000,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'589',800,62500,,'',0,2600,,'',0,6400,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1000,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'583',2301,75100,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'584',2301,75100,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'585',2301,101600,0,'Old Vernon Rd',0
+'587',2301,75100,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'588',2301,75100,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'589',2301,75100,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_868 b/src/main/res-current/raw/current_gtfs_schedule_stop_868
index 189b2ab5d..ed5316bd3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_868
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_868
@@ -1,13 +1,13 @@
-'576',801,85300,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'577',801,60000,,'',0,4500,,'',0,6400,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'578',801,60000,,'',0,4500,,'',0,6400,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'579',801,60000,,'',0,4500,,'',0,6400,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'580',801,60000,,'',0,4500,,'',0,6400,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'581',801,72100,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
-'582',801,60000,,'',0,4500,,'',0,6400,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'577',2300,143500,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
-'578',2300,143500,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
-'579',2300,143500,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
-'580',2300,143500,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
-'581',2300,141600,0,'Old Vernon Rd',0
-'582',2300,143500,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'583',801,60000,,'',0,4500,,'',0,6400,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'584',801,60000,,'',0,4500,,'',0,6400,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'585',801,72100,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
+'586',801,85300,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'587',801,60000,,'',0,4500,,'',0,6400,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'588',801,60000,,'',0,4500,,'',0,6400,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'589',801,60000,,'',0,4500,,'',0,6400,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'583',2300,143500,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'584',2300,143500,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'585',2300,141600,0,'Old Vernon Rd',0
+'587',2300,143500,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'588',2300,143500,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'589',2300,143500,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_869 b/src/main/res-current/raw/current_gtfs_schedule_stop_869
index ccbd1dd5b..a921b7b48 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_869
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_869
@@ -1,13 +1,13 @@
-'576',800,72700,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,17000,,'',0
-'577',800,62500,,'',0,2600,,'',0,6300,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1000,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8300,,'',0,8300,,'',0,8500,,'',0
-'578',800,62500,,'',0,2600,,'',0,6300,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1000,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8300,,'',0,8300,,'',0,8500,,'',0
-'579',800,62500,,'',0,2600,,'',0,6300,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1000,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8300,,'',0,8300,,'',0,8500,,'',0
-'580',800,62500,,'',0,2600,,'',0,6300,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1000,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8300,,'',0,8300,,'',0,8500,,'',0
-'581',800,65000,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,8000,,'',0,4400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
-'582',800,62500,,'',0,2600,,'',0,6300,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1000,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8300,,'',0,8300,,'',0,8500,,'',0
-'577',2301,75000,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
-'578',2301,75000,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
-'579',2301,75000,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
-'580',2301,75000,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
-'581',2301,101500,0,'Old Vernon Rd',0
-'582',2301,75000,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'583',800,62500,,'',0,2600,,'',0,6300,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1000,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8300,,'',0,8300,,'',0,8500,,'',0
+'584',800,62500,,'',0,2600,,'',0,6300,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1000,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8300,,'',0,8300,,'',0,8500,,'',0
+'585',800,65000,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,8000,,'',0,4400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
+'586',800,72700,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,17000,,'',0
+'587',800,62500,,'',0,2600,,'',0,6300,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1000,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8300,,'',0,8300,,'',0,8500,,'',0
+'588',800,62500,,'',0,2600,,'',0,6300,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1000,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8300,,'',0,8300,,'',0,8500,,'',0
+'589',800,62500,,'',0,2600,,'',0,6300,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5200,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1000,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8300,,'',0,8300,,'',0,8500,,'',0
+'583',2301,75000,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'584',2301,75000,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'585',2301,101500,0,'Old Vernon Rd',0
+'587',2301,75000,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'588',2301,75000,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'589',2301,75000,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_87 b/src/main/res-current/raw/current_gtfs_schedule_stop_87
index 5ca774d1a..9a59b8e53 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_87
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_87
@@ -1,7 +1,7 @@
-'576',801,64300,,'',0,27400,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
-'577',801,62300,,'',0,8600,,'',0,2700,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'578',801,62300,,'',0,8600,,'',0,2700,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'579',801,62300,,'',0,8600,,'',0,2700,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'580',801,62300,,'',0,8600,,'',0,2700,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'581',801,64400,,'',0,10200,,'',0,8000,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'582',801,62300,,'',0,8600,,'',0,2700,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'583',801,62300,,'',0,8600,,'',0,2700,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'584',801,62300,,'',0,8600,,'',0,2700,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'585',801,64400,,'',0,10200,,'',0,8000,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
+'586',801,64300,,'',0,27400,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
+'587',801,62300,,'',0,8600,,'',0,2700,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'588',801,62300,,'',0,8600,,'',0,2700,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'589',801,62300,,'',0,8600,,'',0,2700,,'',0,2300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_870 b/src/main/res-current/raw/current_gtfs_schedule_stop_870
index d95e170be..86397d4cd 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_870
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_870
@@ -1,7 +1,7 @@
-'576',801,85400,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'577',801,60000,,'',0,4500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
-'578',801,60000,,'',0,4500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
-'579',801,60000,,'',0,4500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
-'580',801,60000,,'',0,4500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
-'581',801,72100,,'',0,8000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
-'582',801,60000,,'',0,4500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'583',801,60000,,'',0,4500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'584',801,60000,,'',0,4500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'585',801,72100,,'',0,8000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
+'586',801,85400,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'587',801,60000,,'',0,4500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'588',801,60000,,'',0,4500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'589',801,60000,,'',0,4500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_871 b/src/main/res-current/raw/current_gtfs_schedule_stop_871
index 111a106ab..b123baed9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_871
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_871
@@ -1,7 +1,7 @@
-'576',801,85400,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'577',801,60100,,'',0,4500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'578',801,60100,,'',0,4500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'579',801,60100,,'',0,4500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'580',801,60100,,'',0,4500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'581',801,72200,,'',0,8000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
-'582',801,60100,,'',0,4500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'583',801,60100,,'',0,4500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'584',801,60100,,'',0,4500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'585',801,72200,,'',0,8000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
+'586',801,85400,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'587',801,60100,,'',0,4500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'588',801,60100,,'',0,4500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'589',801,60100,,'',0,4500,,'',0,6500,,'',0,2200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_872 b/src/main/res-current/raw/current_gtfs_schedule_stop_872
index 2a0f6198a..afb66e231 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_872
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_872
@@ -1,7 +1,7 @@
-'576',800,72600,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,17000,,'',0
-'577',800,62400,,'',0,2600,,'',0,6300,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8300,,'',0,8300,,'',0,8500,,'',0
-'578',800,62400,,'',0,2600,,'',0,6300,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8300,,'',0,8300,,'',0,8500,,'',0
-'579',800,62400,,'',0,2600,,'',0,6300,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8300,,'',0,8300,,'',0,8500,,'',0
-'580',800,62400,,'',0,2600,,'',0,6300,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8300,,'',0,8300,,'',0,8500,,'',0
-'581',800,64900,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,8000,,'',0,4400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
-'582',800,62400,,'',0,2600,,'',0,6300,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8300,,'',0,8300,,'',0,8500,,'',0
+'583',800,62400,,'',0,2600,,'',0,6300,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8300,,'',0,8300,,'',0,8500,,'',0
+'584',800,62400,,'',0,2600,,'',0,6300,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8300,,'',0,8300,,'',0,8500,,'',0
+'585',800,64900,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,8000,,'',0,4400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
+'586',800,72600,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,17000,,'',0
+'587',800,62400,,'',0,2600,,'',0,6300,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8300,,'',0,8300,,'',0,8500,,'',0
+'588',800,62400,,'',0,2600,,'',0,6300,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8300,,'',0,8300,,'',0,8500,,'',0
+'589',800,62400,,'',0,2600,,'',0,6300,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8300,,'',0,8300,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_873 b/src/main/res-current/raw/current_gtfs_schedule_stop_873
index f30d42e30..32aac0649 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_873
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_873
@@ -1,7 +1,7 @@
-'576',3000,74100,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,9300,0,'Downtown',0
-'577',3000,60100,,'',0,2000,,'',0,2000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,1200,0,'Downtown',0,5200,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1600,,'',0,1600,0,'Downtown',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,900,,'',0,4800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
-'578',3000,60100,,'',0,2000,,'',0,2000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,1200,0,'Downtown',0,5200,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1600,,'',0,1600,0,'Downtown',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,900,,'',0,4800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
-'579',3000,60100,,'',0,2000,,'',0,2000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,1200,0,'Downtown',0,5200,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1600,,'',0,1600,0,'Downtown',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,900,,'',0,4800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
-'580',3000,60100,,'',0,2000,,'',0,2000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,1200,0,'Downtown',0,5200,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1600,,'',0,1600,0,'Downtown',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,900,,'',0,4800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0,4000,0,'Downtown',0,8000,0,'Downtown',0
-'581',3000,74000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7100,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,5700,0,'Downtown',0
-'582',3000,60100,,'',0,2000,,'',0,2000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,1200,0,'Downtown',0,5200,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1600,,'',0,1600,0,'Downtown',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,900,,'',0,4800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
+'583',3000,60100,,'',0,2000,,'',0,2000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,1200,0,'Downtown',0,5200,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1600,,'',0,1600,0,'Downtown',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,900,,'',0,4800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
+'584',3000,60100,,'',0,2000,,'',0,2000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,1200,0,'Downtown',0,5200,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1600,,'',0,1600,0,'Downtown',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,900,,'',0,4800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0,4000,0,'Downtown',0,8000,0,'Downtown',0
+'585',3000,74000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7100,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,5700,0,'Downtown',0
+'586',3000,74100,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,9300,0,'Downtown',0
+'587',3000,60100,,'',0,2000,,'',0,2000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,1200,0,'Downtown',0,5200,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1600,,'',0,1600,0,'Downtown',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,900,,'',0,4800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
+'588',3000,60100,,'',0,2000,,'',0,2000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,1200,0,'Downtown',0,5200,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1600,,'',0,1600,0,'Downtown',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,900,,'',0,4800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
+'589',3000,60100,,'',0,2000,,'',0,2000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,700,0,'Downtown',0,700,,'',0,700,0,'Downtown',0,1100,,'',0,1200,0,'Downtown',0,5200,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1500,,'',0,1500,0,'Downtown',0,5500,,'',0,1500,0,'Downtown',0,1600,,'',0,1600,0,'Downtown',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1500,,'',0,1000,0,'Downtown',0,900,,'',0,800,0,'Downtown',0,900,,'',0,4800,0,'Downtown',0,800,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,4900,,'',0,900,0,'Downtown',0,900,,'',0,900,0,'Downtown',0,900,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_874 b/src/main/res-current/raw/current_gtfs_schedule_stop_874
index 19fded093..18225c149 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_874
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_874
@@ -1,7 +1,7 @@
-'576',3001,74800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,10000,,'',0
-'577',3001,55200,,'',0,7700,,'',0,1900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1800,,'',0,4800,,'',0,700,,'',0,800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,700,,'',0,500,,'',0,1400,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1700,,'',0,5600,,'',0,1600,,'',0,1800,,'',0,1700,,'',0,5500,,'',0,1000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,4800,,'',0,900,,'',0,1000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,4900,,'',0,800,,'',0,1700,,'',0,1600,,'',0,5800,,'',0,1400,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,6600,,'',0,1900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6300,,'',0,2500,,'',0,2400,,'',0
-'578',3001,55200,,'',0,7700,,'',0,1900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1800,,'',0,4800,,'',0,700,,'',0,800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,700,,'',0,500,,'',0,1400,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1700,,'',0,5600,,'',0,1600,,'',0,1800,,'',0,1700,,'',0,5500,,'',0,1000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,4800,,'',0,900,,'',0,1000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,4900,,'',0,800,,'',0,1700,,'',0,1600,,'',0,5800,,'',0,1400,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,6600,,'',0,1900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6300,,'',0,2500,,'',0,2400,,'',0
-'579',3001,55200,,'',0,7700,,'',0,1900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1800,,'',0,4800,,'',0,700,,'',0,800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,700,,'',0,500,,'',0,1400,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1700,,'',0,5600,,'',0,1600,,'',0,1800,,'',0,1700,,'',0,5500,,'',0,1000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,4800,,'',0,900,,'',0,1000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,4900,,'',0,800,,'',0,1700,,'',0,1600,,'',0,5800,,'',0,1400,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,6600,,'',0,1900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6300,,'',0,2500,,'',0,2400,,'',0
-'580',3001,55200,,'',0,7700,,'',0,1900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1800,,'',0,4800,,'',0,700,,'',0,800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,700,,'',0,500,,'',0,1400,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1700,,'',0,5600,,'',0,1600,,'',0,1800,,'',0,1700,,'',0,5500,,'',0,1000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,4800,,'',0,900,,'',0,1000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,4900,,'',0,800,,'',0,1700,,'',0,1600,,'',0,5800,,'',0,1400,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,6600,,'',0,1900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6300,,'',0,2500,,'',0,2400,,'',0,9000,,'',0,8000,,'',0
-'581',3001,74800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'582',3001,55200,,'',0,7700,,'',0,1900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1800,,'',0,4800,,'',0,700,,'',0,800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,700,,'',0,500,,'',0,1400,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1700,,'',0,5600,,'',0,1600,,'',0,1800,,'',0,1700,,'',0,5500,,'',0,1000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,4800,,'',0,900,,'',0,1000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,4900,,'',0,800,,'',0,1700,,'',0,1600,,'',0,5800,,'',0,1400,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,6600,,'',0,1900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6300,,'',0,2500,,'',0,2400,,'',0
+'583',3001,55200,,'',0,7700,,'',0,1900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1800,,'',0,4800,,'',0,700,,'',0,800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,700,,'',0,500,,'',0,1400,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1700,,'',0,5600,,'',0,1600,,'',0,1800,,'',0,1700,,'',0,5500,,'',0,1000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,4800,,'',0,900,,'',0,1000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,4900,,'',0,800,,'',0,1700,,'',0,1600,,'',0,5800,,'',0,1400,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,6600,,'',0,1900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6300,,'',0,2500,,'',0,2400,,'',0
+'584',3001,55200,,'',0,7700,,'',0,1900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1800,,'',0,4800,,'',0,700,,'',0,800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,700,,'',0,500,,'',0,1400,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1700,,'',0,5600,,'',0,1600,,'',0,1800,,'',0,1700,,'',0,5500,,'',0,1000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,4800,,'',0,900,,'',0,1000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,4900,,'',0,800,,'',0,1700,,'',0,1600,,'',0,5800,,'',0,1400,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,6600,,'',0,1900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6300,,'',0,2500,,'',0,2400,,'',0,9000,,'',0,8000,,'',0
+'585',3001,74800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'586',3001,74800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,10000,,'',0
+'587',3001,55200,,'',0,7700,,'',0,1900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1800,,'',0,4800,,'',0,700,,'',0,800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,700,,'',0,500,,'',0,1400,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1700,,'',0,5600,,'',0,1600,,'',0,1800,,'',0,1700,,'',0,5500,,'',0,1000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,4800,,'',0,900,,'',0,1000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,4900,,'',0,800,,'',0,1700,,'',0,1600,,'',0,5800,,'',0,1400,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,6600,,'',0,1900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6300,,'',0,2500,,'',0,2400,,'',0
+'588',3001,55200,,'',0,7700,,'',0,1900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1800,,'',0,4800,,'',0,700,,'',0,800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,700,,'',0,500,,'',0,1400,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1700,,'',0,5600,,'',0,1600,,'',0,1800,,'',0,1700,,'',0,5500,,'',0,1000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,4800,,'',0,900,,'',0,1000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,4900,,'',0,800,,'',0,1700,,'',0,1600,,'',0,5800,,'',0,1400,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,6600,,'',0,1900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6300,,'',0,2500,,'',0,2400,,'',0
+'589',3001,55200,,'',0,7700,,'',0,1900,,'',0,5500,,'',0,1500,,'',0,1700,,'',0,1800,,'',0,4800,,'',0,700,,'',0,800,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,700,,'',0,4700,,'',0,700,,'',0,500,,'',0,1400,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1700,,'',0,5600,,'',0,1600,,'',0,1800,,'',0,1700,,'',0,5500,,'',0,1000,,'',0,1000,,'',0,900,,'',0,900,,'',0,800,,'',0,4800,,'',0,900,,'',0,1000,,'',0,800,,'',0,800,,'',0,900,,'',0,800,,'',0,4900,,'',0,800,,'',0,1700,,'',0,1600,,'',0,5800,,'',0,1400,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,6600,,'',0,1900,,'',0,2000,,'',0,6900,,'',0,2000,,'',0,7300,,'',0,2200,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6300,,'',0,2500,,'',0,2400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_875 b/src/main/res-current/raw/current_gtfs_schedule_stop_875
index 6a2466a6f..b5e3241c6 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_875
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_875
@@ -1,7 +1,7 @@
-'576',701,81400,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'577',701,62800,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
-'578',701,62800,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
-'579',701,62800,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
-'580',701,62800,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
-'581',701,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',701,62800,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'583',701,62800,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'584',701,62800,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'585',701,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',701,81400,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'587',701,62800,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'588',701,62800,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'589',701,62800,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_876 b/src/main/res-current/raw/current_gtfs_schedule_stop_876
index 9c0686cf7..d3e4e059a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_876
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_876
@@ -1,7 +1,7 @@
-'576',701,81500,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'577',701,62900,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
-'578',701,62900,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
-'579',701,62900,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
-'580',701,62900,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
-'581',701,82000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',701,62900,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'583',701,62900,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'584',701,62900,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'585',701,82000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',701,81500,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'587',701,62900,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'588',701,62900,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'589',701,62900,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_877 b/src/main/res-current/raw/current_gtfs_schedule_stop_877
index db4caeb53..889cb272d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_877
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_877
@@ -1,35 +1,35 @@
-'576',700,84700,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'577',700,65700,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
-'578',700,65700,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
-'579',700,65700,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
-'580',700,65700,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
-'581',700,81000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',700,65700,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
-'576',1800,74400,4,'',0,10300,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0,11200,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0
-'576',1801,81300,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'577',1800,63000,4,'',0,7500,4,'',0,2600,4,'',0,2700,4,'',0,6600,4,'',0,2900,4,'',0,6800,4,'',0,2700,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,2800,4,'',0,6700,4,'',0,2900,4,'',0,6800,4,'',0,3000,4,'',0,6600,4,'',0,3000,4,'',0,7000,4,'',0,9500,4,'',0,3700,4,'',0,8000,4,'',0,8300,4,'',0,11500,4,'',0
-'577',1801,63000,,'',0,7500,,'',0,2700,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
-'578',1800,63000,4,'',0,7500,4,'',0,2600,4,'',0,2700,4,'',0,6600,4,'',0,2900,4,'',0,6800,4,'',0,2700,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,2800,4,'',0,6700,4,'',0,2900,4,'',0,6800,4,'',0,3000,4,'',0,6600,4,'',0,3000,4,'',0,7000,4,'',0,9500,4,'',0,3700,4,'',0,8000,4,'',0,8300,4,'',0,11500,4,'',0
-'578',1801,63000,,'',0,7500,,'',0,2700,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
-'579',1800,63000,4,'',0,7500,4,'',0,2600,4,'',0,2700,4,'',0,6600,4,'',0,2900,4,'',0,6800,4,'',0,2700,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,2800,4,'',0,6700,4,'',0,2900,4,'',0,6800,4,'',0,3000,4,'',0,6600,4,'',0,3000,4,'',0,7000,4,'',0,9500,4,'',0,3700,4,'',0,8000,4,'',0,8300,4,'',0,11500,4,'',0
-'579',1801,63000,,'',0,7500,,'',0,2700,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
-'580',1800,63000,4,'',0,7500,4,'',0,2600,4,'',0,2700,4,'',0,6600,4,'',0,2900,4,'',0,6800,4,'',0,2700,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,2800,4,'',0,6700,4,'',0,2900,4,'',0,6800,4,'',0,3000,4,'',0,6600,4,'',0,3000,4,'',0,7000,4,'',0,9500,4,'',0,3700,4,'',0,8000,4,'',0,8300,4,'',0,11500,4,'',0
-'580',1801,63000,,'',0,7500,,'',0,2700,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
-'581',1800,74400,4,'',0,10200,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,8300,4,'',0,11500,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0
-'581',1801,74400,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'582',1800,63000,4,'',0,7500,4,'',0,2600,4,'',0,2700,4,'',0,6600,4,'',0,2900,4,'',0,6800,4,'',0,2700,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,2800,4,'',0,6700,4,'',0,2900,4,'',0,6800,4,'',0,3000,4,'',0,6600,4,'',0,3000,4,'',0,7000,4,'',0,9500,4,'',0,3700,4,'',0,8000,4,'',0,8300,4,'',0,11500,4,'',0
-'582',1801,63000,,'',0,7500,,'',0,2700,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
-'576',1900,81300,4,'',0,11500,4,'',0,11500,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0,11500,4,'',0
-'576',1901,74400,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'577',1900,65900,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,1900,4,'',0,2000,4,'',0,6100,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,1900,4,'',0,2000,4,'',0,7500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,3500,4,'',0,10000,4,'',0,10900,4,'',0
-'577',1901,65900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'578',1900,65900,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,1900,4,'',0,2000,4,'',0,6100,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,1900,4,'',0,2000,4,'',0,7500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,3500,4,'',0,10000,4,'',0,10900,4,'',0
-'578',1901,65900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'579',1900,65900,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,1900,4,'',0,2000,4,'',0,6100,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,1900,4,'',0,2000,4,'',0,7500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,3500,4,'',0,10000,4,'',0,10900,4,'',0
-'579',1901,65900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'580',1900,65900,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,1900,4,'',0,2000,4,'',0,6100,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,1900,4,'',0,2000,4,'',0,7500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,3500,4,'',0,10000,4,'',0,10900,4,'',0
-'580',1901,65900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'581',1900,74300,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,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,10000,4,'',0,11500,4,'',0,11500,4,'',0,11500,4,'',0,15500,4,'',0
-'581',1901,74300,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'582',1900,65900,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,1900,4,'',0,2000,4,'',0,6100,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,1900,4,'',0,2000,4,'',0,7500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,3500,4,'',0,10000,4,'',0,10900,4,'',0
-'582',1901,65900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'583',700,65700,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
+'584',700,65700,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
+'585',700,81000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',700,84700,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
+'587',700,65700,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
+'588',700,65700,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
+'589',700,65700,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
+'583',1800,63000,4,'',0,7500,4,'',0,2600,4,'',0,2700,4,'',0,6600,4,'',0,2900,4,'',0,6800,4,'',0,2700,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,2800,4,'',0,6700,4,'',0,2900,4,'',0,6800,4,'',0,3000,4,'',0,6600,4,'',0,3000,4,'',0,7000,4,'',0,9500,4,'',0,3700,4,'',0,8000,4,'',0,8300,4,'',0,11500,4,'',0
+'583',1801,63000,,'',0,7500,,'',0,2700,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
+'584',1800,63000,4,'',0,7500,4,'',0,2600,4,'',0,2700,4,'',0,6600,4,'',0,2900,4,'',0,6800,4,'',0,2700,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,2800,4,'',0,6700,4,'',0,2900,4,'',0,6800,4,'',0,3000,4,'',0,6600,4,'',0,3000,4,'',0,7000,4,'',0,9500,4,'',0,3700,4,'',0,8000,4,'',0,8300,4,'',0,11500,4,'',0
+'584',1801,63000,,'',0,7500,,'',0,2700,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
+'585',1800,74400,4,'',0,10200,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,8300,4,'',0,11500,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0
+'585',1801,74400,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'586',1800,74400,4,'',0,10300,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0,11200,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0
+'586',1801,81300,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'587',1800,63000,4,'',0,7500,4,'',0,2600,4,'',0,2700,4,'',0,6600,4,'',0,2900,4,'',0,6800,4,'',0,2700,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,2800,4,'',0,6700,4,'',0,2900,4,'',0,6800,4,'',0,3000,4,'',0,6600,4,'',0,3000,4,'',0,7000,4,'',0,9500,4,'',0,3700,4,'',0,8000,4,'',0,8300,4,'',0,11500,4,'',0
+'587',1801,63000,,'',0,7500,,'',0,2700,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
+'588',1800,63000,4,'',0,7500,4,'',0,2600,4,'',0,2700,4,'',0,6600,4,'',0,2900,4,'',0,6800,4,'',0,2700,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,2800,4,'',0,6700,4,'',0,2900,4,'',0,6800,4,'',0,3000,4,'',0,6600,4,'',0,3000,4,'',0,7000,4,'',0,9500,4,'',0,3700,4,'',0,8000,4,'',0,8300,4,'',0,11500,4,'',0
+'588',1801,63000,,'',0,7500,,'',0,2700,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
+'589',1800,63000,4,'',0,7500,4,'',0,2600,4,'',0,2700,4,'',0,6600,4,'',0,2900,4,'',0,6800,4,'',0,2700,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,2800,4,'',0,6700,4,'',0,2900,4,'',0,6800,4,'',0,3000,4,'',0,6600,4,'',0,3000,4,'',0,7000,4,'',0,9500,4,'',0,3700,4,'',0,8000,4,'',0,8300,4,'',0,11500,4,'',0
+'589',1801,63000,,'',0,7500,,'',0,2700,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
+'583',1900,65900,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,1900,4,'',0,2000,4,'',0,6100,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,1900,4,'',0,2000,4,'',0,7500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,3500,4,'',0,10000,4,'',0,10900,4,'',0
+'583',1901,65900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'584',1900,65900,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,1900,4,'',0,2000,4,'',0,6100,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,1900,4,'',0,2000,4,'',0,7500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,3500,4,'',0,10000,4,'',0,10900,4,'',0
+'584',1901,65900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'585',1900,74300,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,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,10000,4,'',0,11500,4,'',0,11500,4,'',0,11500,4,'',0,15500,4,'',0
+'585',1901,74300,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'586',1900,81300,4,'',0,11500,4,'',0,11500,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0,11500,4,'',0
+'586',1901,74400,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'587',1900,65900,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,1900,4,'',0,2000,4,'',0,6100,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,1900,4,'',0,2000,4,'',0,7500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,3500,4,'',0,10000,4,'',0,10900,4,'',0
+'587',1901,65900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'588',1900,65900,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,1900,4,'',0,2000,4,'',0,6100,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,1900,4,'',0,2000,4,'',0,7500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,3500,4,'',0,10000,4,'',0,10900,4,'',0
+'588',1901,65900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'589',1900,65900,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,1900,4,'',0,2000,4,'',0,6100,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,1900,4,'',0,2000,4,'',0,7500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,3500,4,'',0,10000,4,'',0,10900,4,'',0
+'589',1901,65900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_878 b/src/main/res-current/raw/current_gtfs_schedule_stop_878
index a7d62fa76..9ab8da43f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_878
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_878
@@ -1,7 +1,7 @@
-'576',701,81600,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'577',701,63000,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
-'578',701,63000,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
-'579',701,63000,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
-'580',701,63000,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
-'581',701,82100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',701,63000,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'583',701,63000,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'584',701,63000,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'585',701,82100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',701,81600,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'587',701,63000,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'588',701,63000,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'589',701,63000,,'',0,7500,,'',0,3600,,'',0,1600,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_879 b/src/main/res-current/raw/current_gtfs_schedule_stop_879
index f3a913d0f..f94784a74 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_879
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_879
@@ -1,7 +1,7 @@
-'576',700,84600,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'577',700,65600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
-'578',700,65600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
-'579',700,65600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
-'580',700,65600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
-'581',700,80900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',700,65600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
+'583',700,65600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
+'584',700,65600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
+'585',700,80900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',700,84600,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
+'587',700,65600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
+'588',700,65600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
+'589',700,65600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_88 b/src/main/res-current/raw/current_gtfs_schedule_stop_88
index ecfe75954..ab1dc5bc4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_88
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_88
@@ -1,7 +1,7 @@
-'576',901,115300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',901,90800,,'',0,22000,,'',0,38000,,'',0
-'578',901,90800,,'',0,22000,,'',0,38000,,'',0
-'579',901,90800,,'',0,22000,,'',0,38000,,'',0
-'580',901,90800,,'',0,22000,,'',0,38000,,'',0
-'581',901,115300,,'',0,8500,,'',0,29000,,'',0,8500,,'',0
-'582',901,90800,,'',0,22000,,'',0,38000,,'',0
+'583',901,90800,,'',0,22000,,'',0,38000,,'',0
+'584',901,90800,,'',0,22000,,'',0,38000,,'',0
+'585',901,115300,,'',0,8500,,'',0,29000,,'',0,8500,,'',0
+'586',901,115300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',901,90800,,'',0,22000,,'',0,38000,,'',0
+'588',901,90800,,'',0,22000,,'',0,38000,,'',0
+'589',901,90800,,'',0,22000,,'',0,38000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_880 b/src/main/res-current/raw/current_gtfs_schedule_stop_880
index f73db7cb7..6dd7ad185 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_880
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_880
@@ -1,7 +1,7 @@
-'576',701,82100,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0
-'577',701,63400,,'',0,7500,,'',0,3600,,'',0,5600,,'',0,2000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
-'578',701,63400,,'',0,7500,,'',0,3600,,'',0,5600,,'',0,2000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
-'579',701,63400,,'',0,7500,,'',0,3600,,'',0,5600,,'',0,2000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
-'580',701,63400,,'',0,7500,,'',0,3600,,'',0,5600,,'',0,2000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
-'581',701,82600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',701,63400,,'',0,7500,,'',0,3600,,'',0,5600,,'',0,2000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'583',701,63400,,'',0,7500,,'',0,3600,,'',0,5600,,'',0,2000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'584',701,63400,,'',0,7500,,'',0,3600,,'',0,5600,,'',0,2000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'585',701,82600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',701,82100,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0
+'587',701,63400,,'',0,7500,,'',0,3600,,'',0,5600,,'',0,2000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'588',701,63400,,'',0,7500,,'',0,3600,,'',0,5600,,'',0,2000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'589',701,63400,,'',0,7500,,'',0,3600,,'',0,5600,,'',0,2000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_881 b/src/main/res-current/raw/current_gtfs_schedule_stop_881
index 25662e132..6a28476c4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_881
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_881
@@ -1,7 +1,7 @@
-'576',700,84400,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'577',700,65400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'578',700,65400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'579',700,65400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'580',700,65400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'581',700,80700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',700,65400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
+'583',700,65400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
+'584',700,65400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
+'585',700,80700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',700,84400,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
+'587',700,65400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
+'588',700,65400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
+'589',700,65400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_882 b/src/main/res-current/raw/current_gtfs_schedule_stop_882
index 61074acb0..3d84e16f2 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_882
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_882
@@ -1,12 +1,12 @@
-'577',500,71200,,'',0,3800,,'',0,10000,,'',0,9200,,'',0,60600,,'',0,5500,,'',0,3700,,'',0,8900,,'',0,8000,,'',0
-'578',500,71200,,'',0,3800,,'',0,10000,,'',0,9200,,'',0,60600,,'',0,5500,,'',0,3700,,'',0,8900,,'',0,8000,,'',0
-'579',500,71200,,'',0,3800,,'',0,10000,,'',0,9200,,'',0,60600,,'',0,5500,,'',0,3700,,'',0,8900,,'',0,8000,,'',0
-'580',500,71200,,'',0,3800,,'',0,10000,,'',0,9200,,'',0,60600,,'',0,5500,,'',0,3700,,'',0,8900,,'',0,8000,,'',0
-'582',500,71200,,'',0,3800,,'',0,10000,,'',0,9200,,'',0,60600,,'',0,5500,,'',0,3700,,'',0,8900,,'',0,8000,,'',0
-'576',701,82500,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0
-'577',701,63800,,'',0,7500,,'',0,3600,,'',0,5600,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
-'578',701,63800,,'',0,7500,,'',0,3600,,'',0,5600,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
-'579',701,63800,,'',0,7500,,'',0,3600,,'',0,5600,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
-'580',701,63800,,'',0,7500,,'',0,3600,,'',0,5600,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
-'581',701,83000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',701,63800,,'',0,7500,,'',0,3600,,'',0,5600,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'583',500,71200,,'',0,3800,,'',0,10000,,'',0,9200,,'',0,60600,,'',0,5500,,'',0,3700,,'',0,8900,,'',0,8000,,'',0
+'584',500,71200,,'',0,3800,,'',0,10000,,'',0,9200,,'',0,60600,,'',0,5500,,'',0,3700,,'',0,8900,,'',0,8000,,'',0
+'587',500,71200,,'',0,3800,,'',0,10000,,'',0,9200,,'',0,60600,,'',0,5500,,'',0,3700,,'',0,8900,,'',0,8000,,'',0
+'588',500,71200,,'',0,3800,,'',0,10000,,'',0,9200,,'',0,60600,,'',0,5500,,'',0,3700,,'',0,8900,,'',0,8000,,'',0
+'589',500,71200,,'',0,3800,,'',0,10000,,'',0,9200,,'',0,60600,,'',0,5500,,'',0,3700,,'',0,8900,,'',0,8000,,'',0
+'583',701,63800,,'',0,7500,,'',0,3600,,'',0,5600,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'584',701,63800,,'',0,7500,,'',0,3600,,'',0,5600,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'585',701,83000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',701,82500,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0
+'587',701,63800,,'',0,7500,,'',0,3600,,'',0,5600,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'588',701,63800,,'',0,7500,,'',0,3600,,'',0,5600,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
+'589',701,63800,,'',0,7500,,'',0,3600,,'',0,5600,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,20900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_883 b/src/main/res-current/raw/current_gtfs_schedule_stop_883
index 27ea90281..fb812b4ef 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_883
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_883
@@ -1,7 +1,7 @@
-'576',700,84100,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'577',700,65100,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'578',700,65100,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'579',700,65100,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'580',700,65100,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'581',700,80400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',700,65100,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
+'583',700,65100,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
+'584',700,65100,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
+'585',700,80400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',700,84100,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
+'587',700,65100,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
+'588',700,65100,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
+'589',700,65100,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_884 b/src/main/res-current/raw/current_gtfs_schedule_stop_884
index a1f116019..04769df93 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_884
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_884
@@ -1,5 +1,5 @@
-'577',500,70800,,'',0,3800,,'',0,9900,,'',0,9300,,'',0,60600,,'',0,1500,,'',0,7700,,'',0,8900,,'',0,8000,,'',0
-'578',500,70800,,'',0,3800,,'',0,9900,,'',0,9300,,'',0,60600,,'',0,1500,,'',0,7700,,'',0,8900,,'',0,8000,,'',0
-'579',500,70800,,'',0,3800,,'',0,9900,,'',0,9300,,'',0,60600,,'',0,1500,,'',0,7700,,'',0,8900,,'',0,8000,,'',0
-'580',500,70800,,'',0,3800,,'',0,9900,,'',0,9300,,'',0,60600,,'',0,1500,,'',0,7700,,'',0,8900,,'',0,8000,,'',0
-'582',500,70800,,'',0,3800,,'',0,9900,,'',0,9300,,'',0,60600,,'',0,1500,,'',0,7700,,'',0,8900,,'',0,8000,,'',0
+'583',500,70800,,'',0,3800,,'',0,9900,,'',0,9300,,'',0,60600,,'',0,1500,,'',0,7700,,'',0,8900,,'',0,8000,,'',0
+'584',500,70800,,'',0,3800,,'',0,9900,,'',0,9300,,'',0,60600,,'',0,1500,,'',0,7700,,'',0,8900,,'',0,8000,,'',0
+'587',500,70800,,'',0,3800,,'',0,9900,,'',0,9300,,'',0,60600,,'',0,1500,,'',0,7700,,'',0,8900,,'',0,8000,,'',0
+'588',500,70800,,'',0,3800,,'',0,9900,,'',0,9300,,'',0,60600,,'',0,1500,,'',0,7700,,'',0,8900,,'',0,8000,,'',0
+'589',500,70800,,'',0,3800,,'',0,9900,,'',0,9300,,'',0,60600,,'',0,1500,,'',0,7700,,'',0,8900,,'',0,8000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_885 b/src/main/res-current/raw/current_gtfs_schedule_stop_885
index 178eefed7..e7c3d1fde 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_885
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_885
@@ -1,5 +1,5 @@
-'577',501,61300,,'',0,3800,,'',0,8500,,'',0,8500,,'',0,59500,,'',0,11600,,'',0,8900,,'',0,8000,,'',0,5000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
-'578',501,61300,,'',0,3800,,'',0,8500,,'',0,8500,,'',0,59500,,'',0,11600,,'',0,8900,,'',0,8000,,'',0,5000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
-'579',501,61300,,'',0,3800,,'',0,8500,,'',0,8500,,'',0,59500,,'',0,11600,,'',0,8900,,'',0,8000,,'',0,5000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
-'580',501,61300,,'',0,3800,,'',0,8500,,'',0,8500,,'',0,59500,,'',0,11600,,'',0,8900,,'',0,8000,,'',0,5000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
-'582',501,61300,,'',0,3800,,'',0,8500,,'',0,8500,,'',0,59500,,'',0,11600,,'',0,8900,,'',0,8000,,'',0,5000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
+'583',501,61300,,'',0,3800,,'',0,8500,,'',0,8500,,'',0,59500,,'',0,11600,,'',0,8900,,'',0,8000,,'',0,5000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
+'584',501,61300,,'',0,3800,,'',0,8500,,'',0,8500,,'',0,59500,,'',0,11600,,'',0,8900,,'',0,8000,,'',0,5000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
+'587',501,61300,,'',0,3800,,'',0,8500,,'',0,8500,,'',0,59500,,'',0,11600,,'',0,8900,,'',0,8000,,'',0,5000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
+'588',501,61300,,'',0,3800,,'',0,8500,,'',0,8500,,'',0,59500,,'',0,11600,,'',0,8900,,'',0,8000,,'',0,5000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
+'589',501,61300,,'',0,3800,,'',0,8500,,'',0,8500,,'',0,59500,,'',0,11600,,'',0,8900,,'',0,8000,,'',0,5000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_886 b/src/main/res-current/raw/current_gtfs_schedule_stop_886
index 01dfc517b..c251e1e06 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_886
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_886
@@ -1,5 +1,5 @@
-'577',500,71000,,'',0,3800,,'',0,9900,,'',0,9300,,'',0,60600,,'',0,5500,,'',0,3700,,'',0,8900,,'',0,8000,,'',0
-'578',500,71000,,'',0,3800,,'',0,9900,,'',0,9300,,'',0,60600,,'',0,5500,,'',0,3700,,'',0,8900,,'',0,8000,,'',0
-'579',500,71000,,'',0,3800,,'',0,9900,,'',0,9300,,'',0,60600,,'',0,5500,,'',0,3700,,'',0,8900,,'',0,8000,,'',0
-'580',500,71000,,'',0,3800,,'',0,9900,,'',0,9300,,'',0,60600,,'',0,5500,,'',0,3700,,'',0,8900,,'',0,8000,,'',0
-'582',500,71000,,'',0,3800,,'',0,9900,,'',0,9300,,'',0,60600,,'',0,5500,,'',0,3700,,'',0,8900,,'',0,8000,,'',0
+'583',500,71000,,'',0,3800,,'',0,9900,,'',0,9300,,'',0,60600,,'',0,5500,,'',0,3700,,'',0,8900,,'',0,8000,,'',0
+'584',500,71000,,'',0,3800,,'',0,9900,,'',0,9300,,'',0,60600,,'',0,5500,,'',0,3700,,'',0,8900,,'',0,8000,,'',0
+'587',500,71000,,'',0,3800,,'',0,9900,,'',0,9300,,'',0,60600,,'',0,5500,,'',0,3700,,'',0,8900,,'',0,8000,,'',0
+'588',500,71000,,'',0,3800,,'',0,9900,,'',0,9300,,'',0,60600,,'',0,5500,,'',0,3700,,'',0,8900,,'',0,8000,,'',0
+'589',500,71000,,'',0,3800,,'',0,9900,,'',0,9300,,'',0,60600,,'',0,5500,,'',0,3700,,'',0,8900,,'',0,8000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_887 b/src/main/res-current/raw/current_gtfs_schedule_stop_887
index fa22adc00..b2e894bfe 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_887
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_887
@@ -1,5 +1,5 @@
-'577',501,61100,,'',0,3800,,'',0,8600,,'',0,8500,,'',0,59400,,'',0,11600,,'',0,9000,,'',0,3900,,'',0,9000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
-'578',501,61100,,'',0,3800,,'',0,8600,,'',0,8500,,'',0,59400,,'',0,11600,,'',0,9000,,'',0,3900,,'',0,9000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
-'579',501,61100,,'',0,3800,,'',0,8600,,'',0,8500,,'',0,59400,,'',0,11600,,'',0,9000,,'',0,3900,,'',0,9000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
-'580',501,61100,,'',0,3800,,'',0,8600,,'',0,8500,,'',0,59400,,'',0,11600,,'',0,9000,,'',0,3900,,'',0,9000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
-'582',501,61100,,'',0,3800,,'',0,8600,,'',0,8500,,'',0,59400,,'',0,11600,,'',0,9000,,'',0,3900,,'',0,9000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
+'583',501,61100,,'',0,3800,,'',0,8600,,'',0,8500,,'',0,59400,,'',0,11600,,'',0,9000,,'',0,3900,,'',0,9000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
+'584',501,61100,,'',0,3800,,'',0,8600,,'',0,8500,,'',0,59400,,'',0,11600,,'',0,9000,,'',0,3900,,'',0,9000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
+'587',501,61100,,'',0,3800,,'',0,8600,,'',0,8500,,'',0,59400,,'',0,11600,,'',0,9000,,'',0,3900,,'',0,9000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
+'588',501,61100,,'',0,3800,,'',0,8600,,'',0,8500,,'',0,59400,,'',0,11600,,'',0,9000,,'',0,3900,,'',0,9000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
+'589',501,61100,,'',0,3800,,'',0,8600,,'',0,8500,,'',0,59400,,'',0,11600,,'',0,9000,,'',0,3900,,'',0,9000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_888 b/src/main/res-current/raw/current_gtfs_schedule_stop_888
index 3728294eb..9d5599b67 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_888
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_888
@@ -1,5 +1,5 @@
-'577',500,71100,,'',0,3800,,'',0,9900,,'',0,9300,,'',0,60600,,'',0,5500,,'',0,3700,,'',0,8900,,'',0,8000,,'',0
-'578',500,71100,,'',0,3800,,'',0,9900,,'',0,9300,,'',0,60600,,'',0,5500,,'',0,3700,,'',0,8900,,'',0,8000,,'',0
-'579',500,71100,,'',0,3800,,'',0,9900,,'',0,9300,,'',0,60600,,'',0,5500,,'',0,3700,,'',0,8900,,'',0,8000,,'',0
-'580',500,71100,,'',0,3800,,'',0,9900,,'',0,9300,,'',0,60600,,'',0,5500,,'',0,3700,,'',0,8900,,'',0,8000,,'',0
-'582',500,71100,,'',0,3800,,'',0,9900,,'',0,9300,,'',0,60600,,'',0,5500,,'',0,3700,,'',0,8900,,'',0,8000,,'',0
+'583',500,71100,,'',0,3800,,'',0,9900,,'',0,9300,,'',0,60600,,'',0,5500,,'',0,3700,,'',0,8900,,'',0,8000,,'',0
+'584',500,71100,,'',0,3800,,'',0,9900,,'',0,9300,,'',0,60600,,'',0,5500,,'',0,3700,,'',0,8900,,'',0,8000,,'',0
+'587',500,71100,,'',0,3800,,'',0,9900,,'',0,9300,,'',0,60600,,'',0,5500,,'',0,3700,,'',0,8900,,'',0,8000,,'',0
+'588',500,71100,,'',0,3800,,'',0,9900,,'',0,9300,,'',0,60600,,'',0,5500,,'',0,3700,,'',0,8900,,'',0,8000,,'',0
+'589',500,71100,,'',0,3800,,'',0,9900,,'',0,9300,,'',0,60600,,'',0,5500,,'',0,3700,,'',0,8900,,'',0,8000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_889 b/src/main/res-current/raw/current_gtfs_schedule_stop_889
index 2a3ee1805..960eaac11 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_889
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_889
@@ -1,5 +1,5 @@
-'577',501,61000,,'',0,3800,,'',0,8600,,'',0,8500,,'',0,59400,,'',0,11600,,'',0,9000,,'',0,3900,,'',0,9000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
-'578',501,61000,,'',0,3800,,'',0,8600,,'',0,8500,,'',0,59400,,'',0,11600,,'',0,9000,,'',0,3900,,'',0,9000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
-'579',501,61000,,'',0,3800,,'',0,8600,,'',0,8500,,'',0,59400,,'',0,11600,,'',0,9000,,'',0,3900,,'',0,9000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
-'580',501,61000,,'',0,3800,,'',0,8600,,'',0,8500,,'',0,59400,,'',0,11600,,'',0,9000,,'',0,3900,,'',0,9000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
-'582',501,61000,,'',0,3800,,'',0,8600,,'',0,8500,,'',0,59400,,'',0,11600,,'',0,9000,,'',0,3900,,'',0,9000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
+'583',501,61000,,'',0,3800,,'',0,8600,,'',0,8500,,'',0,59400,,'',0,11600,,'',0,9000,,'',0,3900,,'',0,9000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
+'584',501,61000,,'',0,3800,,'',0,8600,,'',0,8500,,'',0,59400,,'',0,11600,,'',0,9000,,'',0,3900,,'',0,9000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
+'587',501,61000,,'',0,3800,,'',0,8600,,'',0,8500,,'',0,59400,,'',0,11600,,'',0,9000,,'',0,3900,,'',0,9000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
+'588',501,61000,,'',0,3800,,'',0,8600,,'',0,8500,,'',0,59400,,'',0,11600,,'',0,9000,,'',0,3900,,'',0,9000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
+'589',501,61000,,'',0,3800,,'',0,8600,,'',0,8500,,'',0,59400,,'',0,11600,,'',0,9000,,'',0,3900,,'',0,9000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_89 b/src/main/res-current/raw/current_gtfs_schedule_stop_89
index 49d2f8062..e693293a9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_89
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_89
@@ -1,14 +1,14 @@
-'576',201,74600,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',201,60500,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'578',201,60500,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'579',201,60500,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'580',201,60500,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'581',201,81100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
-'582',201,60500,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'576',801,64800,,'',0,27400,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0
-'577',801,62800,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'578',801,62800,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'579',801,62800,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'580',801,62800,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'581',801,64900,,'',0,10200,,'',0,8000,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'582',801,62800,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'583',201,60500,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'584',201,60500,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'585',201,81100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
+'586',201,74600,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',201,60500,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'588',201,60500,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'589',201,60500,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'583',801,62800,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'584',801,62800,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'585',801,64900,,'',0,10200,,'',0,8000,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
+'586',801,64800,,'',0,27400,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0
+'587',801,62800,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'588',801,62800,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'589',801,62800,,'',0,8600,,'',0,2800,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1000,,'',0,1200,,'',0,1100,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_890 b/src/main/res-current/raw/current_gtfs_schedule_stop_890
index 3728294eb..9d5599b67 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_890
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_890
@@ -1,5 +1,5 @@
-'577',500,71100,,'',0,3800,,'',0,9900,,'',0,9300,,'',0,60600,,'',0,5500,,'',0,3700,,'',0,8900,,'',0,8000,,'',0
-'578',500,71100,,'',0,3800,,'',0,9900,,'',0,9300,,'',0,60600,,'',0,5500,,'',0,3700,,'',0,8900,,'',0,8000,,'',0
-'579',500,71100,,'',0,3800,,'',0,9900,,'',0,9300,,'',0,60600,,'',0,5500,,'',0,3700,,'',0,8900,,'',0,8000,,'',0
-'580',500,71100,,'',0,3800,,'',0,9900,,'',0,9300,,'',0,60600,,'',0,5500,,'',0,3700,,'',0,8900,,'',0,8000,,'',0
-'582',500,71100,,'',0,3800,,'',0,9900,,'',0,9300,,'',0,60600,,'',0,5500,,'',0,3700,,'',0,8900,,'',0,8000,,'',0
+'583',500,71100,,'',0,3800,,'',0,9900,,'',0,9300,,'',0,60600,,'',0,5500,,'',0,3700,,'',0,8900,,'',0,8000,,'',0
+'584',500,71100,,'',0,3800,,'',0,9900,,'',0,9300,,'',0,60600,,'',0,5500,,'',0,3700,,'',0,8900,,'',0,8000,,'',0
+'587',500,71100,,'',0,3800,,'',0,9900,,'',0,9300,,'',0,60600,,'',0,5500,,'',0,3700,,'',0,8900,,'',0,8000,,'',0
+'588',500,71100,,'',0,3800,,'',0,9900,,'',0,9300,,'',0,60600,,'',0,5500,,'',0,3700,,'',0,8900,,'',0,8000,,'',0
+'589',500,71100,,'',0,3800,,'',0,9900,,'',0,9300,,'',0,60600,,'',0,5500,,'',0,3700,,'',0,8900,,'',0,8000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_891 b/src/main/res-current/raw/current_gtfs_schedule_stop_891
index 1a0018e5e..af1888ed5 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_891
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_891
@@ -1,5 +1,5 @@
-'577',501,61000,,'',0,3800,,'',0,8500,,'',0,8500,,'',0,59500,,'',0,11500,,'',0,9000,,'',0,4000,,'',0,9000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
-'578',501,61000,,'',0,3800,,'',0,8500,,'',0,8500,,'',0,59500,,'',0,11500,,'',0,9000,,'',0,4000,,'',0,9000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
-'579',501,61000,,'',0,3800,,'',0,8500,,'',0,8500,,'',0,59500,,'',0,11500,,'',0,9000,,'',0,4000,,'',0,9000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
-'580',501,61000,,'',0,3800,,'',0,8500,,'',0,8500,,'',0,59500,,'',0,11500,,'',0,9000,,'',0,4000,,'',0,9000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
-'582',501,61000,,'',0,3800,,'',0,8500,,'',0,8500,,'',0,59500,,'',0,11500,,'',0,9000,,'',0,4000,,'',0,9000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
+'583',501,61000,,'',0,3800,,'',0,8500,,'',0,8500,,'',0,59500,,'',0,11500,,'',0,9000,,'',0,4000,,'',0,9000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
+'584',501,61000,,'',0,3800,,'',0,8500,,'',0,8500,,'',0,59500,,'',0,11500,,'',0,9000,,'',0,4000,,'',0,9000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
+'587',501,61000,,'',0,3800,,'',0,8500,,'',0,8500,,'',0,59500,,'',0,11500,,'',0,9000,,'',0,4000,,'',0,9000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
+'588',501,61000,,'',0,3800,,'',0,8500,,'',0,8500,,'',0,59500,,'',0,11500,,'',0,9000,,'',0,4000,,'',0,9000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
+'589',501,61000,,'',0,3800,,'',0,8500,,'',0,8500,,'',0,59500,,'',0,11500,,'',0,9000,,'',0,4000,,'',0,9000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,14700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_892 b/src/main/res-current/raw/current_gtfs_schedule_stop_892
index 52930cb79..6a904dddd 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_892
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_892
@@ -1,7 +1,7 @@
-'576',801,62500,,'',0,23400,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'577',801,60600,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'578',801,60600,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'579',801,60600,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'580',801,60600,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'581',801,62500,,'',0,10200,,'',0,8000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
-'582',801,60600,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'583',801,60600,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'584',801,60600,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'585',801,62500,,'',0,10200,,'',0,8000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
+'586',801,62500,,'',0,23400,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'587',801,60600,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'588',801,60600,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'589',801,60600,,'',0,4500,,'',0,6500,,'',0,2300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_893 b/src/main/res-current/raw/current_gtfs_schedule_stop_893
index 9bf320552..f8a22ba0f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_893
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_893
@@ -1,7 +1,7 @@
-'576',1000,75700,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,4,'',0
-'577',1000,55700,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'578',1000,55700,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'579',1000,55700,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'580',1000,55700,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'581',1000,75400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,4,'',0
-'582',1000,55700,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'583',1000,55700,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'584',1000,55700,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'585',1000,75400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,4,'',0
+'586',1000,75700,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,4,'',0
+'587',1000,55700,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'588',1000,55700,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'589',1000,55700,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2100,,'',0,5700,,'',0,2200,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,1700,,'',0,6300,,'',0,4200,,'',0,8400,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_89387 b/src/main/res-current/raw/current_gtfs_schedule_stop_89387
index a36110ce4..b26af4813 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_89387
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_89387
@@ -1,5 +1,5 @@
-'577',500,70100,,'',0,3800,,'',0,9800,,'',0,9400,,'',0,60500,,'',0,1500,,'',0,7700,,'',0,9000,,'',0,4000,,'',0
-'578',500,70100,,'',0,3800,,'',0,9800,,'',0,9400,,'',0,60500,,'',0,1500,,'',0,7700,,'',0,9000,,'',0,4000,,'',0
-'579',500,70100,,'',0,3800,,'',0,9800,,'',0,9400,,'',0,60500,,'',0,1500,,'',0,7700,,'',0,9000,,'',0,4000,,'',0
-'580',500,70100,,'',0,3800,,'',0,9800,,'',0,9400,,'',0,60500,,'',0,1500,,'',0,7700,,'',0,9000,,'',0,4000,,'',0
-'582',500,70100,,'',0,3800,,'',0,9800,,'',0,9400,,'',0,60500,,'',0,1500,,'',0,7700,,'',0,9000,,'',0,4000,,'',0
+'583',500,70100,,'',0,3800,,'',0,9800,,'',0,9400,,'',0,60500,,'',0,1500,,'',0,7700,,'',0,9000,,'',0,4000,,'',0
+'584',500,70100,,'',0,3800,,'',0,9800,,'',0,9400,,'',0,60500,,'',0,1500,,'',0,7700,,'',0,9000,,'',0,4000,,'',0
+'587',500,70100,,'',0,3800,,'',0,9800,,'',0,9400,,'',0,60500,,'',0,1500,,'',0,7700,,'',0,9000,,'',0,4000,,'',0
+'588',500,70100,,'',0,3800,,'',0,9800,,'',0,9400,,'',0,60500,,'',0,1500,,'',0,7700,,'',0,9000,,'',0,4000,,'',0
+'589',500,70100,,'',0,3800,,'',0,9800,,'',0,9400,,'',0,60500,,'',0,1500,,'',0,7700,,'',0,9000,,'',0,4000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_89392 b/src/main/res-current/raw/current_gtfs_schedule_stop_89392
index bb8a32e20..6e34664ee 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_89392
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_89392
@@ -1,7 +1,7 @@
-'576',1101,75900,0,'Black Mtn',0,16600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'577',1101,70300,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'578',1101,70300,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'579',1101,70300,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'580',1101,70300,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'581',1101,82000,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'582',1101,70300,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'583',1101,70300,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'584',1101,70300,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'585',1101,82000,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'586',1101,75900,0,'Black Mtn',0,16600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
+'587',1101,70300,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'588',1101,70300,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'589',1101,70300,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_89399 b/src/main/res-current/raw/current_gtfs_schedule_stop_89399
index a1512901a..7dfcc62cb 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_89399
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_89399
@@ -1,7 +1,7 @@
-'576',1601,91300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
-'577',1601,61300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'578',1601,61300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'579',1601,61300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'580',1601,61300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'581',1601,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
-'582',1601,61300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'583',1601,61300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'584',1601,61300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'585',1601,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10400,,'',0
+'586',1601,91300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0
+'587',1601,61300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'588',1601,61300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'589',1601,61300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_894 b/src/main/res-current/raw/current_gtfs_schedule_stop_894
index 8f66576b0..c40152b3e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_894
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_894
@@ -1,7 +1,7 @@
-'576',800,72000,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
-'577',800,61800,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'578',800,61800,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'579',800,61800,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'580',800,61800,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'581',800,64300,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'582',800,61800,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'583',800,61800,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'584',800,61800,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'585',800,64300,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
+'586',800,72000,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
+'587',800,61800,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'588',800,61800,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'589',800,61800,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_89400 b/src/main/res-current/raw/current_gtfs_schedule_stop_89400
index bac28b0d8..2bf7a8380 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_89400
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_89400
@@ -1,12 +1,12 @@
-'577',1301,73000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,43500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0
-'578',1301,73000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,43500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0
-'579',1301,73000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,43500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0
-'580',1301,73000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,43500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0
-'582',1301,73000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,43500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0
-'576',2301,84000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
-'577',2301,60200,,'',0,3700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'578',2301,60200,,'',0,3700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'579',2301,60200,,'',0,3700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'580',2301,60200,,'',0,3700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'581',2301,74500,,'',0,7100,,'',0,3200,,'',0,6600,,'',0,3300,,'',0,10100,,'',0,6100,,'',0,2800,,'',0,2200,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,8000,,'',0,2000,,'',0,7900,,'',0,3400,,'',0,6700,,'',0,2900,,'',0,6600,,'',0,3400,,'',0,10100,,'',0,9200,,'',0,10300,,'',0,11200,,'',0,10800,,'',0,15000,,'',0
-'582',2301,60200,,'',0,3700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'583',1301,73000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,43500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0
+'584',1301,73000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,43500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0
+'587',1301,73000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,43500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0
+'588',1301,73000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,43500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0
+'589',1301,73000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,43500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0
+'583',2301,60200,,'',0,3700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'584',2301,60200,,'',0,3700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'585',2301,74500,,'',0,7100,,'',0,3200,,'',0,6600,,'',0,3300,,'',0,10100,,'',0,6100,,'',0,2800,,'',0,2200,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,8000,,'',0,2000,,'',0,7900,,'',0,3400,,'',0,6700,,'',0,2900,,'',0,6600,,'',0,3400,,'',0,10100,,'',0,9200,,'',0,10300,,'',0,11200,,'',0,10800,,'',0,15000,,'',0
+'586',2301,84000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
+'587',2301,60200,,'',0,3700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'588',2301,60200,,'',0,3700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'589',2301,60200,,'',0,3700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_89401 b/src/main/res-current/raw/current_gtfs_schedule_stop_89401
index 2f8a8e57c..c6bce1663 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_89401
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_89401
@@ -1,12 +1,12 @@
-'577',1300,71700,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'578',1300,71700,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'579',1300,71700,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'580',1300,71700,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'582',1300,71700,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'576',2300,75700,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,9400,,'',0,9500,,'',0,16500,,'',0,5800,,'',0
-'577',2300,55300,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
-'578',2300,55300,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
-'579',2300,55300,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
-'580',2300,55300,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
-'581',2300,70200,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,2800,,'',0,6800,,'',0,7300,,'',0,2600,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,10000,,'',0,7600,,'',0,3200,,'',0,7200,,'',0,2500,,'',0,7100,,'',0,3100,,'',0,10400,,'',0,9100,,'',0,10300,,'',0,15300,,'',0,10800,,'',0,11000,,'',0
-'582',2300,55300,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
+'583',1300,71700,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'584',1300,71700,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'587',1300,71700,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'588',1300,71700,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'589',1300,71700,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'583',2300,55300,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
+'584',2300,55300,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
+'585',2300,70200,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,2800,,'',0,6800,,'',0,7300,,'',0,2600,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,10000,,'',0,7600,,'',0,3200,,'',0,7200,,'',0,2500,,'',0,7100,,'',0,3100,,'',0,10400,,'',0,9100,,'',0,10300,,'',0,15300,,'',0,10800,,'',0,11000,,'',0
+'586',2300,75700,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,9400,,'',0,9500,,'',0,16500,,'',0,5800,,'',0
+'587',2300,55300,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
+'588',2300,55300,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
+'589',2300,55300,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_895 b/src/main/res-current/raw/current_gtfs_schedule_stop_895
index 7ca81199d..19b8552c2 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_895
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_895
@@ -1,7 +1,7 @@
-'576',1001,90200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
-'577',1001,54000,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'578',1001,54000,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'579',1001,54000,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'580',1001,54000,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'581',1001,83800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',1001,54000,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'583',1001,54000,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'584',1001,54000,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'585',1001,83800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',1001,90200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
+'587',1001,54000,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'588',1001,54000,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'589',1001,54000,,'',0,7200,,'',0,1800,,'',0,2400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_896 b/src/main/res-current/raw/current_gtfs_schedule_stop_896
index 57a486b0d..f943c4045 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_896
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_896
@@ -1,14 +1,14 @@
-'576',800,72000,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
-'577',800,61800,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'578',800,61800,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'579',800,61800,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'580',800,61800,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'581',800,64300,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3100,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'582',800,61800,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'576',1001,90100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
-'577',1001,65400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'578',1001,65400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'579',1001,65400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'580',1001,65400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
-'581',1001,83700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',1001,65400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'583',800,61800,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'584',800,61800,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'585',800,64300,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3100,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
+'586',800,72000,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
+'587',800,61800,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'588',800,61800,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'589',800,61800,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1200,,'',0,1200,,'',0,5400,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'583',1001,65400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'584',1001,65400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'585',1001,83700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',1001,90100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
+'587',1001,65400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'588',1001,65400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'589',1001,65400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,2100,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,2200,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8300,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_8964 b/src/main/res-current/raw/current_gtfs_schedule_stop_8964
index 8216bb7af..cfea879bb 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_8964
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_8964
@@ -1,5 +1,5 @@
-'577',2800,65300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'578',2800,65300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'579',2800,65300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'580',2800,65300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'582',2800,65300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'583',2800,65300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'584',2800,65300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'587',2800,65300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'588',2800,65300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'589',2800,65300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_8965 b/src/main/res-current/raw/current_gtfs_schedule_stop_8965
index 4aba0886b..66a08ecc2 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_8965
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_8965
@@ -1,5 +1,5 @@
-'577',2800,65400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'578',2800,65400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'579',2800,65400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'580',2800,65400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'582',2800,65400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'583',2800,65400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'584',2800,65400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'587',2800,65400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'588',2800,65400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'589',2800,65400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_897 b/src/main/res-current/raw/current_gtfs_schedule_stop_897
index a439f0318..8e7709ffb 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_897
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_897
@@ -1,5 +1,5 @@
-'577',500,70600,,'',0,3800,,'',0,9800,,'',0,9400,,'',0,60600,,'',0,1500,,'',0,7700,,'',0,8900,,'',0,8000,,'',0
-'578',500,70600,,'',0,3800,,'',0,9800,,'',0,9400,,'',0,60600,,'',0,1500,,'',0,7700,,'',0,8900,,'',0,8000,,'',0
-'579',500,70600,,'',0,3800,,'',0,9800,,'',0,9400,,'',0,60600,,'',0,1500,,'',0,7700,,'',0,8900,,'',0,8000,,'',0
-'580',500,70600,,'',0,3800,,'',0,9800,,'',0,9400,,'',0,60600,,'',0,1500,,'',0,7700,,'',0,8900,,'',0,8000,,'',0
-'582',500,70600,,'',0,3800,,'',0,9800,,'',0,9400,,'',0,60600,,'',0,1500,,'',0,7700,,'',0,8900,,'',0,8000,,'',0
+'583',500,70600,,'',0,3800,,'',0,9800,,'',0,9400,,'',0,60600,,'',0,1500,,'',0,7700,,'',0,8900,,'',0,8000,,'',0
+'584',500,70600,,'',0,3800,,'',0,9800,,'',0,9400,,'',0,60600,,'',0,1500,,'',0,7700,,'',0,8900,,'',0,8000,,'',0
+'587',500,70600,,'',0,3800,,'',0,9800,,'',0,9400,,'',0,60600,,'',0,1500,,'',0,7700,,'',0,8900,,'',0,8000,,'',0
+'588',500,70600,,'',0,3800,,'',0,9800,,'',0,9400,,'',0,60600,,'',0,1500,,'',0,7700,,'',0,8900,,'',0,8000,,'',0
+'589',500,70600,,'',0,3800,,'',0,9800,,'',0,9400,,'',0,60600,,'',0,1500,,'',0,7700,,'',0,8900,,'',0,8000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_898 b/src/main/res-current/raw/current_gtfs_schedule_stop_898
index 181946a05..bbf720f3a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_898
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_898
@@ -1,5 +1,5 @@
-'577',501,61500,,'',0,3800,,'',0,8600,,'',0,8500,,'',0,59400,,'',0,11700,,'',0,8900,,'',0,7900,,'',0,5000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,18700,,'',0
-'578',501,61500,,'',0,3800,,'',0,8600,,'',0,8500,,'',0,59400,,'',0,11700,,'',0,8900,,'',0,7900,,'',0,5000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,18700,,'',0
-'579',501,61500,,'',0,3800,,'',0,8600,,'',0,8500,,'',0,59400,,'',0,11700,,'',0,8900,,'',0,7900,,'',0,5000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,18700,,'',0
-'580',501,61500,,'',0,3800,,'',0,8600,,'',0,8500,,'',0,59400,,'',0,11700,,'',0,8900,,'',0,7900,,'',0,5000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,18700,,'',0
-'582',501,61500,,'',0,3800,,'',0,8600,,'',0,8500,,'',0,59400,,'',0,11700,,'',0,8900,,'',0,7900,,'',0,5000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,18700,,'',0
+'583',501,61500,,'',0,3800,,'',0,8600,,'',0,8500,,'',0,59400,,'',0,11700,,'',0,8900,,'',0,7900,,'',0,5000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,18700,,'',0
+'584',501,61500,,'',0,3800,,'',0,8600,,'',0,8500,,'',0,59400,,'',0,11700,,'',0,8900,,'',0,7900,,'',0,5000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,18700,,'',0
+'587',501,61500,,'',0,3800,,'',0,8600,,'',0,8500,,'',0,59400,,'',0,11700,,'',0,8900,,'',0,7900,,'',0,5000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,18700,,'',0
+'588',501,61500,,'',0,3800,,'',0,8600,,'',0,8500,,'',0,59400,,'',0,11700,,'',0,8900,,'',0,7900,,'',0,5000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,18700,,'',0
+'589',501,61500,,'',0,3800,,'',0,8600,,'',0,8500,,'',0,59400,,'',0,11700,,'',0,8900,,'',0,7900,,'',0,5000,,'',0,10000,,'',0,16500,,'',0,19500,,'',0,10000,,'',0,18700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_9 b/src/main/res-current/raw/current_gtfs_schedule_stop_9
index db8535bf4..c4c4fcc9c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_9
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_9
@@ -1,19 +1,19 @@
-'576',200,82600,4,'',0,9800,4,'',0,10000,4,'',0,10000,4,'',0,10200,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9700,4,'',0,10000,4,'',0,9900,4,'',0
-'576',201,74000,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',200,62100,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,800,4,'',0,700,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1400,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1400,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,2900,4,'',0,7000,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0
-'577',201,60000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'578',200,62100,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,800,4,'',0,700,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1400,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1400,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,2900,4,'',0,7000,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0
-'578',201,60000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'579',200,62100,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,800,4,'',0,700,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1400,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1400,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,2900,4,'',0,7000,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0
-'579',201,60000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'580',200,62100,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,800,4,'',0,700,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1400,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1400,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,2900,4,'',0,7000,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0
-'580',201,60000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'581',200,82500,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6700,4,'',0,3000,4,'',0,7500,4,'',0,9300,4,'',0,10200,4,'',0,10100,4,'',0
-'581',201,80500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10200,,'',0,10000,,'',0,9600,,'',0
-'582',200,62100,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,800,4,'',0,700,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1400,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1400,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,2900,4,'',0,7000,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0
-'582',201,60000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',2901,154600,0,'',0
-'578',2901,154600,0,'',0
-'579',2901,154600,0,'',0
-'580',2901,154600,0,'',0
-'582',2901,154600,0,'',0
+'583',200,62100,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,800,4,'',0,700,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1400,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1400,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,2900,4,'',0,7000,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0
+'583',201,60000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'584',200,62100,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,800,4,'',0,700,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1400,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1400,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,2900,4,'',0,7000,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0
+'584',201,60000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'585',200,82500,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6700,4,'',0,3000,4,'',0,7500,4,'',0,9300,4,'',0,10200,4,'',0,10100,4,'',0
+'585',201,80500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10200,,'',0,10000,,'',0,9600,,'',0
+'586',200,82600,4,'',0,9800,4,'',0,10000,4,'',0,10000,4,'',0,10200,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9700,4,'',0,10000,4,'',0,9900,4,'',0
+'586',201,74000,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',200,62100,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,800,4,'',0,700,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1400,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1400,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,2900,4,'',0,7000,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0
+'587',201,60000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'588',200,62100,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,800,4,'',0,700,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1400,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1400,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,2900,4,'',0,7000,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0
+'588',201,60000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'589',200,62100,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,800,4,'',0,700,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1400,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1400,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,2900,4,'',0,7000,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0
+'589',201,60000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'583',2901,154600,0,'',0
+'584',2901,154600,0,'',0
+'587',2901,154600,0,'',0
+'588',2901,154600,0,'',0
+'589',2901,154600,0,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_90 b/src/main/res-current/raw/current_gtfs_schedule_stop_90
index f05446bba..e187ee25c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_90
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_90
@@ -1,7 +1,7 @@
-'576',1000,81900,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
-'577',1000,61900,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'578',1000,61900,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'579',1000,61900,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'580',1000,61900,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'581',1000,81800,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
-'582',1000,61900,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'583',1000,61900,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'584',1000,61900,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'585',1000,81800,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'586',1000,81900,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
+'587',1000,61900,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'588',1000,61900,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'589',1000,61900,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8300,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_9055 b/src/main/res-current/raw/current_gtfs_schedule_stop_9055
index 054d40d29..8c3aa481b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_9055
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_9055
@@ -1,13 +1,13 @@
-'576',800,72600,,'',0,10600,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4500,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,17000,,'',0
-'577',800,62400,,'',0,2600,,'',0,6400,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'578',800,62400,,'',0,2600,,'',0,6400,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'579',800,62400,,'',0,2600,,'',0,6400,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'580',800,62400,,'',0,2600,,'',0,6400,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'581',800,64900,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3300,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,8000,,'',0,4400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
-'582',800,62400,,'',0,2600,,'',0,6400,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'577',2301,75000,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
-'578',2301,75000,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
-'579',2301,75000,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
-'580',2301,75000,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
-'581',2301,101500,0,'Old Vernon Rd',0
-'582',2301,75000,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'583',800,62400,,'',0,2600,,'',0,6400,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'584',800,62400,,'',0,2600,,'',0,6400,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'585',800,64900,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3300,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,8000,,'',0,4400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
+'586',800,72600,,'',0,10600,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4500,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,17000,,'',0
+'587',800,62400,,'',0,2600,,'',0,6400,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'588',800,62400,,'',0,2600,,'',0,6400,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'589',800,62400,,'',0,2600,,'',0,6400,,'',0,2200,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5100,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1200,,'',0,5300,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5100,,'',0,1200,,'',0,1100,,'',0,1100,,'',0,1200,,'',0,5200,,'',0,1500,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'583',2301,75000,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'584',2301,75000,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'585',2301,101500,0,'Old Vernon Rd',0
+'587',2301,75000,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'588',2301,75000,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'589',2301,75000,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_91 b/src/main/res-current/raw/current_gtfs_schedule_stop_91
index 136b3f31b..5af42cbe6 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_91
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_91
@@ -1,7 +1,7 @@
-'576',800,70400,,'',0,10200,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
-'577',800,60300,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'578',800,60300,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'579',800,60300,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'580',800,60300,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'581',800,70200,,'',0,4500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'582',800,60300,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'583',800,60300,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'584',800,60300,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'585',800,70200,,'',0,4500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
+'586',800,70400,,'',0,10200,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
+'587',800,60300,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'588',800,60300,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'589',800,60300,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1400,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_92 b/src/main/res-current/raw/current_gtfs_schedule_stop_92
index 3611fbc18..9d92902f7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_92
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_92
@@ -1,7 +1,7 @@
-'576',1100,81700,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9400,,'',0,10000,,'',0,10000,,'',0
-'577',1100,65900,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'578',1100,65900,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'579',1100,65900,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'580',1100,65900,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'581',1100,80400,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
-'582',1100,65900,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'583',1100,65900,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'584',1100,65900,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'585',1100,80400,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
+'586',1100,81700,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9400,,'',0,10000,,'',0,10000,,'',0
+'587',1100,65900,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'588',1100,65900,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'589',1100,65900,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_92327 b/src/main/res-current/raw/current_gtfs_schedule_stop_92327
index 61bfe7f89..591c81ef8 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_92327
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_92327
@@ -1,12 +1,12 @@
-'577',1301,73000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,43500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0
-'578',1301,73000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,43500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0
-'579',1301,73000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,43500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0
-'580',1301,73000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,43500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0
-'582',1301,73000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,43500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0
-'576',2301,84000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
-'577',2301,60100,,'',0,3700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'578',2301,60100,,'',0,3700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'579',2301,60100,,'',0,3700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'580',2301,60100,,'',0,3700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'581',2301,74500,,'',0,7100,,'',0,3200,,'',0,6600,,'',0,3200,,'',0,10100,,'',0,6200,,'',0,2700,,'',0,2300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,8000,,'',0,2000,,'',0,7800,,'',0,3400,,'',0,6800,,'',0,2800,,'',0,6700,,'',0,3300,,'',0,10200,,'',0,9200,,'',0,10300,,'',0,11200,,'',0,10800,,'',0,15000,,'',0
-'582',2301,60100,,'',0,3700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'583',1301,73000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,43500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0
+'584',1301,73000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,43500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0
+'587',1301,73000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,43500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0
+'588',1301,73000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,43500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0
+'589',1301,73000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,43500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,21500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0
+'583',2301,60100,,'',0,3700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'584',2301,60100,,'',0,3700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'585',2301,74500,,'',0,7100,,'',0,3200,,'',0,6600,,'',0,3200,,'',0,10100,,'',0,6200,,'',0,2700,,'',0,2300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,8000,,'',0,2000,,'',0,7800,,'',0,3400,,'',0,6800,,'',0,2800,,'',0,6700,,'',0,3300,,'',0,10200,,'',0,9200,,'',0,10300,,'',0,11200,,'',0,10800,,'',0,15000,,'',0
+'586',2301,84000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
+'587',2301,60100,,'',0,3700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'588',2301,60100,,'',0,3700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'589',2301,60100,,'',0,3700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_92328 b/src/main/res-current/raw/current_gtfs_schedule_stop_92328
index 53fb32998..fd477fb7c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_92328
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_92328
@@ -1,12 +1,12 @@
-'577',1300,71800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'578',1300,71800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'579',1300,71800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'580',1300,71800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'582',1300,71800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
-'576',2300,75700,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
-'577',2300,55400,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
-'578',2300,55400,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
-'579',2300,55400,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
-'580',2300,55400,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
-'581',2300,70300,,'',0,3100,,'',0,6800,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,10000,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,2600,,'',0,7000,,'',0,3200,,'',0,10400,,'',0,9100,,'',0,10300,,'',0,15300,,'',0,10800,,'',0,11000,,'',0
-'582',2300,55400,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
+'583',1300,71800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'584',1300,71800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'587',1300,71800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'588',1300,71800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'589',1300,71800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,47500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,21500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0
+'583',2300,55400,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
+'584',2300,55400,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
+'585',2300,70300,,'',0,3100,,'',0,6800,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,10000,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,2600,,'',0,7000,,'',0,3200,,'',0,10400,,'',0,9100,,'',0,10300,,'',0,15300,,'',0,10800,,'',0,11000,,'',0
+'586',2300,75700,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
+'587',2300,55400,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
+'588',2300,55400,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
+'589',2300,55400,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_93 b/src/main/res-current/raw/current_gtfs_schedule_stop_93
index d866355a1..875e3e4f6 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_93
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_93
@@ -1,14 +1,14 @@
-'576',200,82000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
-'577',200,61500,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'578',200,61500,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'579',200,61500,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'580',200,61500,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'581',200,81900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'582',200,61500,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'576',800,70000,,'',0,10200,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
-'577',800,55800,,'',0,6500,,'',0,2300,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
-'578',800,55800,,'',0,6500,,'',0,2300,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
-'579',800,55800,,'',0,6500,,'',0,2300,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
-'580',800,55800,,'',0,6500,,'',0,2300,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
-'581',800,65800,,'',0,8500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'582',800,55800,,'',0,6500,,'',0,2300,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'583',200,61500,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'584',200,61500,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'585',200,81900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
+'586',200,82000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
+'587',200,61500,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'588',200,61500,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'589',200,61500,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'583',800,55800,,'',0,6500,,'',0,2300,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'584',800,55800,,'',0,6500,,'',0,2300,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'585',800,65800,,'',0,8500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
+'586',800,70000,,'',0,10200,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
+'587',800,55800,,'',0,6500,,'',0,2300,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'588',800,55800,,'',0,6500,,'',0,2300,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'589',800,55800,,'',0,6500,,'',0,2300,,'',0,6000,,'',0,1400,,'',0,1400,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1300,,'',0,1300,,'',0,1300,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1100,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_94 b/src/main/res-current/raw/current_gtfs_schedule_stop_94
index 29eb1b022..70aa7d6bf 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_94
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_94
@@ -1,7 +1,7 @@
-'576',1101,74700,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
-'577',1101,65400,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'578',1101,65400,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'579',1101,65400,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'580',1101,65400,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'581',1101,80800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'582',1101,65400,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'583',1101,65400,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'584',1101,65400,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'585',1101,80800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'586',1101,74700,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
+'587',1101,65400,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'588',1101,65400,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'589',1101,65400,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_94267 b/src/main/res-current/raw/current_gtfs_schedule_stop_94267
index 82fda9c07..4afe6df60 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_94267
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_94267
@@ -1,7 +1,7 @@
-'576',1900,81000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'577',1900,65600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'578',1900,65600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'579',1900,65600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'580',1900,65600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'581',1900,74000,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'582',1900,65600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'583',1900,65600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'584',1900,65600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'585',1900,74000,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'586',1900,81000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'587',1900,65600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'588',1900,65600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'589',1900,65600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_95 b/src/main/res-current/raw/current_gtfs_schedule_stop_95
index 53b31a153..54e3f803f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_95
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_95
@@ -1,7 +1,7 @@
-'576',601,81600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'577',601,62400,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'578',601,62400,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'579',601,62400,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'580',601,62400,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'581',601,80100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'582',601,62400,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'583',601,62400,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'584',601,62400,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'585',601,80100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
+'586',601,81600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'587',601,62400,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'588',601,62400,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'589',601,62400,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_96 b/src/main/res-current/raw/current_gtfs_schedule_stop_96
index 26bd3ba66..54b528a2d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_96
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_96
@@ -1,14 +1,14 @@
-'576',700,85600,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'577',700,70700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'578',700,70700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'579',700,70700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'580',700,70700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'581',700,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',700,70700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'576',1801,82200,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'577',1801,63900,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,2700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'578',1801,63900,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,2700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'579',1801,63900,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,2700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'580',1801,63900,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,2700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'581',1801,75300,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'582',1801,63900,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,2700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'583',700,70700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'584',700,70700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'585',700,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',700,85600,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
+'587',700,70700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'588',700,70700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'589',700,70700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'583',1801,63900,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,2700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'584',1801,63900,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,2700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'585',1801,75300,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'586',1801,82200,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'587',1801,63900,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,2700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'588',1801,63900,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,2700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'589',1801,63900,,'',0,7500,,'',0,2800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,2700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_97 b/src/main/res-current/raw/current_gtfs_schedule_stop_97
index c073f42e7..f6b93cbd3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_97
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_97
@@ -1,14 +1,14 @@
-'576',701,80600,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'577',701,62100,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'578',701,62100,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'579',701,62100,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'580',701,62100,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'581',701,81100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'582',701,62100,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
-'576',1800,73500,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'577',1800,62100,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'578',1800,62100,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'579',1800,62100,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'580',1800,62100,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'581',1800,73500,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'582',1800,62100,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'583',701,62100,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'584',701,62100,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'585',701,81100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'586',701,80600,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'587',701,62100,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'588',701,62100,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'589',701,62100,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,21000,,'',0
+'583',1800,62100,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'584',1800,62100,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'585',1800,73500,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'586',1800,73500,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'587',1800,62100,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'588',1800,62100,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'589',1800,62100,,'',0,3500,,'',0,6600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_974 b/src/main/res-current/raw/current_gtfs_schedule_stop_974
index 1ced7a604..d8ea7e40b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_974
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_974
@@ -1,7 +1,7 @@
-'576',1000,82000,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
-'577',1000,62000,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8200,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'578',1000,62000,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8200,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'579',1000,62000,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8200,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'580',1000,62000,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8200,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
-'581',1000,81900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
-'582',1000,62000,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8200,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'583',1000,62000,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8200,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'584',1000,62000,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8200,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'585',1000,81900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'586',1000,82000,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
+'587',1000,62000,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8200,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'588',1000,62000,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8200,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
+'589',1000,62000,,'',0,3200,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2800,,'',0,6900,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,6000,,'',0,1700,,'',0,2200,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,1500,,'',0,5700,,'',0,2200,,'',0,8100,,'',0,8400,,'',0,4200,,'',0,8200,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_98 b/src/main/res-current/raw/current_gtfs_schedule_stop_98
index 66a5bec83..3ba694274 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_98
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_98
@@ -1,14 +1,14 @@
-'576',201,74600,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',201,60500,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'578',201,60500,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'579',201,60500,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'580',201,60500,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'581',201,81100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
-'582',201,60500,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'576',801,64900,,'',0,27400,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0
-'577',801,62900,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5000,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'578',801,62900,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5000,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'579',801,62900,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5000,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'580',801,62900,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5000,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'581',801,64900,,'',0,10200,,'',0,8000,,'',0,7600,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'582',801,62900,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5000,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'583',201,60500,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'584',201,60500,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'585',201,81100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
+'586',201,74600,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',201,60500,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'588',201,60500,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'589',201,60500,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'583',801,62900,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5000,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'584',801,62900,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5000,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'585',801,64900,,'',0,10200,,'',0,8000,,'',0,7600,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
+'586',801,64900,,'',0,27400,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0
+'587',801,62900,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5000,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'588',801,62900,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5000,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'589',801,62900,,'',0,8600,,'',0,2700,,'',0,6300,,'',0,1200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1200,,'',0,1200,,'',0,5200,,'',0,1200,,'',0,1300,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1200,,'',0,1300,,'',0,1500,,'',0,1300,,'',0,5200,,'',0,1200,,'',0,1200,,'',0,1200,,'',0,1000,,'',0,5100,,'',0,1100,,'',0,1200,,'',0,1100,,'',0,1200,,'',0,5000,,'',0,1000,,'',0,1200,,'',0,1200,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_99 b/src/main/res-current/raw/current_gtfs_schedule_stop_99
index 1750421e8..b0ebfaafb 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_99
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_99
@@ -1,7 +1,7 @@
-'576',901,115400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'577',901,90900,,'',0,22000,,'',0,38000,,'',0
-'578',901,90900,,'',0,22000,,'',0,38000,,'',0
-'579',901,90900,,'',0,22000,,'',0,38000,,'',0
-'580',901,90900,,'',0,22000,,'',0,38000,,'',0
-'581',901,115400,,'',0,8500,,'',0,29000,,'',0,8500,,'',0
-'582',901,90900,,'',0,22000,,'',0,38000,,'',0
+'583',901,90900,,'',0,22000,,'',0,38000,,'',0
+'584',901,90900,,'',0,22000,,'',0,38000,,'',0
+'585',901,115400,,'',0,8500,,'',0,29000,,'',0,8500,,'',0
+'586',901,115400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'587',901,90900,,'',0,22000,,'',0,38000,,'',0
+'588',901,90900,,'',0,22000,,'',0,38000,,'',0
+'589',901,90900,,'',0,22000,,'',0,38000,,'',0
diff --git a/src/main/res-current/values/current_gtfs_rts_values_gen.xml b/src/main/res-current/values/current_gtfs_rts_values_gen.xml
index 68627407e..ef406c102 100644
--- a/src/main/res-current/values/current_gtfs_rts_values_gen.xml
+++ b/src/main/res-current/values/current_gtfs_rts_values_gen.xml
@@ -6,6 +6,6 @@
     <string name="current_gtfs_rts_area_max_lat">50.073517</string>
     <string name="current_gtfs_rts_area_min_lng">-119.790196</string>
     <string name="current_gtfs_rts_area_max_lng">-119.347233</string>
-    <integer name="current_gtfs_rts_first_departure_in_sec">1693747500</integer>
+    <integer name="current_gtfs_rts_first_departure_in_sec">1694089680</integer>
     <integer name="current_gtfs_rts_last_departure_in_sec">1704018420</integer>
 </resources>
diff --git a/src/main/res/values/gtfs_rts_values.xml b/src/main/res/values/gtfs_rts_values.xml
index 788fcd27b..7a35710a1 100755
--- a/src/main/res/values/gtfs_rts_values.xml
+++ b/src/main/res/values/gtfs_rts_values.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-    <integer name="gtfs_rts_db_version">20230905</integer>
+    <integer name="gtfs_rts_db_version">20230912</integer>
     <string name="gtfs_rts_authority">org.mtransit.android.ca_kelowna_regional_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>