diff --git a/frontend/src/app/ui/plan/listing/filtering/plan-filter.component.html b/frontend/src/app/ui/plan/listing/filtering/plan-filter.component.html
index 209329ec4..b7522f0ed 100644
--- a/frontend/src/app/ui/plan/listing/filtering/plan-filter.component.html
+++ b/frontend/src/app/ui/plan/listing/filtering/plan-filter.component.html
@@ -103,21 +103,21 @@
 			</div>
 			<!-- End of Reference Types -->
 			
-			<!-- <div class="col-10 d-flex justify-content-between mb-4">
-                <button mat-button class="rounded-btn secondary" (click)="resetFilters()" style="font-size: 0.87rem;">
-					Reset 
+			<div class="col-10 d-flex justify-content-between mb-4">
+                <button mat-button class="normal-btn-sm rounded-btn secondary" (click)="resetFilters()" style="font-size: 0.87rem;">
+					{{'PLAN-LISTING.FILTERS.RESET-FILTERS' | translate}} 
 				</button>
 				<button class="normal-btn-sm" (click)="controlModified()">
 					{{'PLAN-LISTING.FILTERS.APPLY-FILTERS' | translate}}
 				</button>
+			</div>
+<!-- 
+            <div class="d-flex mb-4">
+				<button class="normal-btn-sm" (click)="controlModified()">
+					{{'PLAN-LISTING.FILTERS.APPLY-FILTERS' | translate}}
+				</button>
 			</div> -->
 
-            <div class="d-flex mb-4">
-				<button class="normal-btn-sm" (click)="controlModified()">
-					{{'PLAN-LISTING.FILTERS.APPLY-FILTERS' | translate}}
-				</button>
-			</div>
-
 
 		</div>
 	</div>
