--- a/getAgency.php
+++ b/getAgency.php
@@ -4,16 +4,36 @@
 include_header();
 
 function displayValue($key, $value, $mode) {
+    global $db, $schemas;
     if ($mode == "view") {
+
+        echo "<tr>";
+
+        echo "<td>" . $schemas['agency']["properties"][$key]['x-title'] . "<br><small>" . $schemas['agency']["properties"][$key]['description'] . "</small></td><td>";
         if (is_array($value)) {
-            echo "<tr><td>$key</td><td><ol>";
+            echo "<ol>";
             foreach ($value as $subkey => $subvalue) {
-                echo "<li>$subvalue</li>";
+                if (isset($schemas['agency']["properties"][$key]['x-itemprop'])) {
+                echo '<li itemprop="' . $schemas['agency']["properties"][$key]['x-itemprop'] . '">';
+            } else {
+                echo "<li>";
+            }
+                echo "$subvalue</li>";
             }
             echo "</ol></td></tr>";
         } else {
-            echo "<tr><td>$key</td><td>$value</td></tr>";
+            if (isset($schemas['agency']["properties"][$key]['x-itemprop'])) {
+                echo '<span itemprop="' . $schemas['agency']["properties"][$key]['x-itemprop'] . '">';
+            } else {
+                echo "<span>";
+            }
+              if ((strpos($key, "URL") > 0 || $key == 'website') && $value != "") {
+                    echo "<a href='$value'>view</a></span>";
+                } else {
+            echo "$value</span>";
+                }
         }
+        echo "</td></tr>";
     }
     if ($mode == "edit") {
         if (is_array($value)) {
@@ -30,15 +50,21 @@
         } else {
             if (strpos($key, "_") === 0) {
                 echo"<input type='hidden' id='$key' name='$key' value='$value'/>";
-            } if (strpos($key, "has") === 0) {
-                echo "<label for='$key'><input type='checkbox' id='$key' name='$key' checked='$value'> $key</label>";
-            } else {
+            } else if ($key == "parentOrg") {
+                echo "<label for='$key'>$key</label><select  id='$key' name='$key'><option value=''> Select... </option>";
+                $rows = $db->get_view("app", "byDeptStateName")->rows;
+                //print_r($rows);
+                foreach ($rows as $row) {
+                    echo "<option value='{$row->value}'" . (($row->value == $value) ? "SELECTED" : "") . " >" . str_replace("Department of ", "", $row->key) . "</option>";
+                }
+                echo" </select>";
+              } else {
                 echo "<label>$key</label><input  class='input-text' type='text' id='$key' name='$key' value='$value'/>";
-                if ((strpos($key,"URL") > 0 || $key == 'website')&& $value != "") {
-                   echo "<a href='$value'>view</a>"; 
+                if ((strpos($key, "URL") > 0 || $key == 'website') && $value != "") {
+                    echo "<a href='$value'>view</a>";
                 }
                 if ($key == 'abn') {
-                   echo "<a href='http://www.abr.business.gov.au/SearchByAbn.aspx?SearchText=$value'>view abn</a>";
+                    echo "<a href='http://www.abr.business.gov.au/SearchByAbn.aspx?SearchText=$value'>view abn</a>";
                 }
             }
         }
@@ -47,10 +73,20 @@
 }
 
 function addDefaultFields($row) {
-    $defaultFields = Array("name","orgType","parentOrg");
+    global $schemas;
+    $defaultFields = array_keys($schemas['agency']['properties']);
     foreach ($defaultFields as $defaultField) {
-        if (!isset($row[$defaultField]))
-            $row[$defaultField] = "";
+        if (!isset($row[$defaultField])) {
+            if ($schemas['agency']['properties'][$defaultField]['type'] == "string") {
+               
+                    $row[$defaultField] = "";
+            
+            }
+            if ($schemas['agency']['properties'][$defaultField]['type'] == "array") {
+
+                $row[$defaultField] = Array("");
+            }
+        }
     }
     return $row;
 }
@@ -66,20 +102,33 @@
     //print_r($row);
     if (sizeof($_POST) > 0) {
         //print_r($_POST);
+        foreach ($_POST as $postkey => $postvalue) {
+            if ($postvalue == "") {
+                unset($_POST[$postkey]);
+            }
+            if (is_array($postvalue) && count($postvalue) == 1 && $postvalue[0] == "") {
+                unset($_POST[$postkey]);
+            }
+        }
         if (isset($_POST['_id']) && $db->get_rev($_POST['_id']) == $_POST['_rev']) {
             echo "Edited version was latest version, continue saving";
             $newdoc = $_POST;
             $newdoc['metadata']['lastModified'] = time();
             $row = $db->save($newdoc);
         } else {
-            echo "ALERT doc revised by someone else while editing.";
+            echo "ALERT doc revised by someone else while editing. Document not saved.";
         }
     }
 
     $mode = "edit";
-    $row = addDefaultFields(object_to_array($row));
+    if ($mode == "edit") {
+        $row = addDefaultFields(object_to_array($row));
+    } else {
+         $row = object_to_array($row);
+    }
+    
     if ($mode == "view") {
-        echo '<table width="100%">';
+        echo '<div itemscope itemtype ="http://schema.org/GovernmentOrganisation"><table width="100%">';
         echo '<tr> <td colspan="2"><h3>' . $row['name'] . "</h3></td></tr>";
         echo "<tr><th>Field Name</th><th>Field Value</th></tr>";
     }
@@ -104,40 +153,40 @@
             };
         </script>
         <form id="editform" class="nice" method="post">
-            <?php
+        <?php
 
+    }
+    foreach ($row as $key => $value) {
+        echo displayValue($key, $value, $mode);
+    }
+    if ($mode == "view") {
+        echo "</table></div>";
+    }
+    if ($mode == "edit") {
+        echo '<input id="submitbutton" type="submit"/></form>';
+    }
+} else {
+
+    try {
+        /* $rows = $db->get_view("app", "showNamesABNs")->rows;
+          //print_r($rows);
+          foreach ($rows as $row) {
+          //   print_r($row);
+          echo '<li><a href="getAgency.php?id=' . $row->key . '">' .
+          (isset($row->value->name) && $row->value->name != "" ? $row->value->name : "NO NAME " . $row->value->abn)
+          . '</a></li>';
+          } */
+        $rows = $db->get_view("app", "byName")->rows;
+        //print_r($rows);
+        foreach ($rows as $row) {
+            //   print_r($row);
+            echo '<li itemscope itemtype="http://schema.org/GovernmentOrganization"><a href="getAgency.php?id=' . $row->value . '" itemprop="url"><span itemprop="name">' .
+            $row->key
+            . '</span></a></li>';
         }
-        foreach ($row as $key => $value) {
-            echo displayValue($key, $value, $mode);
-        }
-        if ($mode == "view") {
-            echo "</table>";
-        }
-        if ($mode == "edit") {
-            echo '<input id="submitbutton" type="submit"/></form>';
-        }
-    } else {
-
-        try {
-            /*$rows = $db->get_view("app", "showNamesABNs")->rows;
-            //print_r($rows);
-            foreach ($rows as $row) {
-                //   print_r($row);
-                echo '<li><a href="getAgency.php?id=' . $row->key . '">' .
-                (isset($row->value->name) && $row->value->name != "" ? $row->value->name : "NO NAME " . $row->value->abn)
-                . '</a></li>';
-            }*/
-            $rows = $db->get_view("app", "byName")->rows;
-            //print_r($rows);
-            foreach ($rows as $row) {
-                //   print_r($row);
-                echo '<li><a href="getAgency.php?id=' . $row->value . '">' .
-                $row->key
-                . '</a></li>';
-            }
-        } catch (SetteeRestClientException $e) {
-            setteErrorHandler($e);
-        }
+    } catch (SetteeRestClientException $e) {
+        setteErrorHandler($e);
     }
-    include_footer();
-    ?>
+}
+include_footer();
+?>