diff --git a/src/Filters/NumberFilter.php b/src/Filters/NumberFilter.php
index afce196..52c6f48 100644
--- a/src/Filters/NumberFilter.php
+++ b/src/Filters/NumberFilter.php
@@ -30,12 +30,12 @@ protected function setUp(): void
                 if ($state['clause'] === self::CLAUSE_SET || $state['clause'] === self::CLAUSE_NOT_SET) {
                     return [$this->getLabel() . ' ' . $this->clauses()[$state['clause']]];
                 }
+                if ($state['clause'] === self::CLAUSE_BETWEEN) {
+                    return [$this->getLabel() . ' ' . $this->clauses()[$state['clause']] . ' ' . ($state['from'] ?? 0) . ' and ' . ($state['until'] ?? "~")];
+                }
                 if ($state['value']) {
                     return [$this->getLabel() . ' ' . $this->clauses()[$state['clause']] . ' ' . $state['value']];
                 }
-                if ($state['from'] || $state['until']) {
-                    return [$this->getLabel() . ' ' . $this->clauses()[$state['clause']] . ' ' . ($state['from'] ?? 0) . ' and ' . ($state['until'] ?? "~")];
-                }
             }
 
             return [];