--- a/displaySupplier.php
+++ b/displaySupplier.php
@@ -1,57 +1,122 @@
 <?php
 
-include_once ("./lib/common.inc.php");
+include_once("./lib/common.inc.php");
 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"';
-$query = $conn->prepare($query);
-$query->bindParam(":supplierABN", $supplierABN);
+    $title = $supplierName;
+    if ($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();
-                databaseError($conn->errorInfo());
+        databaseError($conn->errorInfo());
         $title = reset($query->fetchAll())['supplierName'];
-}
-    include_header(str_replace("%","",$title));
-echo '<center><h1>'.str_replace("%","",$title).'</h1></center>';
-    agenciesGraph();
-   /*
-    * Make supplier name the most common name for this ABN
-    * Common names and uncommon names
-    * Common categories and uncommon categories
-    * Procurement method in text, seperate Open via SON from Open
-    * Consultancies, Confidentialities percentage
-    */
-$query = 'select contractnotice."SONID", min(title) as title, count(*), sum(value) as value from contractnotice inner join standingoffers on contractnotice."SONID" = standingoffers."SONID" WHERE ' .$yearQ . ' ' .
-            $supplierQ . ' ' . $standardQ
-            . ' and contractnotice."SONID" != \'\' group by contractnotice."SONID"';
-$query = $conn->prepare($query);
+    }
+    include_header(str_replace("%", "", $title));
+    echo '<center><h1>' . str_replace("%", "", $title) . '</h1></center>';
+    /*
+     * Common names and uncommon names
+     * Procurement method in text, seperate Open via SON from Open
+     * Consultancies, Confidentialities percentage
+     */
+    $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) {
+        $query->bindParam(":supplierABN", $supplierABN);
+    } else {
+        $query->bindParam(":supplierName", $supplierName);
+    }
+    $query->execute();
+    databaseError($conn->errorInfo());
 
 
-  if ($supplierParts[0] > 0) {
-    $query->bindParam(":supplierABN", $supplierABN);
-  } else {
-      $query->bindParam(":supplierName", $supplierName);
-  }
+    echo "<h3>Categories</h3><table>  <thead>
+    <tr>
+      <th>Category</th>
+      <th>Contracts Count</th>
+      <th>Total Contract Value</th>
+    </tr>
+  </thead>";
+    foreach ($query->fetchAll() as $row) {
+        setlocale(LC_MONETARY, 'en_US');
+        $value = number_format(doubleval($row['value']), 2);
+        $category = urlencode($row['category']);
+        echo("<tr>
+    <td><B><a href='displayCategory.php?category=$category'>{$row['category']}</a></b></td>
+    <td>{$row['count']}</td>
+    <td>\$$value</td>
+    </tr>");
+    }
+    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"  
+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) {
+            $query->bindParam(":supplierABN", $supplierABN);
+        } else {
+            $query->bindParam(":supplierName", $supplierName);
+        }
+    }
     $query->execute();
     databaseError($conn->errorInfo());
