diff --git a/search/retrieval.py b/search/retrieval.py
index 6451d42..f14455f 100644
--- a/search/retrieval.py
+++ b/search/retrieval.py
@@ -18,15 +18,21 @@ def _build_filter(question: Question) -> models.Filter | None:
     must_conditions: list[models.Condition] = []
 
     if question.date_range:
-        must_conditions.append(
-            models.FieldCondition(
-                key="metadata.start",
-                datetime_range=models.DatetimeRange(
-                    gte=question.date_range.from_,
-                    lte=question.date_range.to,
-                ),
+        try:
+            must_conditions.append(
+                models.FieldCondition(
+                    key="metadata.end",
+                    range=models.Range(gte=question.date_range.from_),
+                )
             )
-        )
+            must_conditions.append(
+                models.FieldCondition(
+                    key="metadata.start",
+                    range=models.Range(lte=question.date_range.to),
+                )
+            )
+        except Exception as e:
+            logger.warning("Date filter failed: %s", e)
 
     if question.asker:
         must_conditions.append(