--- a/getAgency.php
+++ b/getAgency.php
@@ -1,7 +1,7 @@
 <?php
 
 include_once('include/common.inc.php');
-include_header();
+
 
 function displayValue($key, $value, $mode) {
     global $db, $schemas;
@@ -86,9 +86,14 @@
         } else if ($schemas['agency']['properties'][$defaultField]['type'] == "array") {
             if (is_array($row[$defaultField])) {
                 $row[$defaultField][] = "";
+                $row[$defaultField][] = "";
+                $row[$defaultField][] = "";
             } else {
                 $value = $row[$defaultField];
                 $row[$defaultField] = Array($value);
+                $row[$defaultField][] = "";
+                $row[$defaultField][] = "";
+                
             }
         }
     }
@@ -102,7 +107,8 @@
 // by name = startkey="Ham"&endkey="Ham\ufff0"
 // edit?
 
-    $row = $db->get($_REQUEST['id']);
+    $obj = $db->get($_REQUEST['id']);
+    include_header($obj->name);
 //print_r($row);
     if (sizeof($_POST) > 0) {
 //print_r($_POST);
@@ -126,17 +132,19 @@
             echo "Edited version was latest version, continue saving";
             $newdoc = $_POST;
             $newdoc['metadata']['lastModified'] = time();
-            $row = $db->save($newdoc);
+            $obj = $db->save($newdoc);
         } else {
             echo "ALERT doc revised by someone else while editing. Document not saved.";
         }
     }
 
-    $mode = "edit";
+    $mode = "view";
+    $rowArray = object_to_array($obj);
+ksort($rowArray);
     if ($mode == "edit") {
-        $row = addDefaultFields(object_to_array($row));
+        $row = addDefaultFields($rowArray);
     } else {
-        $row = object_to_array($row);
+        $row = $rowArray;
     }
 
     if ($mode == "view") {
@@ -178,7 +186,8 @@
             echo '<input id="submitbutton" type="submit"/></form>';
         }
     } else {
-
+// show all list
+        include_header('Agencies');
         try {
             /* $rows = $db->get_view("app", "showNamesABNs")->rows;
               //print_r($rows);
@@ -188,14 +197,14 @@
               (isset($row->value->name) && $row->value->name != "" ? $row->value->name : "NO NAME " . $row->value->abn)
               . '</a></li>';
               } */
-            $rows = $db->get_view("app", "byName")->rows;
+            $rows = $db->get_view("app", "byCanonicalName")->rows;
             //print_r($rows);
             echo '<ul>';
             foreach ($rows as $row) {
                 //   print_r($row);
-                echo '<li typeof="schema:GovernmentOrganisation foaf:Organization" about="getAgency.php?id=' . $row->value . '">
-<a href="getAgency.php?id=' . $row->value . '" rel="schema:url foaf:page" property="schema:name foaf:name">' .
-                $row->key
+                echo '<li typeof="schema:GovernmentOrganisation foaf:Organization" about="getAgency.php?id=' . $row->value->_id . '">
+<a href="getAgency.php?id=' . $row->value->_id . '" rel="schema:url foaf:page" property="schema:name foaf:name">' .
+                $row->value->name
                 . '</a></li>';
             }
             echo "</ul>";