diff --git a/FoodsharingSiegen.Server/Controls/ProspectFilterControl.razor b/FoodsharingSiegen.Server/Controls/ProspectFilterControl.razor
index 792bbf7..eda0e7e 100644
--- a/FoodsharingSiegen.Server/Controls/ProspectFilterControl.razor
+++ b/FoodsharingSiegen.Server/Controls/ProspectFilterControl.razor
@@ -7,6 +7,8 @@
   
   [Parameter]
   public EventCallback<ProspectFilter> FilterChanged { get; set; }
+  
+  [Parameter] public ProspectStateFilter StateFilter { get; set; }
 
 
   private async Task WithoutStepInBriefingChangedAsync(bool arg)
@@ -28,9 +30,12 @@
     <i class="fa-solid fa-filter"></i> Suchfilter
   </div>
   <div class="card-body" style="padding: .5rem;">
-    <div style="margin-left: 1rem;">
-      <Switch TValue="bool" Checked="Filter.WithoutStepInBriefing" CheckedChanged="WithoutStepInBriefingChangedAsync">Ohne @AppSettings.Terms.StepInName</Switch>
-    </div>
+    @if (StateFilter == ProspectStateFilter.OnBoarding)
+    {
+      <div style="margin-left: 1rem;">
+        <Switch TValue="bool" Checked="Filter.WithoutStepInBriefing" CheckedChanged="WithoutStepInBriefingChangedAsync">Ohne @AppSettings.Terms.StepInName</Switch>
+      </div>
+    }
     <TextEdit Text="@Filter.Text" TextChanged="TextChanged" Placeholder="Suchen..." Debounce="true" DebounceInterval="150"/>
   </div>
 </div>
\ No newline at end of file
diff --git a/FoodsharingSiegen.Server/Pages/Prospects.razor b/FoodsharingSiegen.Server/Pages/Prospects.razor
index 315dd52..624d5d0 100644
--- a/FoodsharingSiegen.Server/Pages/Prospects.razor
+++ b/FoodsharingSiegen.Server/Pages/Prospects.razor
@@ -20,7 +20,7 @@
 }
 
 <hr/>
-<ProspectFilterControl @bind-Filter="Filter"></ProspectFilterControl>
+<ProspectFilterControl @bind-Filter="Filter" StateFilter="ProspectStateFilter.OnBoarding"></ProspectFilterControl>
 <hr />
 <ProspectGrid
     Prospects="filterList"
diff --git a/FoodsharingSiegen.Server/Pages/ProspectsDone.razor b/FoodsharingSiegen.Server/Pages/ProspectsDone.razor
index 4dcfad5..24b4e5b 100644
--- a/FoodsharingSiegen.Server/Pages/ProspectsDone.razor
+++ b/FoodsharingSiegen.Server/Pages/ProspectsDone.razor
@@ -11,15 +11,10 @@
 }
 
 <hr />
-<ProspectFilterControl @bind-Filter="Filter"></ProspectFilterControl>
+<ProspectFilterControl @bind-Filter="Filter" StateFilter="ProspectStateFilter.Completed"></ProspectFilterControl>
 <hr />
-<h5>@(filterList.Count) Einträge</h5>
-@if (filterList.Any())
-{
-    
-    <div class="row m-0">
-        <Repeater Items="@filterList">
-            <ProspectContainer Prospect="context" RemoveInteraction="RemoveInteraction" StateFilter="ProspectStateFilter.Completed"></ProspectContainer>
-        </Repeater>
-    </div>
-}
\ No newline at end of file
+<ProspectGrid
+    Prospects="filterList"
+    OnDataChanged="@LoadProspects"
+    StateFilter="ProspectStateFilter.Completed">
+</ProspectGrid>
\ No newline at end of file
diff --git a/FoodsharingSiegen.Server/Pages/ProspectsVerify.razor b/FoodsharingSiegen.Server/Pages/ProspectsVerify.razor
index fb6e605..74d9848 100644
--- a/FoodsharingSiegen.Server/Pages/ProspectsVerify.razor
+++ b/FoodsharingSiegen.Server/Pages/ProspectsVerify.razor
@@ -12,7 +12,7 @@
 }
 
 <hr/>
-<ProspectFilterControl @bind-Filter="Filter"></ProspectFilterControl>
+<ProspectFilterControl @bind-Filter="Filter" StateFilter="ProspectStateFilter.Verification"></ProspectFilterControl>
 <hr />
 <ProspectGrid
     Prospects="filterList"