diff --git a/packages/tables/src/Concerns/HasFilters.php b/packages/tables/src/Concerns/HasFilters.php
index 2acd087944..cd9be430b0 100644
--- a/packages/tables/src/Concerns/HasFilters.php
+++ b/packages/tables/src/Concerns/HasFilters.php
@@ -65,7 +65,7 @@ trait HasFilters
         $filter = $this->getTable()->getFilter($filterName);
         $filterResetState = $filter->getResetState();
 
-        $filterFormGroup = $this->getTableFiltersForm()->getComponents()[$filterName] ?? null;
+        $filterFormGroup = $this->getTableFiltersForm()->getComponent($filterName);
         $filterFields = $filterFormGroup?->getChildComponentContainer()->getFlatFields();
 
         if (filled($field) && array_key_exists($field, $filterFields)) {
diff --git a/packages/tables/src/Table/Concerns/HasFilters.php b/packages/tables/src/Table/Concerns/HasFilters.php
index d71a45f6b8..00ec6e077e 100644
--- a/packages/tables/src/Table/Concerns/HasFilters.php
+++ b/packages/tables/src/Table/Concerns/HasFilters.php
@@ -181,12 +181,13 @@ trait HasFilters
             $filters[$filterName] = Group::make()
                 ->schema($filter->getFormSchema())
                 ->statePath($filterName)
+                ->key($filterName)
                 ->columnSpan($filter->getColumnSpan())
                 ->columnStart($filter->getColumnStart())
                 ->columns($filter->getColumns());
         }
 
-        return $this->evaluate($this->filtersFormSchema, ['filters' => $filters]) ?? $filters;
+        return $this->evaluate($this->filtersFormSchema, ['filters' => $filters]) ?? array_values($filters);
     }
 
     public function getFiltersTriggerAction(): Action