diff --git a/modules/store/src/main/scala/docspell/store/qb/generator/ItemQueryGenerator.scala b/modules/store/src/main/scala/docspell/store/qb/generator/ItemQueryGenerator.scala
index d02e9660..54632acc 100644
--- a/modules/store/src/main/scala/docspell/store/qb/generator/ItemQueryGenerator.scala
+++ b/modules/store/src/main/scala/docspell/store/qb/generator/ItemQueryGenerator.scala
@@ -236,7 +236,11 @@ object ItemQueryGenerator {
     Select(
       select(cfv.itemId),
       from(cfv).innerJoin(cf, cf.id === cfv.field),
-      cf.cid === coll && cf.name ==== field && Condition.CompareVal(cfv.value, op, v)
+      cf.cid === coll && (cf.name ==== field || cf.id ==== field) && Condition.CompareVal(
+        cfv.value,
+        op,
+        v
+      )
     )
   }
 }