diff --git a/core/database.class.php b/core/database.class.php
index d04a81ee..6bc64b8b 100644
--- a/core/database.class.php
+++ b/core/database.class.php
@@ -150,11 +150,20 @@ class Database {
 
 		if($positive_tag_count + $negative_tag_count == 0) {
 			$query = new Querylet($this->get_images);
+
+			if(strlen($img_search->sql) > 0) {
+				$query->append_sql("WHERE 1=1 ");
+				$query->append($img_search);
+			}
 		}
 		else if($positive_tag_count == 1 && $negative_tag_count == 0) {
 			$query = new Querylet(
 				"{$this->get_images} WHERE images.id IN (SELECT image_id FROM tags WHERE tag = ?) ",
 				$tag_search->variables);
+
+			if(strlen($img_search->sql) > 0) {
+				$query->append($img_search);
+			}
 		}
 		else {
 			$s_tag_array = array_map("sql_escape", $tag_search->variables);
@@ -175,11 +184,11 @@ class Database {
 			$query = new Querylet("
 				SELECT *, UNIX_TIMESTAMP(posted) AS posted_timestamp
 				FROM ({$subquery->sql}) AS images ", $subquery->variables);
-		}
 
-		if(strlen($img_search->sql) > 0) {
-			$query->append_sql("WHERE 1=1 ");
-			$query->append($img_search);
+			if(strlen($img_search->sql) > 0) {
+				$query->append_sql("WHERE 1=1 ");
+				$query->append($img_search);
+			}
 		}
 
 		return $query;
diff --git a/core/util.inc.php b/core/util.inc.php
index 9e1a641f..546f7ce1 100644
--- a/core/util.inc.php
+++ b/core/util.inc.php
@@ -205,9 +205,9 @@ function get_thumbnail_size($orig_width, $orig_height) {
 # $db is the connection object
 function CountExecs($db, $sql, $inputarray) {
 	global $_execs;
-#	$fp = fopen("sql.log", "a");
-#	fwrite($fp, preg_replace('/\s+/msi', ' ', $sql)."\n");
-#	fclose($fp);
+	$fp = fopen("sql.log", "a");
+	fwrite($fp, preg_replace('/\s+/msi', ' ', $sql)."\n");
+	fclose($fp);
 	if (!is_array($inputarray)) $_execs++;
 	# handle 2-dimensional input arrays
 	else if (is_array(reset($inputarray))) $_execs += sizeof($inputarray);