--- a/include/couchdb.inc.php
+++ b/include/couchdb.inc.php
@@ -7,11 +7,13 @@
     $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->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 +22,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) {