--- a/displayAgency.php
+++ b/displayAgency.php
@@ -6,12 +6,6 @@
     $agency = htmlentities(strip_tags($_REQUEST['agency']));
     include_header($agency);
     echo '<center><h1>' . $agency . '</h1></center>';
-    $query = 'SELECT category, min("categoryUNSPSC")  AS "categoryUNSPSC", count(*) AS count, sum(value) AS value  FROM contractnotice 
-  WHERE "agencyName" LIKE :agency AND ' . " " . $standardQ . ' ' . $yearQ . ' GROUP BY category ORDER BY count(*) DESC LIMIT 10';
-    $query = $conn->prepare($query);
-    $query->bindParam(":agency", $agency);
-    $query->execute();
-    databaseError($conn->errorInfo());
 
     $query = '
     SELECT 
@@ -24,14 +18,24 @@
 sum(("procurementMethod" = \'Direct\' OR "procurementMethod" = \'Limited tender\')::int) AS limited,
 COUNT(*) AS total
 FROM contractnotice 
-WHERE "supplierABN" = \'51194660183\'
-    ';
+ WHERE "agencyName" LIKE :agency AND ' . " $yearQ $standardQ "   ;
+    $query = $conn->prepare($query);
+    $query->bindParam(":agency", $agency);
+    $query->execute();
+    databaseError($conn->errorInfo());
+
+    $stats = reset($query->fetchAll());
+    show_stats($stats);
     /*
-    * Procurement method in text, seperate Open via SON from Open
-    * Consultancies, Confidentialities percentage
+
       Compliance statistics: amendments, delay in reporting average and number completely late */
 
-
+    $query = 'SELECT category, min("categoryUNSPSC")  AS "categoryUNSPSC", count(*) AS count, sum(value) AS value  FROM contractnotice 
+  WHERE "agencyName" LIKE :agency AND ' . " $yearQ $standardQ " . ' GROUP BY category ORDER BY count(*) DESC LIMIT 10';
+    $query = $conn->prepare($query);
+    $query->bindParam(":agency", $agency);
+    $query->execute();
+    databaseError($conn->errorInfo());
     echo "<h3>Categories</h3><table>  <thead>
     <tr>
       <th>Category</th>
@@ -52,7 +56,7 @@
     echo "</table><br/>";
 
     $query = 'SELECT contractnotice."SONID", min(title) AS title, count(*), sum(value) AS value FROM contractnotice INNER JOIN standingoffers ON contractnotice."SONID" = standingoffers."SONID" 
-WHERE "agencyName" LIKE :agency AND ' . " " . $standardQ . ' ' . $yearQ . 'AND contractnotice."SONID" != \'\' GROUP BY contractnotice."SONID"';
+WHERE "agencyName" LIKE :agency AND ' . " $yearQ $standardQ " . 'AND contractnotice."SONID" != \'\' GROUP BY contractnotice."SONID"';
     $query = $conn->prepare($query);
     $query->bindParam(":agency", $agency);
     $query->execute();