--- a/include/couchdb.inc.php
+++ b/include/couchdb.inc.php
@@ -7,11 +7,23 @@
     $obj = new stdClass();
     $obj->_id = "_design/" . urlencode("app");
     $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->byName->map = "function(doc) {   emit(doc.name, doc);
+        $obj->views->byCanonicalName->map = "function(doc) {  
+            if (doc.parentOrg || 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) {
 if (doc.otherNames[name] != '' && doc.otherNames[name] != doc.name) {
-       	 emit(doc.otherNames[name], doc); 
+       	 emit(doc.otherNames[name], doc._id); 
 }
         }
 };";
@@ -20,6 +32,11 @@
     $obj->views->getSuspended->map = 'function(doc) { if (doc.status == "suspended") {  emit(doc._id, doc); } };';
     $obj->views->getScrapeRequired->map = "function(doc) {   emit(doc.abn, doc); };";
     $obj->views->showNamesABNs->map = "function(doc) {   emit(doc._id, {name: doc.name, abn: doc.abn}); };";
+    $obj->views->getConflicts->map = "function(doc) {
+  if (doc._conflicts) {
+    emit(null, [doc._rev].concat(doc._conflicts));
+  }
+}";
     // http://stackoverflow.com/questions/646628/javascript-startswith
     $obj->views->score->map = 'if(!String.prototype.startsWith){
     String.prototype.startsWith = function (str) {
@@ -45,8 +62,16 @@
 
 require ('couchdb/settee/src/settee.php');
 
+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.8:5984');
-
+} else {
+    $server = new SetteeServer('http://127.0.0.1:5984');
+}
 function setteErrorHandler($e) {
     echo $e->getMessage() . "<br>" . PHP_EOL;
 }