--- a/include/couchdb.inc.php
+++ b/include/couchdb.inc.php
@@ -1,6 +1,8 @@
 <?php
 
-include "schemas/schemas.inc.php";
+include $basePath."schemas/schemas.inc.php";
+
+require ($basePath.'couchdb/settee/src/settee.php');
 
 function createAgencyDesignDoc() {
     global $db;
@@ -9,6 +11,21 @@
     $obj->language = "javascript";
     $obj->views->all->map = "function(doc) {   emit(doc._id, doc); };";
     $obj->views->byABN->map = "function(doc) {   emit(doc.abn, doc); };";
+        $obj->views->byCanonicalName->map = "function(doc) {  
+            if (doc.parentOrg || doc.orgType == 'FMA-DepartmentOfState') {
+        emit(doc.name, doc); 
+        }
+};";
+        $obj->views->byDeptStateName->map = "function(doc) {  
+            if (doc.orgType == 'FMA-DepartmentOfState') {
+        emit(doc.name, doc._id); 
+        }
+};";
+        $obj->views->parentOrgs->map = "function(doc) {
+            if (doc.parentOrg) {
+        emit(doc._id, doc.parentOrg);
+        }
+};";
     $obj->views->byName->map = "function(doc) {  
         emit(doc.name, doc._id); 
  for (name in doc.otherNames) {
@@ -17,6 +34,11 @@
 }
         }
 };";
+    
+   $obj->views->foiEmails->map = "function(doc) {  
+        emit(doc._id, doc.foiEmail);
+};";
+    
     $obj->views->byLastModified->map = "function(doc) {   emit(doc.metadata.lastModified, doc); }";
     $obj->views->getActive->map = 'function(doc) { if (doc.status == "active") {  emit(doc._id, doc); } };';
     $obj->views->getSuspended->map = 'function(doc) { if (doc.status == "suspended") {  emit(doc._id, doc); } };';
@@ -50,13 +72,19 @@
     return $db->save($obj, true);
 }
 
-require ('couchdb/settee/src/settee.php');
 
-$server = new SetteeServer('http://192.168.1.8:5984');
+if( php_uname('n') == "vanille") {
 
+$server = new SetteeServer('http://192.168.178.21:5984');
+} else 
+    if( php_uname('n') == "KYUUBEY") {
+
+$server = new SetteeServer('http://192.168.1.148:5984');
+} else {
+    $server = new SetteeServer('http://127.0.0.1:5984');
+}
 function setteErrorHandler($e) {
     echo $e->getMessage() . "<br>" . PHP_EOL;
 }
-
 ?>