diff --git a/code/extensions/FusionExtension.php b/code/extensions/FusionExtension.php
index a940a23..d752904 100644
--- a/code/extensions/FusionExtension.php
+++ b/code/extensions/FusionExtension.php
@@ -51,7 +51,7 @@ public function validate(ValidationResult $result) {
 			$result->error("\"{$validate}\" required!");
 		}
 		else if($result->valid() && $class::get_one($class, array(
-			'ID != ?' => $this->owner->ID,
+			"{$class}.ID != ?" => $this->owner->ID,
 			"LOWER({$validate}) = ?" => strtolower($this->owner->$validate)
 		))) {
 			$result->error('Tag already exists!');
diff --git a/code/extensions/TaggingExtension.php b/code/extensions/TaggingExtension.php
index 5c8141e..4c4adcd 100644
--- a/code/extensions/TaggingExtension.php
+++ b/code/extensions/TaggingExtension.php
@@ -38,7 +38,7 @@ public function updateSearchableFields(&$fields) {
 					'Tagging',
 					'Tags',
 					FusionTag::get()->map('Title', 'Title')->toArray(),
-					(($filtering = Controller::curr()->getRequest()->getVar('q')) && isset($filtering['Tagging'])) ? $filtering['Tagging'] : array(),
+					(Controller::has_curr() && ($filtering = Controller::curr()->getRequest()->getVar('q')) && isset($filtering['Tagging'])) ? $filtering['Tagging'] : array(),
 					null,
 					true
 				),