--- a/getAgency.php
+++ b/getAgency.php
@@ -13,8 +13,8 @@
         if (is_array($value)) {
             echo "<ol>";
             foreach ($value as $subkey => $subvalue) {
-                if (isset($schemas['agency']["properties"][$key]['x-itemprop'])) {
-                echo '<li itemprop="' . $schemas['agency']["properties"][$key]['x-itemprop'] . '">';
+                if (isset($schemas['agency']["properties"][$key]['x-property'])) {
+                echo '<li property="' . $schemas['agency']["properties"][$key]['x-property'] . '">';
             } else {
                 echo "<li>";
             }
@@ -22,8 +22,8 @@
             }
             echo "</ol></td></tr>";
         } else {
-            if (isset($schemas['agency']["properties"][$key]['x-itemprop'])) {
-                echo '<span itemprop="' . $schemas['agency']["properties"][$key]['x-itemprop'] . '">';
+            if (isset($schemas['agency']["properties"][$key]['x-property'])) {
+                echo '<span property="' . $schemas['agency']["properties"][$key]['x-property'] . '">';
             } else {
                 echo "<span>";
             }
@@ -58,9 +58,7 @@
                     echo "<option value='{$row->value}'" . (($row->value == $value) ? "SELECTED" : "") . " >" . str_replace("Department of ", "", $row->key) . "</option>";
                 }
                 echo" </select>";
-            } else if (strpos($key, "has") === 0) {
-                echo "<label for='$key'><input type='checkbox' id='$key' name='$key' " . (($value == 'on' || $value == 'true') ? "checked='$value'" : "") . "> $key</label>";
-            } else {
+              } 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>";
@@ -80,11 +78,9 @@
     foreach ($defaultFields as $defaultField) {
         if (!isset($row[$defaultField])) {
             if ($schemas['agency']['properties'][$defaultField]['type'] == "string") {
-                if (strpos($defaultField, "has") === 0) {
-                    $row[$defaultField] = "false";
-                } else {
+               
                     $row[$defaultField] = "";
-                }
+            
             }
             if ($schemas['agency']['properties'][$defaultField]['type'] == "array") {
 
@@ -124,7 +120,7 @@
         }
     }
 
-    $mode = "view";
+    $mode = "edit";
     if ($mode == "edit") {
         $row = addDefaultFields(object_to_array($row));
     } else {
@@ -132,7 +128,7 @@
     }
     
     if ($mode == "view") {
-        echo '<div itemscope itemtype ="http://schema.org/GovernmentOrganisation"><table width="100%">';
+        echo '<div typeof="schema:GovernmentOrganisation" about="#' . $row['_id'] . '"><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>";
     }
@@ -182,15 +178,19 @@
           } */
         $rows = $db->get_view("app", "byName")->rows;
         //print_r($rows);
+echo '<ul>';
         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">' .
+            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
-            . '</span></a></li>';
+            . '</a></li>';
         }
+echo "</ul>";
     } catch (SetteeRestClientException $e) {
         setteErrorHandler($e);
     }
 }
 include_footer();
 ?>
+