--- a/include/db/stop-dao.inc.php
+++ b/include/db/stop-dao.inc.php
@@ -101,10 +101,10 @@
 
 function getStopsBySuburb($suburb) {
     global $conn;
-    $query = "Select * from stops where zone_id LIKE :suburb order by stop_name;";
-    debug($query, "database");
-    $query = $conn->prepare($query);
-    $suburb = "%" . $suburb . ";%";
+    $query = "Select * from stops where stop_desc LIKE :suburb order by stop_name;";
+    debug($query, "database");
+    $query = $conn->prepare($query);
+    $suburb = "%<br>Suburb: %" . $suburb . "%";
     $query->bindParam(":suburb", $suburb);
     $query->execute();
     if (!$query) {
@@ -139,9 +139,9 @@
 }
 
 function getStopRoutes($stopID, $service_period) {
-    if ($service_period == "")
+    if ($service_period == "") {
         $service_period = service_period();
-    
+    }
     $service_ids = service_ids($service_period);
     $sidA = $service_ids[0];
     $sidB = $service_ids[1];
@@ -164,9 +164,11 @@
 }
 
 function getStopTrips($stopID, $service_period = "", $afterTime = "", $limit = "") {
-    if ($service_period == "")
+    if ($service_period == "") {
         $service_period = service_period();
+    }
         $service_ids = service_ids($service_period);
+
     $sidA = $service_ids[0];
     $sidB = $service_ids[1];
     if ($limit != "")