diff --git a/components/account/main.php b/components/account/main.php
index 5caa7e8..223cdef 100644
--- a/components/account/main.php
+++ b/components/account/main.php
@@ -71,10 +71,21 @@ $userDetails = getUserDetails($_SESSION['user_id']);
             <button type="submit" class="btn btn-primary">Save Changes</button>
     </form>
 </div>
+
+
 <?php
-$query = $conn->prepare("SELECT logs.ip, logs.date, users.email FROM logs JOIN users ON logs.userId = users.id");
-$query->execute();
-$logDetails = $query->fetchAll(PDO::FETCH_ASSOC);
+function getUserLogs($userId) {
+    global $conn;
+    try {
+        $query = $conn->prepare("SELECT logs.ip, logs.date, users.email FROM logs JOIN users ON logs.userId = users.id WHERE logs.userId = ?");
+        $query->execute([$userId]);
+        return $query->fetchAll(PDO::FETCH_ASSOC);
+    } catch(PDOException $e) {
+        return [];
+    }
+}
+
+$logDetails = getUserLogs($_SESSION['user_id']);
 ?>
 <table class="table mt-4">
     <thead>
diff --git a/components/homepage/stop.php b/components/homepage/stop.php
index eb86043..750d65b 100644
--- a/components/homepage/stop.php
+++ b/components/homepage/stop.php
@@ -13,18 +13,22 @@ $directions = [];
 if (isset($data['Siri']['ServiceDelivery']['StopMonitoringDelivery'][0]['MonitoredStopVisit'])) {
     foreach ($data['Siri']['ServiceDelivery']['StopMonitoringDelivery'][0]['MonitoredStopVisit'] as $visit) {
         $vehicleJourney = $visit['MonitoredVehicleJourney'];
-        if (isset($vehicleJourney['MonitoredCall']['ExpectedArrivalTime'])) {
-            $direction = $vehicleJourney['DirectionName'][0]['value'];
-            $expectedArrival = $vehicleJourney['MonitoredCall']['ExpectedArrivalTime'];
-            $expectedDeparture = $vehicleJourney['MonitoredCall']['ExpectedDepartureTime'];
-            
-            $departureTime = date('H:i', strtotime($expectedArrival . ' +2 hours'));
+        if (strpos($vehicleJourney['OperatorRef']['value'], '.' . $lineId . '.' . $lineId . ':')) {
+            if (isset($vehicleJourney['MonitoredCall']['ExpectedDepartureTime'])) {
+                $direction = $vehicleJourney['DestinationName'][0]['value'];
+                $expectedDeparture = $vehicleJourney['MonitoredCall']['ExpectedDepartureTime'];
+                
+                $departureTime = date('H:i', strtotime($expectedDeparture . ' +2 hours'));
+                $currentTime = date('H:i', strtotime('now' . ' +2 hours'));
 
-            if (!isset($directions[$direction])) {
-                $directions[$direction] = [];
-            }
-            if (count($directions[$direction]) < 2) {
-                $directions[$direction][] = $departureTime;
+                if ($departureTime > $currentTime) {
+                    if (!isset($directions[$direction])) {
+                        $directions[$direction] = [];
+                    }
+                    if (count($directions[$direction]) < 2) {
+                        $directions[$direction][] = $departureTime;
+                    }
+                }
             }
         }
     }