--- a/include/couchdb.inc.php
+++ b/include/couchdb.inc.php
@@ -3,6 +3,28 @@
 include $basePath . "schemas/schemas.inc.php";
 
 require ($basePath . 'couchdb/settee/src/settee.php');
+
+function createDocumentsDesignDoc() {
+    /*"views": {
+       "web_server": {
+           "map": "function(doc) {\n  emit(doc.web_server, 1);\n}",
+           "reduce": "function (key, values, rereduce) {\n    return sum(values);\n}"
+       },
+       "byAgency": {
+           "map": "function(doc) {\n  emit(doc.agencyID, 1);\n}",
+           "reduce": "function (key, values, rereduce) {\n    return sum(values);\n}"
+       },
+       "byURL": {
+           "map": "function(doc) {\n  emit(doc.url, doc);\n}"
+       },
+       "agency": {
+           "map": "function(doc) {\n  emit(doc.agencyID, doc);\n}"
+       },
+       "byWebServer": {
+           "map": "function(doc) {\n  emit(doc.web_server, doc);\n}"
+       }
+   }*/
+}
 
 function createAgencyDesignDoc() {
     global $db;
@@ -29,9 +51,17 @@
     $obj->views->byName->map = 'function(doc) { 
         if (typeof(doc["status"]) == "undefined" || doc["status"] != "suspended") {
         emit(doc.name, doc._id); 
+if (typeof(doc.shortName) != "undefined" && doc.shortName != doc.name) {
+       	 emit(doc.shortName, doc._id); 
+}
  for (name in doc.otherNames) {
 if (doc.otherNames[name] != "" && doc.otherNames[name] != doc.name) {
        	 emit(doc.otherNames[name], doc._id); 
+}
+        }
+ for (name in doc.foiBodies) {
+if (doc.foiBodies[name] != "" && doc.foiBodies[name] != doc.name) {
+       	 emit(doc.foiBodies[name], doc._id); 
 }
         }
         }
@@ -120,16 +150,16 @@
 }
 
 if (php_uname('n') == "vanille") {
-
-    $server = new SetteeServer('http://192.168.178.21:5984');
+$serverAddr = 'http://192.168.178.21:5984/';
+   
 } else
 if (php_uname('n') == "KYUUBEY") {
 
-    $server = new SetteeServer('http://192.168.1.148:5984');
+    $serverAddr = 'http://192.168.1.148:5984/';
 } else {
-    $server = new SetteeServer('http://127.0.0.1:5984');
+    $serverAddr = 'http://127.0.0.1:5984/';
 }
-
+ $server = new SetteeServer($serverAddr);
 function setteErrorHandler($e) {
     echo $e->getMessage() . "<br>" . PHP_EOL;
 }