diff --git a/_config.php b/_config.php
index 650da16..3a5121a 100644
--- a/_config.php
+++ b/_config.php
@@ -1,3 +1,4 @@
 <?php
 
-SearchUpdater::bind_manipulation_capture();
+global $databaseConfig;
+if (isset($databaseConfig['type'])) SearchUpdater::bind_manipulation_capture();
diff --git a/_config/binding.yml b/_config/binding.yml
new file mode 100644
index 0000000..5f1cfd2
--- /dev/null
+++ b/_config/binding.yml
@@ -0,0 +1,5 @@
+Injector:
+  RequestProcessor:
+    properties:
+      filters:
+        - '%$SearchUpdater_BindManipulationCaptureFilter'
diff --git a/code/search/SearchUpdater.php b/code/search/SearchUpdater.php
index d027a89..894c74e 100644
--- a/code/search/SearchUpdater.php
+++ b/code/search/SearchUpdater.php
@@ -46,12 +46,17 @@ class SearchUpdater extends Object {
 	static function bind_manipulation_capture() {
 		global $databaseConfig;
 
+		$connector = DB::getConn();
+		if (@$connector->isManipulationCapture) return; // If its already captured, just return
+
 		$type = $databaseConfig['type'];
 		$file = TEMP_FOLDER."/.cache.SMC.$type";
 
 		if (!is_file($file)) {
 			file_put_contents($file, "<?php
 				class SearchManipulateCapture_$type extends $type {
+					public \$isManipulationCapture = true;
+
 					function manipulate(\$manipulation) {
 						\$res = parent::manipulate(\$manipulation);
 						SearchUpdater::handle_manipulation(\$manipulation);
@@ -62,7 +67,10 @@ class SearchUpdater extends Object {
 		}
 
 		require_once($file);
-		$databaseConfig['type'] = 'SearchManipulateCapture_'.$type;
+		$dbClass = 'SearchManipulateCapture_'.$type;
+
+		$conn = new $dbClass($databaseConfig);
+		DB::setConn($conn);
 	}
 
 	static $dirty = array(); static $dirtycount = 0;
@@ -255,3 +263,13 @@ class SearchUpdater extends Object {
 		}
 	}
 }
+
+class SearchUpdater_BindManipulationCaptureFilter implements RequestFilter {
+	public function preRequest(SS_HTTPRequest $request, Session $session, DataModel $model) {
+		SearchUpdater::bind_manipulation_capture();
+	}
+
+	public function postRequest(SS_HTTPRequest $request, SS_HTTPResponse $response, DataModel $model) {
+		/* NOP */
+	}
+}