diff --git a/kernel/av/table.go b/kernel/av/table.go
index 3a484d343..82c928c31 100644
--- a/kernel/av/table.go
+++ b/kernel/av/table.go
@@ -193,11 +193,9 @@ func (value *Value) CompareOperator(other *Value, operator FilterOperator) bool
 			return value.Date.Content <= other.Date.Content
 		case FilterOperatorIsBetween:
 			start := value.Date.Content >= other.Date.Content
-			end := true
+			end := value.Date.Content <= other.Date.Content2
 			if value.Date.HasEndDate {
 				end = value.Date.Content2 <= other.Date.Content2
-			} else {
-				end = value.Date.Content <= other.Date.Content2
 			}
 			return start && end
 		case FilterOperatorIsEmpty: