diff --git a/datasets/stops.csv b/datasets/stops.csv
index f0f1628ed..fb8cd8c4b 100644
--- a/datasets/stops.csv
+++ b/datasets/stops.csv
@@ -2080,7 +2080,6 @@ stop_id,stop_code,stop_name,stop_desc,stop_lat,stop_lon,zone_id,stop_url,locatio
 2955,52924,Westbound Halifax St @ Duthie Ave,,49.268018,-122.953857,BUS ZN,,0,,1,
 2956,52925,Westbound Halifax St @ Sherlock Ave,,49.268038,-122.956844,BUS ZN,,0,,2,
 2957,52926,Westbound Halifax St @ Cliff Ave,,49.268031,-122.959608,BUS ZN,,0,,2,
-2958,52927,Westbound Halifax St @ Yeovil Ave,,49.268034,-122.962229,BUS ZN,,0,,2,
 2959,52928,Westbound Halifax St @ Sperling Ave,,49.268037,-122.965074,BUS ZN,,0,,2,
 2960,52929,Westbound Halifax St @ Tallin Ave,,49.268041,-122.966784,BUS ZN,,0,,2,
 2961,52930,Westbound Halifax St @ Kensington Ave,,49.268033,-122.970568,BUS ZN,,0,,2,
@@ -4920,7 +4919,7 @@ stop_id,stop_code,stop_name,stop_desc,stop_lat,stop_lon,zone_id,stop_url,locatio
 6578,56517,Steveston Exchange @ Bay 3,,49.126496,-123.184059,BUS ZN,,0,,1,
 6579,56518,Eastbound Moncton St @ No. 1 Rd,,49.125117,-123.180317,BUS ZN,,0,,1,
 6580,56519,Eastbound Moncton St @ 4300 Block,,49.125098,-123.177225,BUS ZN,,0,,1,
-6581,56520,Eastbound Moncton St @ Phoenix Dr,,49.125081,-123.17226,BUS ZN,,0,,2,
+6581,56520,Eastbound Moncton St @ Phoenix Dr,,49.125081,-123.17226,BUS ZN,,0,,1,
 6582,56521,Eastbound Moncton St @ Railway Ave,,49.125066,-123.169304,BUS ZN,,0,,2,
 6583,56522,Eastbound Moncton St @ Trites Rd,,49.124983,-123.163912,BUS ZN,,0,,1,
 6584,56523,Eastbound Moncton St @ No. 2 Rd,,49.12492,-123.159416,BUS ZN,,0,,1,
@@ -5287,7 +5286,7 @@ stop_id,stop_code,stop_name,stop_desc,stop_lat,stop_lon,zone_id,stop_url,locatio
 7014,56947,Eastbound Bridgeport Rd @ Shell Rd,,49.191933,-123.101252,BUS ZN,,0,,1,
 7015,56948,Eastbound Bridgeport Rd @ Simpson Rd,,49.191919,-123.098536,BUS ZN,,0,,1,
 7016,56949,Eastbound Bridgeport Rd @ Olafsen Ave,,49.191901,-123.095023,BUS ZN,,0,,1,
-7017,56950,Eastbound Bridgeport Rd @ No. 5 Rd,,49.191861,-123.090821,BUS ZN,,0,,2,
+7017,56950,Eastbound Bridgeport Rd @ No. 5 Rd,,49.191861,-123.090821,BUS ZN,,0,,1,
 7018,56951,Eastbound Bridgeport Rd @ 12400 Block,,49.19189,-123.086226,BUS ZN,,0,,2,
 7019,56952,Northbound No. 5 Rd @ Bridgeport Rd,,49.192475,-123.091401,BUS ZN,,0,,1,
 7020,56953,Eastbound Vulcan Way @ 12200 Block,,49.193791,-123.087685,BUS ZN,,0,,1,
@@ -5355,7 +5354,6 @@ stop_id,stop_code,stop_name,stop_desc,stop_lat,stop_lon,zone_id,stop_url,locatio
 7094,57026,Eastbound Logan Ave @ 203A St,,49.107721,-122.657685,BUS ZN,,0,,1,
 7095,57027,Langley Centre @ Bay 3,,49.106256,-122.654259,BUS ZN,,0,,1,
 7096,57028,Westbound Fraser Hwy @ 56 Ave,,49.105178,-122.658147,BUS ZN,,0,,1,
