diff --git a/api/src/services/trip_tracking.rs b/api/src/services/trip_tracking.rs
index 25e0d13..3bd445e 100644
--- a/api/src/services/trip_tracking.rs
+++ b/api/src/services/trip_tracking.rs
@@ -95,7 +95,13 @@ impl TripTrackingService {
                     TripTracking::Tracked(
                         LiveTrip { 
                             delay: live_track.delay, 
-                            next_stop_id: live_track.next_stop_id, 
+                            next_stop_id: match live_track.next_stop_id {
+                                Some(x) => match x.parse() {
+                                    Ok(y) => Some(y),
+                                    Err(_) => None
+                                },
+                                None => None
+                            }, 
                             timestamp: live_track.timestamp,
                             vehicle_id: live_track.vehicle_id 
                         }
diff --git a/api/templates/route.html b/api/templates/route.html
index f3a1574..1e0fd0f 100644
--- a/api/templates/route.html
+++ b/api/templates/route.html
@@ -148,7 +148,11 @@ document.addEventListener("DOMContentLoaded", () => {
                 {% let live_o = timetable.tracking_data[loop.index0] %}
                 {% if let Tracked(live) = live_o %}
                     {% let time =  (t + (live.delay * 60.0) as i64) %}
+                    {% if live.next_stop_id == Some(*row.stop_id) %}
+                    <td style="background-color: #00bb00">
+                    {% else %}
                     <td style="background-color: #003300">
+                    {% endif %}
                         <span style="color: #22bb22"> {{ time | format_time }} </span>
                     </td>
                 {% elif let TripTracking::Cancelled = live_o %}
diff --git a/libseptastic/src/stop_schedule.rs b/libseptastic/src/stop_schedule.rs
index 4d367c9..c0ae696 100644
--- a/libseptastic/src/stop_schedule.rs
+++ b/libseptastic/src/stop_schedule.rs
@@ -31,7 +31,7 @@ pub enum TripTracking {
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct LiveTrip {
     pub delay: f64,
-    pub next_stop_id: Option<String>,
+    pub next_stop_id: Option<i64>,
     pub timestamp: i64,
     pub vehicle_id: Option<String>
 }