diff --git a/Diffusion.Database/DataStore.Search.cs b/Diffusion.Database/DataStore.Search.cs
index 2caa6e9..48ab905 100644
--- a/Diffusion.Database/DataStore.Search.cs
+++ b/Diffusion.Database/DataStore.Search.cs
@@ -198,7 +198,8 @@ public int Count(Filter filter)
 
             var q = QueryBuilder.Filter(filter);
 
-            var count = db.ExecuteScalar<int>($"SELECT COUNT(*) FROM Image m1 {string.Join(' ', q.Joins)} WHERE {q.Item1}", q.Item2.ToArray());
+            string raw_query = $"SELECT COUNT(*) FROM Image m1 {string.Join(' ', q.Joins)} WHERE {q.Item1}";
+            var count = db.ExecuteScalar<int>(raw_query, q.Item2.ToArray());
 
             db.Close();
 
@@ -280,7 +281,8 @@ public IEnumerable<Image> Query(Filter filter)
 
             var q = QueryBuilder.Filter(filter);
 
-            var images = db.Query<Image>($"SELECT Image.* FROM Image m1 {string.Join(' ', q.Joins)} WHERE {q.Item1}", q.Item2.ToArray());
+            string query_raw = $"SELECT m1.* FROM Image m1 {string.Join(' ', q.Joins)} WHERE {q.Item1}";
+            var images = db.Query<Image>(query_raw, q.Item2.ToArray());
 
             foreach (var image in images)
             {