--- 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>";
             }
@@ -128,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>";
     }
@@ -178,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();
 ?>
+