diff --git a/app/Filament/Resources/BackupSetResource.php b/app/Filament/Resources/BackupSetResource.php
index e889d00..511cda3 100644
--- a/app/Filament/Resources/BackupSetResource.php
+++ b/app/Filament/Resources/BackupSetResource.php
@@ -51,7 +51,11 @@ public static function table(Table $table): Table
                 Tables\Columns\TextColumn::make('created_at')->dateTime()->since(),
             ])
             ->filters([
-                Tables\Filters\TrashedFilter::make(),
+                Tables\Filters\TrashedFilter::make()
+                    ->label('Archived')
+                    ->placeholder('Active')
+                    ->trueLabel('All')
+                    ->falseLabel('Archived'),
             ])
             ->actions([
                 Actions\ViewAction::make()
diff --git a/app/Filament/Resources/PolicyResource.php b/app/Filament/Resources/PolicyResource.php
index d552e6a..2ef039e 100644
--- a/app/Filament/Resources/PolicyResource.php
+++ b/app/Filament/Resources/PolicyResource.php
@@ -331,7 +331,7 @@ public static function table(Table $table): Table
             ->bulkActions([
                 BulkActionGroup::make([
                     BulkAction::make('bulk_delete')
-                        ->label('Delete Policies')
+                        ->label('Ignore Policies')
                         ->icon('heroicon-o-trash')
                         ->color('danger')
                         ->requiresConfirmation()
diff --git a/app/Filament/Resources/TenantResource.php b/app/Filament/Resources/TenantResource.php
index 567b830..cc845b0 100644
--- a/app/Filament/Resources/TenantResource.php
+++ b/app/Filament/Resources/TenantResource.php
@@ -97,10 +97,10 @@ public static function table(Table $table): Table
             ])
             ->filters([
                 Tables\Filters\TrashedFilter::make()
-                    ->label('Archive filter')
-                    ->placeholder('Active only')
-                    ->trueLabel('Active + archived')
-                    ->falseLabel('Archived only')
+                    ->label('Archived')
+                    ->placeholder('Active')
+                    ->trueLabel('All')
+                    ->falseLabel('Archived')
                     ->default(true),
                 Tables\Filters\SelectFilter::make('app_status')
                     ->options([
diff --git a/tests/Feature/Filament/HousekeepingTest.php b/tests/Feature/Filament/HousekeepingTest.php
index 25d44b5..3030ae0 100644
--- a/tests/Feature/Filament/HousekeepingTest.php
+++ b/tests/Feature/Filament/HousekeepingTest.php
@@ -166,6 +166,8 @@
         'name' => 'Tenant 3',
     ]);
 
+    $tenant->makeCurrent();
+
     $policy = Policy::create([
         'tenant_id' => $tenant->id,
         'external_id' => 'pol-1',
@@ -201,6 +203,8 @@
         'name' => 'Tenant 3b',
     ]);
 
+    $tenant->makeCurrent();
+
     $policy = Policy::create([
         'tenant_id' => $tenant->id,
         'external_id' => 'pol-1b',