--- a/search_autosuggest.php
+++ b/search_autosuggest.php
@@ -6,7 +6,7 @@
 $aResults = array();
 $count = 0;
 if ($len) {
-  $query = "SELECT supplierName as info, supplierABN as id, supplierName as value, count(*) as count
+  $query = "SELECT supplierName, supplierABN, supplierName, count(*) as count
 FROM `contractnotice`
 WHERE supplierName LIKE '$input%'
 GROUP BY supplierName
@@ -17,12 +17,12 @@
   while ($row = mysql_fetch_array($result, MYSQL_BOTH)) {
     $count++;
     $aResults[] = array(
-      "id" => "supplier-".$row['id'],
-      "value" => htmlspecialchars($row['value']) ,
+      "id" => "supplier-".$row['supplierABN'].'-'.$row['supplierName'],
+      "value" => htmlspecialchars($row['supplierName']) ,
       "info" => htmlspecialchars("Supplier - ". $row['count']." records")
     );
   }
-  $query = "SELECT agencyName as info, agencyName as id, agencyName as value, count(*) as count
+  $query = "SELECT agencyName, count(*) as count
 FROM `contractnotice`
 WHERE agencyName LIKE '$input%'
 GROUP BY agencyName
@@ -32,8 +32,8 @@
   while ($row = mysql_fetch_array($result, MYSQL_BOTH)) {
     $count++;
     $aResults[] = array(
-      "id" => "agency-".$row['id'],
-      "value" => htmlspecialchars($row['value']) ,
+      "id" => "agency-".$row['agencyName'],
+      "value" => htmlspecialchars($row['agencyName']) ,
       "info" => htmlspecialchars("Government Agency - ". $row['count']." records")
     );
   }