diff --git a/frontend/src/app/ui/plan/listing/filtering/plan-filter.component.ts b/frontend/src/app/ui/plan/listing/filtering/plan-filter.component.ts
index e69638444..8feb5b3ee 100644
--- a/frontend/src/app/ui/plan/listing/filtering/plan-filter.component.ts
+++ b/frontend/src/app/ui/plan/listing/filtering/plan-filter.component.ts
@@ -104,7 +104,16 @@ export class PlanFilterComponent extends BaseCriteriaComponent<PlanListingFilter
     }
 
     resetFilters(){
-        this.buildForm(null);
+        this.formGroup.reset();
+        this.formGroup.patchValue({
+            descriptionTemplates: null,
+            planBlueprints: null,
+            references: null,
+            role: null,
+            status: null,
+            viewOnlyTenant: null
+        });
+        this.referenceAutocompleteConfiguration.clear();
     }
 
 	onCallbackError(error: any) {
diff --git a/frontend/src/app/ui/plan/listing/plan-listing.component.ts b/frontend/src/app/ui/plan/listing/plan-listing.component.ts
index 48ef1627f..6981f4388 100644
--- a/frontend/src/app/ui/plan/listing/plan-listing.component.ts
+++ b/frontend/src/app/ui/plan/listing/plan-listing.component.ts
@@ -408,7 +408,7 @@ export class PlanListingComponent extends BaseListingComponent<BasePlan, PlanLoo
 
 	private _patchLookupFromFilters(filters: PlanListingFilters): PlanLookup {
 
-		this.lookup.statuses = filters?.status !== null ? [filters.status] : [];
+		this.lookup.statuses = filters?.status !== null ? [filters.status] : null;
 
 		// Tenants
 		let viewOnlyTenant = filters?.viewOnlyTenant ?? false;
diff --git a/frontend/src/assets/i18n/baq.json b/frontend/src/assets/i18n/baq.json
index c1f5929f1..1d2aecf00 100644
--- a/frontend/src/assets/i18n/baq.json
+++ b/frontend/src/assets/i18n/baq.json
@@ -238,7 +238,7 @@
 			"MESSAGE": "If you leave, your changes will be lost.",
 			"ACTIONS": {
 				"CANCEL": "Cancel",
-				"LEAVE": "LEAVE"
+				"LEAVE": "Leave"
 			}
 		},
         "FIELDS": {
diff --git a/frontend/src/assets/i18n/de.json b/frontend/src/assets/i18n/de.json
index 3b9653aa4..3033326db 100644
--- a/frontend/src/assets/i18n/de.json
+++ b/frontend/src/assets/i18n/de.json
@@ -238,7 +238,7 @@
 			"MESSAGE": "If you leave, your changes will be lost.",
 			"ACTIONS": {
 				"CANCEL": "Cancel",
-				"LEAVE": "LEAVE"
+				"LEAVE": "Leave"
 			}
 		},
         "FIELDS": {
diff --git a/frontend/src/assets/i18n/en.json b/frontend/src/assets/i18n/en.json
index 522fd77b5..140d69785 100644
--- a/frontend/src/assets/i18n/en.json
+++ b/frontend/src/assets/i18n/en.json
@@ -238,7 +238,7 @@
 			"MESSAGE": "If you leave, your changes will be lost.",
 			"ACTIONS": {
 				"CANCEL": "Cancel",
-				"LEAVE": "LEAVE"
+				"LEAVE": "Leave"
 			}
 		},
         "FIELDS": {
@@ -756,6 +756,7 @@
 		"FILTERS": {
 			"NAME": "Filters",
 			"APPLY-FILTERS": "Apply filters",
+			"RESET-FILTERS": "Reset",
 			"NO-ITEMS-FOUND": "Your search didn't match any items.",
 			"STATUS": {
 				"NAME": "Status",
diff --git a/frontend/src/assets/i18n/es.json b/frontend/src/assets/i18n/es.json
index 01bfa453f..04bd1bac2 100644
--- a/frontend/src/assets/i18n/es.json
+++ b/frontend/src/assets/i18n/es.json
@@ -238,7 +238,7 @@
 			"MESSAGE": "If you leave, your changes will be lost.",
 			"ACTIONS": {
 				"CANCEL": "Cancel",
-				"LEAVE": "LEAVE"
+				"LEAVE": "Leave"
 			}
 		},
         "FIELDS": {
@@ -758,6 +758,7 @@
 		"FILTERS": {
 			"NAME": "Filters",
 			"APPLY-FILTERS": "Apply filters",
+            "RESET-FILTERS": "Reset",
 			"NO-ITEMS-FOUND": "Your search didn't match any items.",
 			"STATUS": {
 				"NAME": "Status",
diff --git a/frontend/src/assets/i18n/gr.json b/frontend/src/assets/i18n/gr.json
index 14cd169af..afc6096e3 100644
--- a/frontend/src/assets/i18n/gr.json
+++ b/frontend/src/assets/i18n/gr.json
@@ -238,7 +238,7 @@
 			"MESSAGE": "If you leave, your changes will be lost.",
 			"ACTIONS": {
 				"CANCEL": "Cancel",
-				"LEAVE": "LEAVE"
+				"LEAVE": "Leave"
 			}
 		},
         "FIELDS": {
@@ -758,6 +758,7 @@
 		"FILTERS": {
 			"NAME": "Filters",
 			"APPLY-FILTERS": "Apply filters",
+            "RESET-FILTERS": "Reset",
 			"NO-ITEMS-FOUND": "Your search didn't match any items.",
 			"STATUS": {
 				"NAME": "Status",
diff --git a/frontend/src/assets/i18n/hr.json b/frontend/src/assets/i18n/hr.json
index 2443b296c..f85c9bb83 100644
--- a/frontend/src/assets/i18n/hr.json
+++ b/frontend/src/assets/i18n/hr.json
@@ -238,7 +238,7 @@
 			"MESSAGE": "If you leave, your changes will be lost.",
 			"ACTIONS": {
 				"CANCEL": "Cancel",
-				"LEAVE": "LEAVE"
+				"LEAVE": "Leave"
 			}
 		},
         "FIELDS": {
@@ -758,6 +758,7 @@
 		"FILTERS": {
 			"NAME": "Filters",
 			"APPLY-FILTERS": "Apply filters",
+            "RESET-FILTERS": "Reset",
 			"NO-ITEMS-FOUND": "Your search didn't match any items.",
 			"STATUS": {
 				"NAME": "Status",
diff --git a/frontend/src/assets/i18n/pl.json b/frontend/src/assets/i18n/pl.json
index 04e1700f6..fb9a00d7e 100644
--- a/frontend/src/assets/i18n/pl.json
+++ b/frontend/src/assets/i18n/pl.json
@@ -238,7 +238,7 @@
 			"MESSAGE": "If you leave, your changes will be lost.",
 			"ACTIONS": {
 				"CANCEL": "Cancel",
-				"LEAVE": "LEAVE"
+				"LEAVE": "Leave"
 			}
 		},
         "FIELDS": {
@@ -758,6 +758,7 @@
 		"FILTERS": {
 			"NAME": "Filters",
 			"APPLY-FILTERS": "Apply filters",
+            "RESET-FILTERS": "Reset",
 			"NO-ITEMS-FOUND": "Your search didn't match any items.",
 			"STATUS": {
 				"NAME": "Status",
diff --git a/frontend/src/assets/i18n/pt.json b/frontend/src/assets/i18n/pt.json
index fe258382d..82e9638d0 100644
--- a/frontend/src/assets/i18n/pt.json
+++ b/frontend/src/assets/i18n/pt.json
@@ -238,7 +238,7 @@
 			"MESSAGE": "If you leave, your changes will be lost.",
 			"ACTIONS": {
 				"CANCEL": "Cancel",
-				"LEAVE": "LEAVE"
+				"LEAVE": "Leave"
 			}
 		},
         "FIELDS": {
@@ -758,6 +758,7 @@
 		"FILTERS": {
 			"NAME": "Filters",
 			"APPLY-FILTERS": "Apply filters",
+            "RESET-FILTERS": "Reset",
 			"NO-ITEMS-FOUND": "Your search didn't match any items.",
 			"STATUS": {
 				"NAME": "Status",
diff --git a/frontend/src/assets/i18n/sk.json b/frontend/src/assets/i18n/sk.json
index a70508e2e..1de4087f6 100644
--- a/frontend/src/assets/i18n/sk.json
+++ b/frontend/src/assets/i18n/sk.json
@@ -238,7 +238,7 @@
 			"MESSAGE": "If you leave, your changes will be lost.",
 			"ACTIONS": {
 				"CANCEL": "Cancel",
-				"LEAVE": "LEAVE"
+				"LEAVE": "Leave"
 			}
 		},
         "FIELDS": {
@@ -758,6 +758,7 @@
 		"FILTERS": {
 			"NAME": "Filters",
 			"APPLY-FILTERS": "Apply filters",
+            "RESET-FILTERS": "Reset",
 			"NO-ITEMS-FOUND": "Your search didn't match any items.",
 			"STATUS": {
 				"NAME": "Status",
diff --git a/frontend/src/assets/i18n/sr.json b/frontend/src/assets/i18n/sr.json
index 07d26b7f3..dace39c50 100644
--- a/frontend/src/assets/i18n/sr.json
+++ b/frontend/src/assets/i18n/sr.json
@@ -238,7 +238,7 @@
 			"MESSAGE": "If you leave, your changes will be lost.",
 			"ACTIONS": {
 				"CANCEL": "Cancel",
-				"LEAVE": "LEAVE"
+				"LEAVE": "Leave"
 			}
 		},
         "FIELDS": {
@@ -758,6 +758,7 @@
 		"FILTERS": {
 			"NAME": "Filters",
 			"APPLY-FILTERS": "Apply filters",
+            "RESET-FILTERS": "Reset",
 			"NO-ITEMS-FOUND": "Your search didn't match any items.",
 			"STATUS": {
 				"NAME": "Status",
diff --git a/frontend/src/assets/i18n/tr.json b/frontend/src/assets/i18n/tr.json
index 7e047f2a9..f45a6d2a9 100644
--- a/frontend/src/assets/i18n/tr.json
+++ b/frontend/src/assets/i18n/tr.json
@@ -238,7 +238,7 @@
 			"MESSAGE": "If you leave, your changes will be lost.",
 			"ACTIONS": {
 				"CANCEL": "Cancel",
-				"LEAVE": "LEAVE"
+				"LEAVE": "Leave"
 			}
 		},
         "FIELDS": {
@@ -758,6 +758,7 @@
 		"FILTERS": {
 			"NAME": "Filters",
 			"APPLY-FILTERS": "Apply filters",
+            "RESET-FILTERS": "Reset",
 			"NO-ITEMS-FOUND": "Your search didn't match any items.",
 			"STATUS": {
 				"NAME": "Status",