-7097,57029,Westbound Fraser Hwy @ 203 St,,49.105736,-122.660798,BUS ZN,,0,,1,
 7098,57030,Westbound Fraser Hwy @ 201A St,,49.107254,-122.664865,BUS ZN,,0,,1,
 7099,57031,Westbound Fraser Hwy @ 200 St,,49.108788,-122.66826,BUS ZN,,0,,1,
 7100,57032,Eastbound Willowbrook Dr @ 197 St,,49.116703,-122.676459,BUS ZN,,0,,1,
@@ -7280,7 +7278,6 @@ stop_id,stop_code,stop_name,stop_desc,stop_lat,stop_lon,zone_id,stop_url,locatio
 10725,60794,Eastbound 64 Ave @ 179 St,,49.118699,-122.725507,BUS ZN,,0,,2,
 10726,60792,Eastbound 64 Ave @ 177B St,,49.118673,-122.730037,BUS ZN,,0,,1,
 10727,60796,Eastbound 64 Ave @ 181A St,,49.118669,-122.719315,BUS ZN,,0,,1,
-10729,60795,Westbound 64 Ave @ 181A St,,49.118811,-122.720802,BUS ZN,,0,,1,
 10730,60793,Westbound 64 Ave @ 179 St,,49.118836,-122.726507,BUS ZN,,0,,2,
 10731,59645,Southbound West St @ Maple Meadows Station,,49.216763,-122.664945,BUS ZN,,0,,2,
 10736,60723,Southbound 200 St @ Maple Meadows Way,,49.2198,-122.665955,BUS ZN,,0,,2,
@@ -7964,8 +7961,8 @@ stop_id,stop_code,stop_name,stop_desc,stop_lat,stop_lon,zone_id,stop_url,locatio
 11782,61679,Eastbound 10 Ave @ 54A St,,49.021959,-123.072799,BUS ZN,,0,,1,
 11785,61685,Eastbound Lougheed Hwy @ Kennedy Rd,,49.242957,-122.719855,BUS ZN,,0,,1,
 11788,61693,Bridgeport Station @ Bay 6,,49.19488,-123.127321,BUS ZN,,0,,1,
+11792,58895,UBC Exchange @ Bay 9,,49.265726,-123.248724,BUS ZN,,0,,1,
 11793,61701,UBC Exchange @ Bay 10,,49.26581,-123.248129,BUS ZN,,0,,1,
-11794,61702,UBC Exchange @ Bay 11,,49.265923,-123.247364,BUS ZN,,0,,1,
 11797,61691,Southbound East Rd @ 1400 Block,,49.304406,-122.838698,BUS ZN,,0,,1,
 11798,61716,Carvolth Exchange @ Bay 8,,49.159711,-122.660703,BUS ZN,,0,,1,
 11799,61717,Carvolth Exchange @ Bay 9,,49.159965,-122.660566,BUS ZN,,0,,1,
@@ -8513,8 +8510,8 @@ stop_id,stop_code,stop_name,stop_desc,stop_lat,stop_lon,zone_id,stop_url,locatio
 12579,56938,Northbound Gilbert Rd @ Westminster Hwy,,49.170522,-123.147475,BUS ZN,,0,,1,
 12580,59709,Port Haney Station @ Bay 3,,49.212575,-122.606432,BUS ZN,,0,,1,
 12581,60342,Southbound Cambie St @ W Georgia St,,49.279676,-123.112876,BUS ZN,,0,,1,
-12585,50137,Eastbound W 41 Ave @ Cambie St,,49.233415,-123.115623,BUS ZN,,0,,1,
-12586,60349,Eastbound W 41 Ave @ Cambie St,,49.233377,-123.11467,BUS ZN,,0,,1,
+12585,50137,Oakridge-41st Ave Station @ Bay 2,,49.233415,-123.115623,BUS ZN,,0,,1,
+12586,60349,Oakridge-41st Ave Station @ Bay 3,,49.233377,-123.11467,BUS ZN,,0,,1,
 12589,60352,Westbound Granville Ave @ Moffatt Rd,,49.162848,-123.145425,BUS ZN,,0,,1,
 12591,60343,Southbound Orchid Dr @ Holly Dr,,49.256017,-122.800781,BUS ZN,,0,,1,
 12592,60344,Northbound Orchid Dr @ Palm Terrace,,49.255729,-122.800598,BUS ZN,,0,,1,
