diff --git a/core/database.class.php b/core/database.class.php
index aa8a6948..87d753fe 100644
--- a/core/database.class.php
+++ b/core/database.class.php
@@ -124,7 +124,7 @@ class Database {
 			$query = new Querylet("SELECT * FROM images ");
 		}
 		else {
-			$s_tag_array = array_map("sql_quote", $tag_search->variables);
+			$s_tag_array = array_map("sql_escape", $tag_search->variables);
 			$s_tag_list = join(', ', $s_tag_array);
 
 			$subquery = new Querylet("