diff --git a/src/app/features/preservation/aip/components/routables/aip-list/aip-list.routable.ts b/src/app/features/preservation/aip/components/routables/aip-list/aip-list.routable.ts
index c2ef88ca980f452ff93788277838f72f01085fc9..3b6f6092990d24dee97a77eb8300675c63a2fdd7 100644
--- a/src/app/features/preservation/aip/components/routables/aip-list/aip-list.routable.ts
+++ b/src/app/features/preservation/aip/components/routables/aip-list/aip-list.routable.ts
@@ -81,8 +81,10 @@ export class AipListRoutable extends SharedAbstractListRoutable<Aip, Preservatio
   @OverrideProperty()
   skipInitialQuery: boolean = true;
 
+  private readonly KEY_ARCHIVAL_UNIT: keyof Aip = "archivalUnit";
+
   columnsSkippedToClear: string[] = [
-    "archivalUnit",
+    this.KEY_ARCHIVAL_UNIT,
   ];
 
   storagion_number: number | undefined = undefined;
@@ -216,8 +218,10 @@ export class AipListRoutable extends SharedAbstractListRoutable<Aip, Preservatio
   getAipListWithParameter(isArchivalUnit: boolean | undefined): void {
     let queryParameter = ResourceState.queryParametersSnapshot(this.store, PreservationAipState);
     queryParameter = QueryParametersUtil.clone(queryParameter);
-    if (!isNullOrUndefined(isArchivalUnit)) {
-      MappingObjectUtil.set(queryParameter.search.searchItems, "archivalUnit", isArchivalUnit.toString());
+    if (isNullOrUndefined(isArchivalUnit)) {
+      MappingObjectUtil.delete(queryParameter.search.searchItems, this.KEY_ARCHIVAL_UNIT);
+    } else {
+      MappingObjectUtil.set(queryParameter.search.searchItems, this.KEY_ARCHIVAL_UNIT, isArchivalUnit.toString());
     }
     this.store.dispatch(new PreservationAipAction.GetAll(queryParameter, false));
   }
diff --git a/src/app/features/preservation/aip/components/routables/aip-tabs/aip-tabs.routable.scss b/src/app/features/preservation/aip/components/routables/aip-tabs/aip-tabs.routable.scss
index e9d037a8b157d84409cf9615ec53db4f95869dd1..f27594f61b2dd6760426192bbc09ab3137697b0c 100644
--- a/src/app/features/preservation/aip/components/routables/aip-tabs/aip-tabs.routable.scss
+++ b/src/app/features/preservation/aip/components/routables/aip-tabs/aip-tabs.routable.scss
@@ -2,6 +2,8 @@
 @import "src/sass/abstracts/mixins";
 
 :host {
+  flex: 1;
+
   .tab-header {
     margin-top: 20px;
     padding: 0 $padding-content-desktop;