-echo "<h3>Standing Offers/Panels</h3><table>  <thead>
+
+    echo "<h3>Agencies</h3><table>  <thead>
+    <tr>
+      <th>Agency</th>
+      <th>Contracts Count</th>
+      <th>Total Contract Value</th>
+    </tr>
+  </thead>";
+    foreach ($query->fetchAll() as $row) {
+        setlocale(LC_MONETARY, 'en_US');
+        $value = number_format(doubleval($row['value']), 2);
+        $agency =urlencode($row['agencyname']);
+        echo("<tr>
+    <td><B><a href=\"displayAgency.php?agency=$agency\">{$row['agencyname']}</a></b></td>
+    <td>{$row['count']}</td>
+    <td>\$$value</td>
+    </tr>");
+    }
+    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 ' . $yearQ . ' ' .
+        $supplierQ . ' ' . $standardQ
+        . ' AND contractnotice."SONID" != \'\' GROUP BY contractnotice."SONID"';
+    $query = $conn->prepare($query);
+
+
+    if ($supplierParts[0] > 0) {
+        $query->bindParam(":supplierABN", $supplierABN);
+    } else {
+        $query->bindParam(":supplierName", $supplierName);
+    }
+    $query->execute();
+    databaseError($conn->errorInfo());
+$sonrows = "";
+    foreach ($query->fetchAll() as $row) {
+        setlocale(LC_MONETARY, 'en_US');
+        $value = number_format(doubleval($row['value']), 2);
+        $sonrows .= "<tr>
+    <td><B><a href=\"displaySON.php?SONID={$row['SONID']}\">{$row['title']}</a></b></td>
+    <td>{$row['count']}</td>
+    <td>\$$value</td>
+    </tr>";
+    }
+    if (strlen($sonrows) > 1) {
+        echo "<h3>Standing Offers/Panels</h3><table>  <thead>
     <tr>
       <th>Standing Offer</th>
       <th>Contracts Count</th>
       <th>Total Contract Value</th>
     </tr>
-  </thead>";
-    foreach ($query->fetchAll() as $row) {
-     setlocale(LC_MONETARY, 'en_US');
-        $value = number_format(doubleval($row['value']), 2);
-        echo ("<tr>
-    <td><B><a href=\"displaySON.php?SONID={$row['SONID']}\">{$row['title']}</a></b></td>
-    <td>{$row['count']}</td>
-    <td>\$$value</td>
-    </tr>");
+  </thead>$sonrows</table><br/>";
     }
-    echo "</table><table><h3>Contracts</h3>  <thead>
+    echo "<table><h3>Contracts</h3>  <thead>
     <tr>
       <th>Contract Notice Number</th>
       <th>Contract Description</th>
@@ -63,24 +128,24 @@
   </thead>";
     $query = 'SELECT "CNID", "description", "value", "agencyName", "category",
     "contractStart", "supplierName"
-    FROM contractnotice WHERE ' .$yearQ . ' ' .
-            $supplierQ . ' ' . $standardQ
-            . ' ORDER BY value DESC';
-    
+    FROM contractnotice WHERE ' . $yearQ . ' ' .
+        $supplierQ . ' ' . $standardQ
+        . ' ORDER BY VALUE DESC';
+
     $query = $conn->prepare($query);
 
 
-  if ($supplierParts[0] > 0) {
-    $query->bindParam(":supplierABN", $supplierABN);
-  } else {
-      $query->bindParam(":supplierName", $supplierName);
-  }
+    if ($supplierParts[0] > 0) {
+        $query->bindParam(":supplierABN", $supplierABN);
+    } else {
+        $query->bindParam(":supplierName", $supplierName);
+    }
     $query->execute();
     databaseError($conn->errorInfo());
     foreach ($query->fetchAll() as $row) {
         setlocale(LC_MONETARY, 'en_US');
         $value = number_format(doubleval($row['value']), 2);
-        echo ("<tr>
+        echo("<tr>
     <td><a href=\"displayContract.php?CNID={$row['CNID']}\">{$row['CNID']}</a></td>
     <td><b>{$row['description']}</b></a></td>
     <td>\$$value</td><td>{$row['agencyName']}</td>
@@ -95,16 +160,16 @@
      */
     include_header("Suppliers");
     suppliersGraph();
-    $query = 'SELECT SUM("value") as val, text_mode("supplierName") as supplierName, "supplierABN",(
- case when "supplierABN" != 0 THEN lower("supplierABN"::text) ELSE lower("supplierName") END) as supplierID 
+    $query = 'SELECT SUM("value") AS val, text_mode("supplierName") AS supplierName, "supplierABN",(
+ CASE WHEN "supplierABN" != 0 THEN lower("supplierABN"::TEXT) ELSE lower("supplierName") END) AS supplierID 
 FROM contractnotice
-WHERE ' .$yearQ . ' "childCN" is null
+WHERE ' . $yearQ . ' "childCN" IS NULL
 GROUP BY supplierID,"supplierABN"
 ORDER BY val DESC
 LIMIT 100';
     $query = $conn->prepare($query);
     $query->execute();
-        databaseError($conn->errorInfo());
+    databaseError($conn->errorInfo());
     echo "<table>  <thead>
     <tr>
        <th>Position</th>
@@ -117,7 +182,7 @@
         setlocale(LC_MONETARY, 'en_US');
         $value = number_format(doubleval($row['val']), 2);
         $supplier = stripslashes($row['supplierABN'] . '-' . $row['suppliername']);
-        echo ("<tr><td>$i</td><td><b><a href=\"displaySupplier.php?supplier={$supplier}\">" . ucsmart($row['suppliername']) . "</a></b></td><td>\$$value</td></tr>\n");
+        echo("<tr><td>$i</td><td><b><a href=\"displaySupplier.php?supplier={$supplier}\">" . ucsmart($row['suppliername']) . "</a></b></td><td>\$$value</td></tr>\n");
         $i++;
     }
     echo "</table>";