diff --git a/include/class.forms.php b/include/class.forms.php
index 8417f1a165c47c4b5aecc07bc37336525e5245fa..d33cccf271eade01a5cbaa1b4cfc1e728d809b65 100644
--- a/include/class.forms.php
+++ b/include/class.forms.php
@@ -2159,15 +2159,13 @@ class DatetimeField extends FormField {
             $int = $intervals[$value['int'] ?: 'd'] ?: 'DAY';
             $interval = new SqlInterval($int, $value['until']);
             return new Q(array(
-                "{$name}__lt" => $now,
-                "{$name}__gte" => $now->minus($interval),
+                "{$name}__range" => array($now->minus($interval), $now),
             ));
         case 'ndays':
             $int = $intervals[$value['int'] ?: 'd'] ?: 'DAY';
             $interval = new SqlInterval($int, $value['until']);
             return new Q(array(
-                "{$name}__gt" => $now,
-                "{$name}__gte" => $now->plus($interval),
+                "{$name}__range" => array($now, $now->plus($interval)),
             ));
         // Distant past and future ranges
         case 'distpast':