diff --git a/src/database/level/main.js b/src/database/level/main.js
index bbde367fc9..97586c33b2 100644
--- a/src/database/level/main.js
+++ b/src/database/level/main.js
@@ -6,12 +6,12 @@ var nconf = require('nconf'),
 module.exports = function(db, module) {
 	var helpers = module.helpers.level;
 
-	module.searchIndex = function(key, content, id) {
+	module.searchIndex = function(key, content, id, callback) {
 		// o.O
 	};
 
 	module.search = function(key, term, limit, callback) {
-		// O.o	
+		// O.o
 	};
 
 	module.searchRemove = function(key, id, callback) {
@@ -22,7 +22,7 @@ module.exports = function(db, module) {
 		db.close(function() {
 			module.leveldown.destroy(nconf.get('level:database'), function() {
 				db.open(callback);
-			});	
+			});
 		});
 	};
 
diff --git a/src/database/mongo/main.js b/src/database/mongo/main.js
index d7c41e4cb9..144f80693b 100644
--- a/src/database/mongo/main.js
+++ b/src/database/mongo/main.js
@@ -5,18 +5,19 @@ var winston = require('winston');
 module.exports = function(db, module) {
 	var helpers = module.helpers.mongo;
 
-
-	module.searchIndex = function(key, content, id) {
+	module.searchIndex = function(key, content, id, callback) {
+		callback = callback || function() {};
 		var data = {
-			id:id,
-			key:key,
-			content:content
+			id: id,
+			key: key,
+			content: content
 		};
 
-		db.collection('search').update({id:id, key:key}, {$set:data}, {upsert:true, w: 1}, function(err, result) {
+		db.collection('search').update({id:id, key:key}, {$set:data}, {upsert:true, w: 1}, function(err) {
 			if(err) {
 				winston.error('Error indexing ' + err.message);
 			}
+			callback(err);
 		});
 	};
 
diff --git a/src/database/redis/main.js b/src/database/redis/main.js
index 47050e0343..1cf8d35f5c 100644
--- a/src/database/redis/main.js
+++ b/src/database/redis/main.js
@@ -1,11 +1,11 @@
 "use strict";
 
 module.exports = function(redisClient, module) {
-	module.searchIndex = function(key, content, id) {
+	module.searchIndex = function(key, content, id, callback) {
 		if (key === 'post') {
-			module.postSearch.index(content, id);
+			module.postSearch.index(content, id, callback);
 		} else if(key === 'topic') {
-			module.topicSearch.index(content, id);
+			module.topicSearch.index(content, id, callback);
 		}
 	};