diff --git a/datasets/stops.geojson b/datasets/stops.geojson
index fdc79a510..45dd616b6 100644
--- a/datasets/stops.geojson
+++ b/datasets/stops.geojson
@@ -39539,25 +39539,6 @@
    },
    "type": "Feature"
   },
-  {
-   "geometry": {
-    "coordinates": [
-     -122.962229,
-     49.268034
-    ],
-    "type": "Point"
-   },
-   "id": "2958",
-   "properties": {
-    "code": "52927",
-    "desc": "",
-    "id": "2958",
-    "name": "Westbound Halifax St @ Yeovil Ave",
-    "wheelchair_boarding": "2",
-    "zone": "BUS ZN"
-   },
-   "type": "Feature"
-  },
   {
    "geometry": {
     "coordinates": [
@@ -93513,7 +93494,7 @@
     "desc": "",
     "id": "6581",
     "name": "Eastbound Moncton St @ Phoenix Dr",
-    "wheelchair_boarding": "2",
+    "wheelchair_boarding": "1",
     "zone": "BUS ZN"
    },
    "type": "Feature"
@@ -100486,7 +100467,7 @@
     "desc": "",
     "id": "7017",
     "name": "Eastbound Bridgeport Rd @ No. 5 Rd",
-    "wheelchair_boarding": "2",
+    "wheelchair_boarding": "1",
     "zone": "BUS ZN"
    },
    "type": "Feature"
@@ -101764,25 +101745,6 @@
    },
    "type": "Feature"
   },
-  {
-   "geometry": {
-    "coordinates": [
-     -122.660798,
-     49.105736
-    ],
-    "type": "Point"
-   },
-   "id": "7097",
-   "properties": {
-    "code": "57029",
-    "desc": "",
-    "id": "7097",
-    "name": "Westbound Fraser Hwy @ 203 St",
-    "wheelchair_boarding": "1",
-    "zone": "BUS ZN"
-   },
-   "type": "Feature"
-  },
   {
    "geometry": {
     "coordinates": [
@@ -138339,25 +138301,6 @@
    },
    "type": "Feature"
   },
-  {
-   "geometry": {
-    "coordinates": [
-     -122.720802,
-     49.118811
-    ],
-    "type": "Point"
-   },
-   "id": "10729",
-   "properties": {
-    "code": "60795",
-    "desc": "",
-    "id": "10729",
-    "name": "Westbound 64 Ave @ 181A St",
-    "wheelchair_boarding": "1",
-    "zone": "BUS ZN"
-   },
-   "type": "Feature"
-  },
   {
    "geometry": {
     "coordinates": [
@@ -151338,17 +151281,17 @@
   {
    "geometry": {
     "coordinates": [
-     -123.248129,
-     49.26581
+     -123.248724,
+     49.265726
     ],
     "type": "Point"
    },
-   "id": "11793",
+   "id": "11792",
    "properties": {
-    "code": "61701",
+    "code": "58895",
     "desc": "",
-    "id": "11793",
-    "name": "UBC Exchange @ Bay 10",
+    "id": "11792",
+    "name": "UBC Exchange @ Bay 9",
     "wheelchair_boarding": "1",
     "zone": "BUS ZN"
    },
@@ -151357,17 +151300,17 @@
   {
    "geometry": {
     "coordinates": [
-     -123.247364,
-     49.265923
+     -123.248129,
+     49.26581
     ],
     "type": "Point"
    },
-   "id": "11794",
+   "id": "11793",
    "properties": {
-    "code": "61702",
+    "code": "61701",
     "desc": "",
-    "id": "11794",
-    "name": "UBC Exchange @ Bay 11",
+    "id": "11793",
+    "name": "UBC Exchange @ Bay 10",
     "wheelchair_boarding": "1",
     "zone": "BUS ZN"
    },
@@ -161779,7 +161722,7 @@
     "code": "50137",
     "desc": "",
     "id": "12585",
-    "name": "Eastbound W 41 Ave @ Cambie St",
+    "name": "Oakridge-41st Ave Station @ Bay 2",
     "wheelchair_boarding": "1",
     "zone": "BUS ZN"
    },
@@ -161798,7 +161741,7 @@
     "code": "60349",
     "desc": "",
     "id": "12586",
-    "name": "Eastbound W 41 Ave @ Cambie St",
+    "name": "Oakridge-41st Ave Station @ Bay 3",
     "wheelchair_boarding": "1",
     "zone": "BUS ZN"
    },