diff --git a/src/DataTables/Filters/Constraints/NumberConstraint.php b/src/DataTables/Filters/Constraints/NumberConstraint.php
index 1df2f6e3..92ef51ad 100644
--- a/src/DataTables/Filters/Constraints/NumberConstraint.php
+++ b/src/DataTables/Filters/Constraints/NumberConstraint.php
@@ -76,7 +76,7 @@ class NumberConstraint extends AbstractConstraint
     }
 
 
-    public function __construct(string $property, string $identifier = null, $value1 = null, $operator = '>', $value2 = null)
+    public function __construct(string $property, string $identifier = null, $value1 = null, $operator = null, $value2 = null)
     {
         parent::__construct($property, $identifier);
         $this->value1 = $value1;
diff --git a/templates/Parts/lists/_filter.html.twig b/templates/Parts/lists/_filter.html.twig
index f4510002..825ab339 100644
--- a/templates/Parts/lists/_filter.html.twig
+++ b/templates/Parts/lists/_filter.html.twig
@@ -1,8 +1,36 @@
 <div class="card mb-4">
-    <div class="card-header">Filter</div>
+    <div class="card-header"><i class="fa-solid fa-filter fa-fw"></i> Filter</div>
     <div class="card-body">
+        <ul class="nav nav-tabs" id="filterTabs" role="tablist">
+            <li class="nav-item" role="presentation">
+                <button class="nav-link active" id="filter-common-tab" data-bs-toggle="tab" data-bs-target="#filter-common">Common</button>
+            </li>
+            <li class="nav-item" role="presentation">
+                <button class="nav-link" id="filter-advanced-tab" data-bs-toggle="tab" data-bs-target="#filter-advanced">Advanced</button>
+            </li>
+        </ul>
+
         {{ form_start(filterForm) }}
 
+        <div class="tab-content">
+            <div class="tab-pane active pt-3" id="filter-common" role="tabpanel" aria-labelledby="filter-common-tab" tabindex="0">
+                {{ form_row(filterForm.name) }}
+                {{ form_row(filterForm.description) }}
+            </div>
+
+            <div class="tab-pane pt-3" id="filter-advanced" role="tabpanel" aria-labelledby="filter-advanced-tab" tabindex="0">
+                {{ form_row(filterForm.favorite) }}
+                {{ form_row(filterForm.needsReview) }}
+                {{ form_row(filterForm.mass) }}
+                {{ form_row(filterForm.lastModified) }}
+                {{ form_row(filterForm.addedDate) }}
+            </div>
+
+        </div>
+
+
+        {{ form_row(filterForm.submit) }}
+
         {{ form_end(filterForm) }}
     </div>
 </div>
\ No newline at end of file