--- a/displaySupplier.php
+++ b/displaySupplier.php
@@ -4,8 +4,11 @@
 if ($_REQUEST['supplier']) {
     $supplierS = htmlentities(strip_tags($_REQUEST['supplier']));
     $title = $supplierName;
-    if ($supplierABN) {
-        $query = 'SELECT text_mode("supplierName") AS "supplierName" FROM contractnotice WHERE "supplierABN" = :supplierABN GROUP BY "supplierABN"';
+    if (isset($supplierABN)) {
+        $query = 'SELECT text_mode("supplierName") AS "supplierName" 
+FROM contractnotice 
+WHERE "supplierABN" = :supplierABN 
+GROUP BY "supplierABN"';
         $query = $conn->prepare($query);
         $query->bindParam(":supplierABN", $supplierABN);
         $query->execute();
@@ -14,7 +17,7 @@
     }
     include_header(str_replace("%", "", $title));
     echo '<center><h1>' . str_replace("%", "", $title) . '</h1></center>';
-if ($supplierABN) {
+if (isset($supplierABN)) {
     $query = 'SELECT distinct on (lower("supplierName")) "supplierName" from contractnotice where "supplierABN" = :supplierABN';
     $query = $conn->prepare($query);
     $query->bindParam(":supplierABN", $supplierABN);
@@ -32,11 +35,12 @@
 sum((("procurementMethod" = \'Open\' OR "procurementMethod" = \'Open tender\') AND "SONID" IS NOT null)::int) AS "openSON",
 sum(("procurementMethod" = \'Prequalified tender\' OR "procurementMethod" = \'Select\')::INT) AS prequalified,
 sum(("procurementMethod" = \'Direct\' OR "procurementMethod" = \'Limited tender\')::int) AS limited,
+sum("value") as total_value,
 COUNT(*) AS total
 FROM contractnotice 
-WHERE' . $supplierQ . " " . $standardQ ;
-    $query = $conn->prepare($query);
-    if ($supplierParts[0] > 0) {
+WHERE' . $supplierQ . " " . $yearQ . " " .$standardQ  ;
+    $query = $conn->prepare($query);
+    if (isset($supplierABN)) {
         $query->bindParam(":supplierABN", $supplierABN);
     } else {
         $query->bindParam(":supplierName", $supplierName);
@@ -48,9 +52,9 @@
     show_stats($stats);
 
     $query = 'SELECT category, min("categoryUNSPSC") AS "categoryUNSPSC", count(*) AS count, sum(value) AS value FROM contractnotice 
-  WHERE ' . $supplierQ . " " . $standardQ . ' GROUP BY category ORDER BY count(*) DESC LIMIT 10';
-    $query = $conn->prepare($query);
-    if ($supplierParts[0] > 0) {
+  WHERE ' . $supplierQ . " $yearQ $standardQ ". ' GROUP BY category ORDER BY count(*) DESC LIMIT 10';
+    $query = $conn->prepare($query);
+    if (isset($supplierABN)) {
         $query->bindParam(":supplierABN", $supplierABN);
     } else {
         $query->bindParam(":supplierName", $supplierName);
@@ -79,17 +83,18 @@
     echo "</table><br/>";
 
 
-    $query = 'SELECT SUM("value") AS "value", count(*), MAX(contractnotice."agencyName") AS agencyname FROM contractnotice JOIN agency_nametoabn ON contractnotice."agencyName"=agency_nametoabn."agencyName"  
+    /*$query = 'SELECT SUM("value") AS "value", count(*), text_mode(contractnotice."agencyName") AS agencyname FROM contractnotice JOIN agency_nametoabn ON contractnotice."agencyName"=agency_nametoabn."agencyName"
 WHERE ' . $yearQ . ' ' . $supplierQ . ' "childCN" IS NULL 
-GROUP BY abn ORDER BY SUM("value") DESC';
-    $query = $conn->prepare($query);
-    if (count($supplierParts) > 0) {
-        if ($supplierParts[0] > 0) {
+GROUP BY abn ORDER BY SUM("value") DESC';*/
+    $query = 'SELECT SUM("value") AS "value", count(*), "agencyName" AS agencyname FROM contractnotice 
+WHERE ' . $yearQ . ' ' . $supplierQ . ' "childCN" IS NULL GROUP BY "agencyName" ORDER BY SUM("value") DESC';
+
+    $query = $conn->prepare($query);
+        if (isset($supplierABN)) {
             $query->bindParam(":supplierABN", $supplierABN);
         } else {
             $query->bindParam(":supplierName", $supplierName);
         }
-    }
     $query->execute();
     databaseError($conn->errorInfo());
 
@@ -118,7 +123,7 @@
     $query = $conn->prepare($query);
 
 
-    if ($supplierParts[0] > 0) {
+    if (isset($supplierABN)) {
         $query->bindParam(":supplierABN", $supplierABN);
     } else {
         $query->bindParam(":supplierName", $supplierName);
@@ -163,7 +168,7 @@
     $query = $conn->prepare($query);
 
 
-    if ($supplierParts[0] > 0) {
+    if (isset($supplierABN)) {
         $query->bindParam(":supplierABN", $supplierABN);
     } else {
         $query->bindParam(":supplierName", $supplierName);