diff --git a/.commit b/.commit
index 8207edb5a..1f3a8e7c6 100644
--- a/.commit
+++ b/.commit
@@ -1 +1 @@
-b00a5f060ee4690c7173491ceb2116c39f93ebb7
+47d44c74207f3d773d1ffa718dc102fa887f1cab
diff --git a/.sync-history b/.sync-history
index c14be39c8..a7f049007 100644
--- a/.sync-history
+++ b/.sync-history
@@ -1,6 +1 @@
-9259609ee 2024-02-16 Merged PR 64916: 445342 - Fix hyperivew navigation
-4fd65a01d 2024-02-15 Merged PR 64883: 444602-account-sidesheet-filtering
-102e1446b 2024-02-14 Merged PR 64891: 446290 - Fix edit fk autocomplete data loading
-7675877fb 2024-02-13 Merged PR 64855: 446162 - Fix history comparison datepicker
-ef7cca96b 2024-02-13 Merged PR 64848: 446188 - Fix history timeline bug
-fcca26d50 2024-02-12 Merged PR 64833: Develop hyerpview navigation
\ No newline at end of file
+41487b63c 2024-02-29 Merged PR 65170: #446439 - Develop new request url params
\ No newline at end of file
diff --git a/imxweb/custom-theme/custom-theme.scss b/imxweb/custom-theme/custom-theme.scss
index 50b3b256a..de5f4f0c6 100644
--- a/imxweb/custom-theme/custom-theme.scss
+++ b/imxweb/custom-theme/custom-theme.scss
@@ -2,6 +2,7 @@ $theme_font_family: 'Source Sans Pro, "Helvetica Neue", sans-serif' !default;
 
 @use 'sass:math';
 @use '@angular/material' as mat;
+@use '@elemental-ui/core/src/styles/theming/theme' as theme;
 
 @import '@elemental-ui/core/src/styles/functions/to_number';
 
@@ -38,6 +39,4 @@ $theme: mat.define-light-theme(
   )
 );
 
-.custom-theme {
-  @include mat.all-component-themes($theme);
-}
\ No newline at end of file
+@include theme.theme('custom-theme', $theme);
diff --git a/imxweb/imx-modules/imx-api-aad.tgz b/imxweb/imx-modules/imx-api-aad.tgz
index df5702649..a642a0ab1 100644
Binary files a/imxweb/imx-modules/imx-api-aad.tgz and b/imxweb/imx-modules/imx-api-aad.tgz differ
diff --git a/imxweb/imx-modules/imx-api-aob.tgz b/imxweb/imx-modules/imx-api-aob.tgz
index 079fe701e..c56353b6c 100644
Binary files a/imxweb/imx-modules/imx-api-aob.tgz and b/imxweb/imx-modules/imx-api-aob.tgz differ
diff --git a/imxweb/imx-modules/imx-api-apc.tgz b/imxweb/imx-modules/imx-api-apc.tgz
index a91d40317..68124e7f8 100644
Binary files a/imxweb/imx-modules/imx-api-apc.tgz and b/imxweb/imx-modules/imx-api-apc.tgz differ
diff --git a/imxweb/imx-modules/imx-api-att.tgz b/imxweb/imx-modules/imx-api-att.tgz
index 208844dfe..4f3caf4b4 100644
Binary files a/imxweb/imx-modules/imx-api-att.tgz and b/imxweb/imx-modules/imx-api-att.tgz differ
diff --git a/imxweb/imx-modules/imx-api-cpl.tgz b/imxweb/imx-modules/imx-api-cpl.tgz
index 8341810c7..4a0677067 100644
Binary files a/imxweb/imx-modules/imx-api-cpl.tgz and b/imxweb/imx-modules/imx-api-cpl.tgz differ
diff --git a/imxweb/imx-modules/imx-api-dpr.tgz b/imxweb/imx-modules/imx-api-dpr.tgz
index d543fafba..bfd20e551 100644
Binary files a/imxweb/imx-modules/imx-api-dpr.tgz and b/imxweb/imx-modules/imx-api-dpr.tgz differ
diff --git a/imxweb/imx-modules/imx-api-hds.tgz b/imxweb/imx-modules/imx-api-hds.tgz
index 8c1a7b2dd..bba3ce95d 100644
Binary files a/imxweb/imx-modules/imx-api-hds.tgz and b/imxweb/imx-modules/imx-api-hds.tgz differ
diff --git a/imxweb/imx-modules/imx-api-o3e.tgz b/imxweb/imx-modules/imx-api-o3e.tgz
index c7834f876..6e2a5935c 100644
Binary files a/imxweb/imx-modules/imx-api-o3e.tgz and b/imxweb/imx-modules/imx-api-o3e.tgz differ
diff --git a/imxweb/imx-modules/imx-api-o3t.tgz b/imxweb/imx-modules/imx-api-o3t.tgz
index f89d40c87..3a0ddb76c 100644
Binary files a/imxweb/imx-modules/imx-api-o3t.tgz and b/imxweb/imx-modules/imx-api-o3t.tgz differ
diff --git a/imxweb/imx-modules/imx-api-olg.tgz b/imxweb/imx-modules/imx-api-olg.tgz
index 2d4620e77..db36d77cd 100644
Binary files a/imxweb/imx-modules/imx-api-olg.tgz and b/imxweb/imx-modules/imx-api-olg.tgz differ
diff --git a/imxweb/imx-modules/imx-api-pol.tgz b/imxweb/imx-modules/imx-api-pol.tgz
index 9fbf5feb0..30a794265 100644
Binary files a/imxweb/imx-modules/imx-api-pol.tgz and b/imxweb/imx-modules/imx-api-pol.tgz differ
diff --git a/imxweb/imx-modules/imx-api-qbm.tgz b/imxweb/imx-modules/imx-api-qbm.tgz
index 184148a16..d97914308 100644
Binary files a/imxweb/imx-modules/imx-api-qbm.tgz and b/imxweb/imx-modules/imx-api-qbm.tgz differ
diff --git a/imxweb/imx-modules/imx-api-qer.tgz b/imxweb/imx-modules/imx-api-qer.tgz
index 4dd12aa46..114a4d653 100644
Binary files a/imxweb/imx-modules/imx-api-qer.tgz and b/imxweb/imx-modules/imx-api-qer.tgz differ
diff --git a/imxweb/imx-modules/imx-api-rmb.tgz b/imxweb/imx-modules/imx-api-rmb.tgz
index e39c7b266..2bdbb5a43 100644
Binary files a/imxweb/imx-modules/imx-api-rmb.tgz and b/imxweb/imx-modules/imx-api-rmb.tgz differ
diff --git a/imxweb/imx-modules/imx-api-rms.tgz b/imxweb/imx-modules/imx-api-rms.tgz
index 15ec3a970..e214f843e 100644
Binary files a/imxweb/imx-modules/imx-api-rms.tgz and b/imxweb/imx-modules/imx-api-rms.tgz differ
diff --git a/imxweb/imx-modules/imx-api-rps.tgz b/imxweb/imx-modules/imx-api-rps.tgz
index c3ae53cd1..e9b966344 100644
Binary files a/imxweb/imx-modules/imx-api-rps.tgz and b/imxweb/imx-modules/imx-api-rps.tgz differ
diff --git a/imxweb/imx-modules/imx-api-sac.tgz b/imxweb/imx-modules/imx-api-sac.tgz
index 09d55c1a3..6041a60e3 100644
Binary files a/imxweb/imx-modules/imx-api-sac.tgz and b/imxweb/imx-modules/imx-api-sac.tgz differ
diff --git a/imxweb/imx-modules/imx-api-tsb.tgz b/imxweb/imx-modules/imx-api-tsb.tgz
index 1275e227e..4cb4cfef1 100644
Binary files a/imxweb/imx-modules/imx-api-tsb.tgz and b/imxweb/imx-modules/imx-api-tsb.tgz differ
diff --git a/imxweb/imx-modules/imx-api-uci.tgz b/imxweb/imx-modules/imx-api-uci.tgz
index b3b93c2a5..a4bb73659 100644
Binary files a/imxweb/imx-modules/imx-api-uci.tgz and b/imxweb/imx-modules/imx-api-uci.tgz differ
diff --git a/imxweb/imx-modules/imx-api.tgz b/imxweb/imx-modules/imx-api.tgz
index 09b3a69aa..78e874d66 100644
Binary files a/imxweb/imx-modules/imx-api.tgz and b/imxweb/imx-modules/imx-api.tgz differ
diff --git a/imxweb/imx-modules/imx-qbm-dbts.tgz b/imxweb/imx-modules/imx-qbm-dbts.tgz
index 9dba18a0a..e55521c45 100644
Binary files a/imxweb/imx-modules/imx-qbm-dbts.tgz and b/imxweb/imx-modules/imx-qbm-dbts.tgz differ
diff --git a/imxweb/projects/att/src/lib/decision/attestation-case.component.ts b/imxweb/projects/att/src/lib/decision/attestation-case.component.ts
index f86dcfa4b..9aa42e029 100644
--- a/imxweb/projects/att/src/lib/decision/attestation-case.component.ts
+++ b/imxweb/projects/att/src/lib/decision/attestation-case.component.ts
@@ -38,6 +38,7 @@ import {
   BaseReadonlyCdr,
   ClassloggerService,
   ColumnDependentReference,
+  MetadataService,
   SnackBarService,
   SystemInfoService,
 } from 'qbm';
@@ -107,6 +108,7 @@ export class AttestationCaseComponent implements OnDestroy, OnInit {
     private readonly busyService: EuiLoadingService,
     private readonly systemInfoService: SystemInfoService,
     private readonly logger: ClassloggerService,
+    private readonly metadataService: MetadataService,
     authentication: AuthenticationService
   ) {
     this.case = data.case;
@@ -228,12 +230,20 @@ export class AttestationCaseComponent implements OnDestroy, OnInit {
     });
   }
 
-  public setRelatedOptions(): void {
+  public async setRelatedOptions(): Promise<void> {
     this.relatedOptions =
-      this.data.case.data?.RelatedObjects.map((relatedObject) => {
-        const objectType = DbObjectKey.FromXml(relatedObject.ObjectKey);
-        return { ObjectKey: relatedObject.ObjectKey, Display: `${relatedObject.Display} - ${objectType.TableName}` };
-      }) || [];
+      (await Promise.all(
+        this.data.case.data?.RelatedObjects.map(async (relatedObject) => {
+          const objectType = DbObjectKey.FromXml(relatedObject.ObjectKey);
+          if (!this.metadataService.tables[objectType.TableName]) {
+            await this.metadataService.update([objectType.TableName]);
+          }
+          return {
+            ObjectKey: relatedObject.ObjectKey,
+            Display: `${relatedObject.Display} - ${this.metadataService.tables[objectType.TableName].DisplaySingular}`,
+          };
+        })
+      )) || [];
   }
 
   public setHyperviewObject(selectedRelatedObject: AttestationRelatedObject): void {
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-toolbar.component.ts b/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-toolbar.component.ts
index c70c96f29..c208e8f4f 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-toolbar.component.ts
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-toolbar.component.ts
@@ -480,16 +480,8 @@ export class DataSourceToolbarComponent implements OnChanges, OnInit, OnDestroy
       this.addSearchFilter(filter);
     });
 
-    const tree = config?.Filter?.find((elem) => elem.ColumnName === this.columnForTree);
-    if (tree) {
-      const display = this.filterTreeItems.Elements.find((elem) => elem.Filter.Value1 === tree.Value1)?.Display;
-      this.currentFilterData = [{ display, filter: tree }];
-      if (this.settings.navigationState.filter) {
-        this.settings.navigationState.filter.push(tree);
-      } else {
-        this.settings.navigationState.filter = [tree];
-      }
-    }
+    this.addTreeFilterFromConfig(config);
+    this.addCustomFilterFromConfig(config);
 
     if (config?.GroupBy) {
       this.applyGroupBy(config);
@@ -1277,7 +1269,7 @@ export class DataSourceToolbarComponent implements OnChanges, OnInit, OnDestroy
     if (filterdata) {
       //Get all filter, that were not associaed with the tree filter
       const otherFilter = (this.settings.navigationState.filter ?? []).filter(
-        (elem) => elem.ColumnName !== filterdata[0].filter.ColumnName
+        (elem) => elem.ColumnName !== filterdata[0].filter.ColumnName,
       );
       this.currentFilterData = filterdata;
       this.filterTreeSelectionChanged.emit(this.currentFilterData.map((filter) => filter.filter).concat(otherFilter)); // combine the two filter again
@@ -1334,6 +1326,8 @@ export class DataSourceToolbarComponent implements OnChanges, OnInit, OnDestroy
     if (this.filtersCurrentlyApplied) {
       this.clearFilters(false);
     }
+
+    this.filterWizardExpression = null;
     if (emit) {
       this.navigationStateChanged.emit(this.settings.navigationState);
     }
@@ -1348,7 +1342,7 @@ export class DataSourceToolbarComponent implements OnChanges, OnInit, OnDestroy
     this.currentFilterData = [];
     if (emit) {
       this.filterTreeSelectionChanged.emit(
-        this.settings.navigationState.filter?.filter((elem) => elem.ColumnName != currentTree.ColumnName)
+        this.settings.navigationState.filter?.filter((elem) => elem.ColumnName != currentTree.ColumnName),
       );
     }
   }
@@ -1600,6 +1594,43 @@ export class DataSourceToolbarComponent implements OnChanges, OnInit, OnDestroy
     this.settingsChanged.emit(this.settings);
   }
 
+  /**
+   * @ignore Used internally
+   * Checks, if there is a tree filter defined in the config.
+   * If a tree filter is defined, it initializes the currentFilterData object and adds the parameter to the navigation.
+   * @param config the configuration, that should be loaded.
+   */
+  private addTreeFilterFromConfig(config: DSTViewConfig): void {
+    const tree = config?.Filter?.find((elem) => elem.ColumnName === this.columnForTree);
+    if (tree) {
+      const display = this.filterTreeItems.Elements.find((elem) => elem.Filter.Value1 === tree.Value1)?.Display;
+      this.currentFilterData = [{ display, filter: tree }];
+      if (this.settings.navigationState.filter) {
+        this.settings.navigationState.filter.push(tree);
+      } else {
+        this.settings.navigationState.filter = [tree];
+      }
+    }
+  }
+
+  /**
+   * @ignore Used internally
+   * Checks, if there is a custom filter defined in the config.
+   * If a custom filter is defined, it initializes the filterWizardExpression object and adds the parameter to the navigation.
+   * @param config the configuration, that should be loaded.
+   */
+  private addCustomFilterFromConfig(config: DSTViewConfig): void {
+    const expression = config?.Filter?.find((elem) => elem.Expression != null);
+    if (expression) {
+      this.filterWizardExpression = { Expression: expression.Expression };
+      if (this.settings.navigationState.filter) {
+        this.settings.navigationState.filter.push(expression);
+      } else {
+        this.settings.navigationState.filter = [expression];
+      }
+    }
+  }
+
   /**
    * @ignore Used internally
    * Sets any initial values for the supplied filters and makes a call to update the navigation state
@@ -1720,6 +1751,7 @@ export class DataSourceToolbarComponent implements OnChanges, OnInit, OnDestroy
     if (
       this.isEnterDisabled ||
       filter?.ColumnName === this.columnForTree ||
+      filter?.Expression != null ||
       (!filter && (!this.searchControl.value || (!!this.searchControl.value && this.searchControl.value?.length === 0)))
     ) {
       // Here we return early if there is nothing to search over
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-wizard/predefined-filter/predefined-filter.component.html b/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-wizard/predefined-filter/predefined-filter.component.html
index b5cdaa0ec..2f9606b86 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-wizard/predefined-filter/predefined-filter.component.html
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-wizard/predefined-filter/predefined-filter.component.html
@@ -1,4 +1,4 @@
-<ng-container *ngFor="let filter of settings?.filters">
+<ng-container *ngFor="let filter of filters">
   <mat-card class="mat-elevation-z2" *ngIf="!hiddenFilterSet.has(filter.Name)">
     <mat-card-content>
       <h1 *ngIf="filter.Options.length > 1" class="imx-filter-title">{{ filter.Description || filter.Name }}</h1>
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-wizard/predefined-filter/predefined-filter.component.ts b/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-wizard/predefined-filter/predefined-filter.component.ts
index d663f7c45..db9b22506 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-wizard/predefined-filter/predefined-filter.component.ts
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-wizard/predefined-filter/predefined-filter.component.ts
@@ -25,8 +25,6 @@
  */
 
 import { AfterViewInit, Component, EventEmitter, Inject, Input, NgZone, OnDestroy, OnInit, Output, QueryList, ViewChildren } from '@angular/core';
-import { FormBuilder } from '@angular/forms';
-import { MatCardContent } from '@angular/material/card';
 import { MatCheckboxChange } from '@angular/material/checkbox';
 import { MatSelectChange } from '@angular/material/select';
 import { MatTableDataSource } from '@angular/material/table';
@@ -38,7 +36,7 @@ import { DataSourceToolbarSettings } from '../../data-source-toolbar-settings';
 import { DSTViewConfig } from '../../data-source-toolbar-view-config.interface';
 import { FilterFormState, FilterTypeIdentifier, FilterWizardSidesheetData } from '../filter-wizard.interfaces';
 import { FilterWizardService } from '../filter-wizard.service';
-
+import * as _ from 'lodash';
 @Component({
   selector: 'imx-predefined-filter',
   templateUrl: './predefined-filter.component.html',
@@ -103,6 +101,8 @@ export class PredefinedFilterComponent implements OnInit, AfterViewInit, OnDestr
   public hiddenFilterSet: Set<string> = new Set([]);
   public filterOptionLengthThreshold = 5;
 
+  public filters: DataSourceToolbarFilter[] = [];
+
   /**
    * This is the mat table datasource.
    */
@@ -130,8 +130,9 @@ export class PredefinedFilterComponent implements OnInit, AfterViewInit, OnDestr
   constructor(private readonly filterService: FilterWizardService, @Inject(EUI_SIDESHEET_DATA) public data?: FilterWizardSidesheetData) {
     // this.hiddenFilters = ['namespace'];
     this.id = data.id;
-    this.settings = data.settings;
+    this.settings = Object.create(data.settings);
     this.selectedFilters = data.selectedFilters;
+    this.filters = _.cloneDeep(data.settings.filters);
     this.internalSelectedFilters = Object.create(this.selectedFilters);
     this.formState = { canClearFilters: this.selectedFilters.length > 0, dirty: false, filterIdentifier: FilterTypeIdentifier.Predefined };
 
@@ -241,7 +242,7 @@ export class PredefinedFilterComponent implements OnInit, AfterViewInit, OnDestr
    * @returns the filter with the selected option
    */
   public getSelectedFilterFromName(filterName: string, value: string): DataSourceToolbarSelectedFilter {
-    const filter = this.settings.filters?.find((filter) => filter.Name === filterName);
+    const filter = this.filters?.find((filter) => filter.Name === filterName);
     if (filter) {
       filter.CurrentValue = value;
       const selectedOption = this.findFilterOptionFromValue(value, filter);
@@ -286,7 +287,7 @@ export class PredefinedFilterComponent implements OnInit, AfterViewInit, OnDestr
    * Clears all selected filter values and updates and emits the new navigationState
    */
   private clearFilters(emit = true): void {
-    this.settings.filters?.forEach((filter) => (filter.CurrentValue = undefined));
+    this.filters?.forEach((filter) => (filter.CurrentValue = undefined));
     const containsCustomFilters = this.selectedFiltersContainsCustomFilters();
     if (containsCustomFilters) {
       this.customSelectedFilterRemoved.emit();
@@ -321,15 +322,17 @@ export class PredefinedFilterComponent implements OnInit, AfterViewInit, OnDestr
    */
   private updateNavigateStateWithFilters(emit = true): void {
     this.selectedFilters = Object.create(this.internalSelectedFilters);
-    this.settings.filters?.forEach((filter) => {
+    this.filters?.forEach((filter) => {
       if (filter.CurrentValue) {
         this.settings.navigationState[filter.Name] = filter.CurrentValue;
+        this.settings.filters.find(elem=>elem.Name === filter.Name).CurrentValue = filter.CurrentValue;
         if (filter?.Column) {
           // This is a local filter and we must filter over this column
           this.localFilterState.filterColumns[filter.Column] = filter.CurrentValue;
         }
       } else {
         delete this.settings.navigationState[filter.Name];
+        delete this.settings.filters.find((elem) => elem.Name === filter.Name).CurrentValue;
         if (filter?.Column) {
           delete this.localFilterState.filterColumns[filter.Column];
         }
diff --git a/imxweb/projects/qbm/src/lib/sidenav-tree/sidenav-tree.component.html b/imxweb/projects/qbm/src/lib/sidenav-tree/sidenav-tree.component.html
index 3d06543df..55c8f6e42 100644
--- a/imxweb/projects/qbm/src/lib/sidenav-tree/sidenav-tree.component.html
+++ b/imxweb/projects/qbm/src/lib/sidenav-tree/sidenav-tree.component.html
@@ -1,4 +1,8 @@
-<mat-card [@expandDiv]="{ value: expandState, params: { expandWidth: expandWidth } }" class="snavigation" [ngClass]="{ 'snavigation--expanded': sideNavExpanded, 'mat-card--hidden': !showSidenavHeader}">
+<mat-card
+  [@expandDiv]="{ value: expandState, params: { expandWidth: expandWidth } }"
+  class="snavigation"
+  [ngClass]="{ 'snavigation--expanded': sideNavExpanded, 'mat-card--hidden': !showSidenavHeader }"
+>
   <mat-sidenav-container>
     <mat-sidenav mode="side" opened disableClose="true" [ngClass]="{ 'snavigation-side--expanded': sideNavExpanded }">
       <div class="snavigation-side">
@@ -16,16 +20,17 @@ <h3 class="snavigation-side-toggle-header">{{ headerText }}</h3>
           >
             <eui-icon icon="search"></eui-icon>
           </button>
-          <imx-data-source-toolbar #dst
-          *ngIf="dynamicDataSource?.dstSettings"
-          [@expandSearch]="{ value: searchState, params: { expandWidth: expandWidth } }"
-          [alwaysVisible]="true"
-          [settings]="dynamicDataSource.dstSettings"
-          [options]="['search']"
-          [searchBoxText]="'#LDS#Search' | translate"
-          [useThemedStyle]="true"
-          (search)="onSearch($event)"
-          (navigationStateChanged)="onSearch()"
+          <imx-data-source-toolbar
+            #dst
+            *ngIf="dynamicDataSource?.dstSettings"
+            [@expandSearch]="{ value: searchState, params: { expandWidth: expandWidth } }"
+            [alwaysVisible]="true"
+            [settings]="dynamicDataSource.dstSettings"
+            [options]="['search', 'filter']"
+            [searchBoxText]="'#LDS#Search' | translate"
+            [useThemedStyle]="true"
+            (search)="onSearch($event)"
+            (navigationStateChanged)="onSearch()"
           ></imx-data-source-toolbar>
           <button
             *ngIf="sideNavExpanded"
@@ -59,7 +64,7 @@ <h3 class="rotate-90">{{ headerText }}</h3>
         <mat-card *ngIf="dataSource" class="snavigation-side-content">
           <mat-tree *ngIf="!initializingData" [dataSource]="dataSource" [treeControl]="treeControl" class="tree">
             <mat-tree-node *matTreeNodeDef="let node">
-              <div class="mat-tree-node" [ngClass]="{'mat-tree-node--selected': isSelected(node)}">
+              <div class="mat-tree-node" [ngClass]="{ 'mat-tree-node--selected': isSelected(node) }">
                 <button mat-icon-button disabled>
                   <eui-icon size="s"></eui-icon>
                 </button>
@@ -70,33 +75,27 @@ <h3 class="rotate-90">{{ headerText }}</h3>
             </mat-tree-node>
 
             <mat-nested-tree-node *matTreeNodeDef="let node; when: hasChild">
-                <div class="mat-tree-node" [ngClass]="{'mat-tree-node--selected': isSelected(node)}">
-                  <button
-                    mat-button
-                    matTreeNodeToggle
-                    class="mat-icon-button"
-                    [attr.aria-label]="'#LDS#Expand' | translate"
-                    data-imx-identifier="sidenav-tree-parent-toggle"
-                  >
-                    <eui-icon size="s" [icon]="treeControl.isExpanded(node) ? 'chevrondown' : 'chevronright'"></eui-icon>
-                  </button>
-                  <button mat-button class="tree-item-button" data-imx-identifier="sidenav-tree-parent-select" (click)="selectNode(node)">
-                    <ng-container *ngTemplateOutlet="treeNodeTemplate; context: { $implicit: node, selected: isSelected(node)}"></ng-container>
-                  </button>
-                </div>
-                <div [class.tree-invisible]="!treeControl.isExpanded(node)" role="group">
-                  <ng-container matTreeNodeOutlet></ng-container>
-                </div>
+              <div class="mat-tree-node" [ngClass]="{ 'mat-tree-node--selected': isSelected(node) }">
+                <button mat-button matTreeNodeToggle class="mat-icon-button" [attr.aria-label]="'#LDS#Expand' | translate" data-imx-identifier="sidenav-tree-parent-toggle">
+                  <eui-icon size="s" [icon]="treeControl.isExpanded(node) ? 'chevrondown' : 'chevronright'"></eui-icon>
+                </button>
+                <button mat-button class="tree-item-button" data-imx-identifier="sidenav-tree-parent-select" (click)="selectNode(node)">
+                  <ng-container *ngTemplateOutlet="treeNodeTemplate; context: { $implicit: node, selected: isSelected(node) }"></ng-container>
+                </button>
+              </div>
+              <div [class.tree-invisible]="!treeControl.isExpanded(node)" role="group">
+                <ng-container matTreeNodeOutlet></ng-container>
+              </div>
             </mat-nested-tree-node>
           </mat-tree>
         </mat-card>
 
         <!-- Dynamic tree -->
-        <mat-card *ngIf="dynamicDataSource" class="snavigation-side-content" [ngClass]="{ 'snavigation-side-content--center': initializingData || !hasData}">
+        <mat-card *ngIf="dynamicDataSource && sideNavExpanded" class="snavigation-side-content" [ngClass]="{ 'snavigation-side-content--center': initializingData || !hasData }">
           <mat-spinner *ngIf="initializingData" [diameter]="100" [attr.aria-label]="'#LDS#Loading...' | translate"></mat-spinner>
           <div *ngIf="!initializingData && !hasData" class="imx-no-data">
             <eui-icon icon="content-alert"></eui-icon>
-            <span>{{noResultText | translate}}</span>
+            <span>{{ noResultText | translate }}</span>
           </div>
           <mat-tree *ngIf="!initializingData" [dataSource]="dynamicDataSource" [treeControl]="treeControl" class="tree">
             <mat-tree-node *matTreeNodeDef="let node" matTreeNodePadding matTreeNodePaddingIndent="20">
@@ -112,13 +111,7 @@ <h3 class="rotate-90">{{ headerText }}</h3>
 
             <mat-tree-node *matTreeNodeDef="let node; when: hasChild" matTreeNodePadding matTreeNodePaddingIndent="20">
               <div class="mat-tree-node" [ngClass]="{ 'mat-tree-node--selected': isSelected(node) }">
-                <button
-                  mat-button
-                  matTreeNodeToggle
-                  class="mat-icon-button"
-                  [attr.aria-label]="'#LDS#Expand' | translate"
-                  data-imx-identifier="sidenav-tree-parent-toggle"
-                >
+                <button mat-button matTreeNodeToggle class="mat-icon-button" [attr.aria-label]="'#LDS#Expand' | translate" data-imx-identifier="sidenav-tree-parent-toggle">
                   <eui-icon size="s" [icon]="treeControl.isExpanded(node) ? 'chevrondown' : 'chevronright'"></eui-icon>
                 </button>
                 <button mat-button color="primary" class="tree-item-button" data-imx-identifier="sidenav-tree-parent-select" (click)="selectNode(node)">
diff --git a/imxweb/projects/qbm/src/lib/sqlwizard/sqlwizard.component.ts b/imxweb/projects/qbm/src/lib/sqlwizard/sqlwizard.component.ts
index 85155ede6..f65f2f930 100644
--- a/imxweb/projects/qbm/src/lib/sqlwizard/sqlwizard.component.ts
+++ b/imxweb/projects/qbm/src/lib/sqlwizard/sqlwizard.component.ts
@@ -36,8 +36,8 @@ import { MatButtonToggleChange } from '@angular/material/button-toggle';
   selector: 'imx-sqlwizard',
 })
 export class SqlWizardComponent implements OnInit, OnChanges, AfterViewInit {
-  public readonly andConditionLabel = '#LDS#ALL';
-  public readonly orConditionLabel = '#LDS#ANY';
+  public readonly andConditionLabel = '#LDS#Condition_And';
+  public readonly orConditionLabel = '#LDS#Condition_Or';
 
   public LogOp = _logOp;
   public viewSettings: SqlViewSettings;
diff --git a/imxweb/projects/qer-app-operationssupport/ToDo.txt b/imxweb/projects/qer-app-operationssupport/ToDo.txt
deleted file mode 100644
index 7650f4c0a..000000000
--- a/imxweb/projects/qer-app-operationssupport/ToDo.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-+----------------------------------------------------------
-| ToDo
-+----------------------------------------------------------
-
-* Logout gibt es derzeit nicht auf dem API-Server (Endpoint kommt noch)
-* Starling-Seite prüfen (zur Zeit gibt es keinen richtigen Nutzer hierfür auf der Datenbank)
-* Sachen aus dem Ordner QER gehen noch nicht
-* einige Client-Calls wurden noch nicht typisiert und sind daher nur via Client.ts verfügbar (nicht aufgabe des Ops)
-* Components einbinden
-    * Dialog-Zeug
-* Grids auf das neue umstellen
-    * Service muss in einzelne Klassen umgestellt werden, damit die GridFunktion klappt
-    * bessere Lösung für die BaseURL des Clients suchen, noch muss sie explizit in der appconfig angegeben werden
-    * grid noch einmal neu stylen (aber erst in einem späteren Schritt)
-* TypedClient aus einem Package installieren, statt es wie jetzt manuell hinzuzufügen
-* Styles aus der alten Welt übernehmen
-
-+----------------------------------------------------------
-| Done
-+----------------------------------------------------------
-
-* Datenbankaufrufe werden mit dem Client/TypedClient gemacht
-* Fehler-Handling repariert
\ No newline at end of file
diff --git a/imxweb/projects/qer/src/lib/new-request/new-request-add-to-cart.service.ts b/imxweb/projects/qer/src/lib/new-request/new-request-add-to-cart.service.ts
index 159865594..7f9f4c199 100644
--- a/imxweb/projects/qer/src/lib/new-request/new-request-add-to-cart.service.ts
+++ b/imxweb/projects/qer/src/lib/new-request/new-request-add-to-cart.service.ts
@@ -50,6 +50,7 @@ import { SelectedProductSource } from './new-request-selected-products/selected-
 import { NewRequestOrchestrationService } from './new-request-orchestration.service';
 import { NewRequestSelectionService } from './new-request-selection.service';
 import { RecipientsWrapper } from '../product-selection/recipients-wrapper';
+import { UserModelService } from '../user/user-model.service';
 
 // TODO: not used anymore - can be removed
 @Injectable({
@@ -74,6 +75,7 @@ export class NewRequestAddToCartService {
     private readonly snackbar: SnackBarService,
     private readonly sidesheetService: EuiSidesheetService,
     private readonly translate: TranslateService,
+    private readonly userModelService: UserModelService,
   ) {}
 
   public async addItemsToCart(): Promise<void> {
@@ -108,6 +110,7 @@ export class NewRequestAddToCartService {
         parameters: [this.savedItems],
       });
     }
+    await this.userModelService.reloadPendingItems();
 
     this.selectionService.clearProducts();
   }
diff --git a/imxweb/projects/qer/src/lib/new-request/new-request-global.scss b/imxweb/projects/qer/src/lib/new-request/new-request-global.scss
index e8e87dd69..e1e1bdd19 100644
--- a/imxweb/projects/qer/src/lib/new-request/new-request-global.scss
+++ b/imxweb/projects/qer/src/lib/new-request/new-request-global.scss
@@ -44,7 +44,7 @@
     height: 100%;
     display: flex;
     padding: 16px 24px;
-    row-gap: 10px;
+    row-gap: 16px;
     column-gap: 24px;
     overflow: hidden;
 
@@ -94,7 +94,7 @@
 
 
 @mixin Table-Styles {
-  :host {    
+  :host {
     img {
       width: 32px;
       height: auto;
@@ -104,7 +104,7 @@
       font-size: 32px;
       line-height: 32px;
     }
- 
+
     .imx-progress-bar {
       display: flex;
       column-gap: 5px;
@@ -167,7 +167,7 @@
         tr.mat-row:hover .imx-request-col-status {
           color: $color-gray-100;
         }
-      }    
+      }
 
       imx-data-table ::ng-deep {
         margin: 10px;
@@ -180,7 +180,7 @@
         tr.mat-row.imx-data-table-row-highlighted .imx-request-col-status {
           color: $color-gray-100;
         }
-      }    
+      }
 
       .imx-request-col-text, .imx-request-col-status {
         color: $color-gray-0;
diff --git a/imxweb/projects/qer/src/lib/new-request/new-request-product/new-request-product.component.html b/imxweb/projects/qer/src/lib/new-request/new-request-product/new-request-product.component.html
index 999d030d6..ae647603f 100644
--- a/imxweb/projects/qer/src/lib/new-request/new-request-product/new-request-product.component.html
+++ b/imxweb/projects/qer/src/lib/new-request/new-request-product/new-request-product.component.html
@@ -1,91 +1,105 @@
-<ng-container *ngIf="serviceCategoriesTotalCount > 0 || serviceCategoriesTotalCount === -1; else noAccessToServiceCategory">
-  <imx-sidenav-tree
-    [dynamicDataSource]="dynamicDataSource"
-    [treeControl]="categoryTreeControl"
-    [hasChild]="hasChild"
-    [isLoading]="isLoading"
-    [headerText]="'#LDS#Heading Service Categories' | translate"
-    [nodeContent]="categoryNodeContent"
-    [expandWidth]="'600px'"
-    [sideNavExpanded]="categorySideNavExpanded"
-    [manageExpandedExternally]="true"
-    (sideNavExpandedChange)="categoryObserveExpanded($event)"
-    (selectedNode)="categorySelectedNode($event)"
-  ></imx-sidenav-tree>
-</ng-container>
-<ng-template #categoryNodeContent let-node let-selected="selected">
-  <div class="imx-tree-root" [ngClass]="{'imx-tree-root--selected': selected}">
-    <img class="image-category" *ngIf="node?.entity?.ImageRef?.value?.length > 0; else noImage" [src]="productDetailsService.getProductImage(node.entity)" />
-    <ng-template #noImage>
-      <eui-icon icon="folder" class="colored-icon"></eui-icon>
-    </ng-template>
-    &nbsp;&nbsp;
-    <span *ngIf="node.entity">
-      {{ node.entity.GetEntity().GetDisplay() }}
-    </span>
-    <span *ngIf="!node.entity">
-      {{'#LDS#Root category (all products)' | translate}}
-    </span>
-  </div>
-</ng-template>
-<mat-card class="imx-card-container" *ngIf="serviceCategoriesTotalCount > 0" [ngClass]="{'imx-card-container-wide': !categorySideNavExpanded}">
-  <imx-data-table
-    *ngIf="dst"
-    [dst]="dst"
-    [detailViewVisible]="false"
-    [selectable]="true"
-    [noDataText]="noDataText"
-    mode="manual"
-    fallbackIcon="DefaultTypeNameImage"
-    (selectionChanged)="onSelectionChanged($event)"
-    (highlightedEntityChanged)="onRowSelected($event)"
-    [showSelectedItemsMenu]="false"
-  >
-    <imx-data-table-column [entityColumn]="productApi.entitySchema?.Columns[DisplayColumns.DISPLAY_PROPERTYNAME]" columnLabel="{{ '#LDS#Product' | translate }}">
-      <ng-template let-prod>
-        <div class="imx-request-col-image">
-          <img *ngIf="productDetailsService.getProductImage(prod); else noImage" [src]="productDetailsService.getProductImage(prod)" />
-          <ng-template #noImage>
-            <eui-icon icon="application" class="larger-icon colored-icon"></eui-icon>
-          </ng-template>
-          &nbsp;&nbsp;
-          <span class="imx-request-col-display"  [matTooltip]="prod.GetEntity()?.GetDisplay()">{{ prod.GetEntity()?.GetDisplay() }} </span>
-        </div>
-      </ng-template>
-    </imx-data-table-column>
-    <imx-data-table-column [entityColumn]="productApi.entitySchema?.Columns['ServiceCategoryFullPath']">
-      <ng-template let-prod>
-        <div class="imx-request-col-text" [matTooltip]="prod.ServiceCategoryFullPath?.Column.GetDisplayValue()">
-          {{ prod.ServiceCategoryFullPath?.Column.GetDisplayValue() }}
-        </div>
-      </ng-template>
-    </imx-data-table-column>
-    <imx-data-table-column [entityColumn]="productApi.entitySchema?.Columns['Description']">
-      <ng-template let-prod>
-        <div class="imx-request-col-text imx-request-col-text-long" [matTooltip]="prod.GetEntity().GetColumn('Description').GetDisplayValue()">
-          {{ prod.GetEntity().GetColumn('Description').GetDisplayValue() }}
-        </div>
-      </ng-template>
-    </imx-data-table-column>
-    <imx-data-table-column [entityColumn]="productApi.entitySchema?.Columns['OrderableStatus']" columnLabel="{{ '#LDS#Status' | translate }}" align="center">
-      <ng-template let-prod>
-        <div *ngIf="productDetailsService.valueContains(prod.OrderableStatus?.value, ['PERSONHASOBJECT', 'PERSONHASASSIGNMENTORDER', 'ASSIGNED'])" class="imx-request-col-status">
-          <eui-icon icon="approvals" [matTooltip]="'#LDS#This product has already been assigned to {0}.' | translate | ldsReplace: recipients.Column.GetDisplayValue()"></eui-icon>
-        </div>
-        <div *ngIf="productDetailsService.valueContains(prod.OrderableStatus?.value, 'ORDER')" class="imx-request-col-status">
-          <eui-icon icon="request" [matTooltip]="'#LDS#This product has already been requested.' | translate"></eui-icon>
-        </div>
-        <div *ngIf="productDetailsService.valueContains(prod.OrderableStatus?.value, 'NOTORDERABLE')" class="imx-request-col-status">
-          <eui-icon icon="error" [matTooltip]="'#LDS#This product cannot currently be requested.' | translate"></eui-icon>
-        </div>
-        <div *ngIf="productDetailsService.valueContains(prod.OrderableStatus?.value, 'CART')" class="imx-request-col-status">
-          <eui-icon icon="cart" [matTooltip]="'#LDS#This product is already in your shopping cart.' | translate"></eui-icon>
-        </div>
+<div class="imx-chip-container" *ngIf="resetSidenav && (selectedServiceItemUID || selectedServiceCategoryUID)">
+  <mat-chip-list>
+    <span translate>#LDS#Filter on</span>:
+    <mat-chip (click)="onResetTree()">
+      <span class="chip-label">{{ '#LDS#URL' | translate }}</span>
+      <eui-icon class="remove" icon="stop"> </eui-icon>
+    </mat-chip>
+  </mat-chip-list>
+</div>
+<div class="imx-new-request-container">
+  <ng-container *ngIf="serviceCategoriesTotalCount > 0 || serviceCategoriesTotalCount === -1 || resetSidenav; else noAccessToServiceCategory">
+    <imx-sidenav-tree
+      [dynamicDataSource]="dynamicDataSource"
+      [treeControl]="categoryTreeControl"
+      [hasChild]="hasChild"
+      [isLoading]="isLoading"
+      [headerText]="'#LDS#Heading Service Categories' | translate"
+      [nodeContent]="categoryNodeContent"
+      [expandWidth]="'600px'"
+      [sideNavExpanded]="categorySideNavExpanded"
+      [manageExpandedExternally]="true"
+      (sideNavExpandedChange)="categoryObserveExpanded($event)"
+      (selectedNode)="categorySelectedNode($event)"
+    ></imx-sidenav-tree>
+  </ng-container>
+  <ng-template #categoryNodeContent let-node let-selected="selected">
+    <div class="imx-tree-root" [ngClass]="{ 'imx-tree-root--selected': selected }">
+      <img class="image-category" *ngIf="node?.entity?.ImageRef?.value?.length > 0; else noImage" [src]="productDetailsService.getProductImage(node.entity)" />
+      <ng-template #noImage>
+        <eui-icon icon="folder" class="colored-icon"></eui-icon>
       </ng-template>
-    </imx-data-table-column>
-  </imx-data-table>
-  <imx-data-source-paginator *ngIf="dst" [dst]="dst"></imx-data-source-paginator>
-</mat-card>
+      &nbsp;&nbsp;
+      <span *ngIf="node.entity">
+        {{ node.entity.GetEntity().GetDisplay() }}
+      </span>
+      <span *ngIf="!node.entity">
+        {{ '#LDS#Root category (all products)' | translate }}
+      </span>
+    </div>
+  </ng-template>
+  <mat-card class="imx-card-container" *ngIf="serviceCategoriesTotalCount > 0 || resetSidenav" [ngClass]="{ 'imx-card-container-wide': !categorySideNavExpanded }">
+    <imx-data-table
+      *ngIf="dst"
+      [dst]="dst"
+      [detailViewVisible]="false"
+      [selectable]="true"
+      [noDataText]="noDataText"
+      mode="manual"
+      fallbackIcon="DefaultTypeNameImage"
+      (selectionChanged)="onSelectionChanged($event)"
+      (highlightedEntityChanged)="onRowSelected($event)"
+      [showSelectedItemsMenu]="false"
+    >
+      <imx-data-table-column [entityColumn]="productApi.entitySchema?.Columns[DisplayColumns.DISPLAY_PROPERTYNAME]" columnLabel="{{ '#LDS#Product' | translate }}">
+        <ng-template let-prod>
+          <div class="imx-request-col-image">
+            <img *ngIf="productDetailsService.getProductImage(prod); else noImage" [src]="productDetailsService.getProductImage(prod)" />
+            <ng-template #noImage>
+              <eui-icon icon="application" class="larger-icon colored-icon"></eui-icon>
+            </ng-template>
+            &nbsp;&nbsp;
+            <span class="imx-request-col-display" [matTooltip]="prod.GetEntity()?.GetDisplay()">{{ prod.GetEntity()?.GetDisplay() }} </span>
+          </div>
+        </ng-template>
+      </imx-data-table-column>
+      <imx-data-table-column [entityColumn]="productApi.entitySchema?.Columns['ServiceCategoryFullPath']">
+        <ng-template let-prod>
+          <div class="imx-request-col-text" [matTooltip]="prod.ServiceCategoryFullPath?.Column.GetDisplayValue()">
+            {{ prod.ServiceCategoryFullPath?.Column.GetDisplayValue() }}
+          </div>
+        </ng-template>
+      </imx-data-table-column>
+      <imx-data-table-column [entityColumn]="productApi.entitySchema?.Columns['Description']">
+        <ng-template let-prod>
+          <div class="imx-request-col-text imx-request-col-text-long" [matTooltip]="prod.GetEntity().GetColumn('Description').GetDisplayValue()">
+            {{ prod.GetEntity().GetColumn('Description').GetDisplayValue() }}
+          </div>
+        </ng-template>
+      </imx-data-table-column>
+      <imx-data-table-column [entityColumn]="productApi.entitySchema?.Columns['OrderableStatus']" columnLabel="{{ '#LDS#Status' | translate }}" align="center">
+        <ng-template let-prod>
+          <div *ngIf="productDetailsService.valueContains(prod.OrderableStatus?.value, ['PERSONHASOBJECT', 'PERSONHASASSIGNMENTORDER', 'ASSIGNED'])" class="imx-request-col-status">
+            <eui-icon
+              icon="approvals"
+              [matTooltip]="'#LDS#This product has already been assigned to {0}.' | translate | ldsReplace : recipients.Column.GetDisplayValue()"
+            ></eui-icon>
+          </div>
+          <div *ngIf="productDetailsService.valueContains(prod.OrderableStatus?.value, 'ORDER')" class="imx-request-col-status">
+            <eui-icon icon="request" [matTooltip]="'#LDS#This product has already been requested.' | translate"></eui-icon>
+          </div>
+          <div *ngIf="productDetailsService.valueContains(prod.OrderableStatus?.value, 'NOTORDERABLE')" class="imx-request-col-status">
+            <eui-icon icon="error" [matTooltip]="'#LDS#This product cannot currently be requested.' | translate"></eui-icon>
+          </div>
+          <div *ngIf="productDetailsService.valueContains(prod.OrderableStatus?.value, 'CART')" class="imx-request-col-status">
+            <eui-icon icon="cart" [matTooltip]="'#LDS#This product is already in your shopping cart.' | translate"></eui-icon>
+          </div>
+        </ng-template>
+      </imx-data-table-column>
+    </imx-data-table>
+    <imx-data-source-paginator *ngIf="dst" [dst]="dst"></imx-data-source-paginator>
+  </mat-card>
+</div>
 
 <!-- Template if the new request page is not accessible for the current recipient -->
 <ng-template #noAccessToServiceCategory>
diff --git a/imxweb/projects/qer/src/lib/new-request/new-request-product/new-request-product.component.scss b/imxweb/projects/qer/src/lib/new-request/new-request-product/new-request-product.component.scss
index ad3c84e43..3ada2bf05 100644
--- a/imxweb/projects/qer/src/lib/new-request/new-request-product/new-request-product.component.scss
+++ b/imxweb/projects/qer/src/lib/new-request/new-request-product/new-request-product.component.scss
@@ -1,10 +1,33 @@
 @import '@elemental-ui/core/src/styles/_eui_palette.scss';
 @import '../new-request-global.scss';
 
+
 @include Layout-Styles;
 @include Table-Styles;
-
 :host {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+
+  .imx-new-request-container{
+    height: 100%;
+    display: flex;
+    row-gap: 10px;
+    column-gap: 24px;
+    overflow: hidden;
+  }
+
+  .imx-chip-container{
+    margin-left: 4px;
+    .chip-label{
+      font-size: 13px;
+    }
+    eui-icon{
+      font-size: 18px;
+      margin-right: -10px;
+    }
+  }
+
   .imx-tree-root {
     display: flex;
     align-items: center;
diff --git a/imxweb/projects/qer/src/lib/new-request/new-request-product/new-request-product.component.ts b/imxweb/projects/qer/src/lib/new-request/new-request-product/new-request-product.component.ts
index 2f19bd2b9..aac6b307f 100644
--- a/imxweb/projects/qer/src/lib/new-request/new-request-product/new-request-product.component.ts
+++ b/imxweb/projects/qer/src/lib/new-request/new-request-product/new-request-product.component.ts
@@ -27,7 +27,7 @@
 import { FlatTreeControl } from '@angular/cdk/tree';
 import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
 import { PortalServicecategories, PortalShopServiceitems } from 'imx-api-qer';
-import { CollectionLoadParameters, DisplayColumns, IClientProperty, IWriteValue, MultiValue } from 'imx-qbm-dbts';
+import { CollectionLoadParameters, CompareOperator, DisplayColumns, IClientProperty, IWriteValue, MultiValue } from 'imx-qbm-dbts';
 import {
   Busy,
   BusyService,
@@ -47,6 +47,8 @@ import { SelectedProductSource } from '../new-request-selected-products/selected
 import { ProductDetailsService } from './product-details-sidesheet/product-details.service';
 import { NewRequestSelectionService } from '../new-request-selection.service';
 import { CurrentProductSource } from '../current-product-source';
+import { ActivatedRoute } from '@angular/router';
+import { skip } from 'rxjs/operators';
 
 export interface NewRequestCategoryNode {
   isSelected?: boolean;
@@ -81,20 +83,32 @@ export class NewRequestProductComponent implements OnInit, OnDestroy {
   public displayedProductColumns: IClientProperty[];
   public recipients: IWriteValue<string>;
   public serviceCategoriesTotalCount = -1;
+  public resetSidenav = false;
+  public selectedServiceCategoryUID: string;
+  public selectedServiceItemUID: string;
 
   public categoryTreeControl = new FlatTreeControl<NewRequestCategoryNode>(
     (leaf) => leaf.level,
-    (leaf) => leaf.entity.HasChildren.Column.GetValue()
+    (leaf) => leaf.entity.HasChildren.Column.GetValue(),
   );
   public apiControls: DynamicDataApiControls<NewRequestCategoryNode> = {
     setup: async () => {
       // We only expect a single root node
-      const userParams = {
+      let userParams: CollectionLoadParameters = {
         UID_Person: this.orchestration.recipients
           ? MultiValue.FromString(this.orchestration.recipients.value).GetValues().join(',')
           : undefined,
         ParentKey: '',
       };
+      if (this.selectedServiceCategoryUID && !this.resetSidenav) {
+        userParams.filter = [
+          {
+            ColumnName: 'UID_AccProductGroup',
+            CompareOp: CompareOperator.Equal,
+            Value1: this.selectedServiceCategoryUID,
+          },
+        ];
+      }
       const servicecategories = await this.categoryApi.get(userParams);
       this.serviceCategoriesTotalCount = servicecategories?.totalCount;
       const dstSettings: DataSourceToolbarSettings = {
@@ -232,7 +246,8 @@ export class NewRequestProductComponent implements OnInit, OnDestroy {
     private readonly logger: ClassloggerService,
     private readonly productDetailsService: ProductDetailsService,
     private readonly cd: ChangeDetectorRef,
-    private readonly busyService: BusyService
+    private readonly busyService: BusyService,
+    private readonly route: ActivatedRoute,
   ) {
     this.orchestration.selectedView = SelectedProductSource.AllProducts;
     this.orchestration.searchApi$.next(this.searchApi);
@@ -265,18 +280,18 @@ export class NewRequestProductComponent implements OnInit, OnDestroy {
                 this.orchestration.dstSettingsAllProducts = this.dstSettings;
               }
               this.busy.endBusy(true);
-            })
+            }),
           );
         }
-      })
+      }),
     );
 
     this.subscriptions.push(
-      this.orchestration.navigationState$.subscribe(async (navigation: CollectionLoadParameters | ServiceItemParameters) => {
+      this.orchestration.navigationState$.pipe(skip(1)).subscribe(async (navigation: CollectionLoadParameters | ServiceItemParameters) => {
         this.productNavigationState = navigation;
         this.updateDisplayedColumns(this.displayedProductColumns);
         await this.getProductData(true);
-      })
+      }),
     );
 
     this.subscriptions.push(
@@ -285,13 +300,13 @@ export class NewRequestProductComponent implements OnInit, OnDestroy {
           this.includeChildCategories = includeChilds;
           await this.getProductData();
         }
-      })
+      }),
     );
 
     this.subscriptions.push(
       this.selectionService.selectedProducts$.subscribe(() => {
         this.orchestration.preselectBySource(SelectedProductSource.AllProducts, this.dst);
-      })
+      }),
     );
 
     this.subscriptions.push(this.selectionService.selectedProductsCleared$.subscribe(() => this.dst?.clearSelection()));
@@ -303,12 +318,23 @@ export class NewRequestProductComponent implements OnInit, OnDestroy {
     this.productNavigationState = { StartIndex: 0 };
     this.orchestration.selectedCategory = null;
     this.updateDisplayedColumns(this.displayedProductColumns);
+
+    this.selectedServiceCategoryUID = this.route.snapshot.queryParams['serviceCategory'];
+    this.selectedServiceItemUID = this.route.snapshot.queryParams['serviceItem'];
+    let firstIteration = true;
     this.subscriptions.push(
       this.orchestration.recipients$.subscribe(async (recipients: IWriteValue<string>) => {
-        this.recipients = recipients;
         // if the recipients changes, update the service categories
-        await this.dynamicDataSource.setup(true);
-      })
+        this.recipients = recipients;
+        // if the serviceCategory or the serviceItem url param available load only the filtered data
+        if (firstIteration && (this.selectedServiceCategoryUID || this.selectedServiceItemUID)) {
+          this.setupSelection();
+          firstIteration = false;
+        } else {
+          this.dynamicDataSource.setup(true);
+          this.getProductData(true);
+        }
+      }),
     );
   }
 
@@ -320,9 +346,8 @@ export class NewRequestProductComponent implements OnInit, OnDestroy {
     this.categorySideNavExpanded = !expanded;
   }
 
-  public categorySelectedNode(node: NewRequestCategoryNode): void {
+  public async categorySelectedNode(node: NewRequestCategoryNode): Promise<void> {
     this.productNavigationState.StartIndex = 0;
-
     if (node.entity) {
       // This is a category
       let category = node?.entity?.GetEntity();
@@ -350,6 +375,16 @@ export class NewRequestProductComponent implements OnInit, OnDestroy {
     this.productDetailsService.showProductDetails(item, this.recipients);
   }
 
+  /**
+   * Reset the category tree and the product table to default.
+   */
+  public async onResetTree(): Promise<void> {
+    this.serviceCategoriesTotalCount = -1;
+    this.dynamicDataSource.setup(true);
+    this.resetSidenav = false;
+    this.categorySelectedNode({});
+  }
+
   private updateDisplayedColumns(displayedColumns: IClientProperty[]): void {
     if (this.dstSettings) {
       this.dstSettings.displayedColumns = displayedColumns;
@@ -400,4 +435,46 @@ export class NewRequestProductComponent implements OnInit, OnDestroy {
     }
     return parameters;
   }
+
+  private async setupSelection(): Promise<void> {
+    if (!!this.selectedServiceCategoryUID) {
+      this.setupSelectionByCategory();
+    } else if (!!this.selectedServiceItemUID) {
+      this.setupSelectionByProduct();
+    }
+  }
+
+  private async setupSelectionByCategory(): Promise<void> {
+    await this.dynamicDataSource.setup(true);
+    if (this.dynamicDataSource.data.length > 1) {
+      this.dynamicDataSource.setSelection(this.dynamicDataSource.data[1]);
+      this.categorySelectedNode(this.dynamicDataSource.data[1]);
+    } else {
+      this.dynamicDataSource.dataChange.next([]);
+    }
+    this.resetSidenav = true;
+  }
+
+  private async setupSelectionByProduct(): Promise<void> {
+    this.productNavigationState.filter = [
+      {
+        ColumnName: 'UID_AccProduct',
+        CompareOp: CompareOperator.Equal,
+        Value1: this.selectedServiceItemUID,
+      },
+    ];
+    try {
+      await this.getProductData();
+      if (this.dstSettings.dataSource.Data.length > 0) {
+        this.selectedServiceCategoryUID = this.dstSettings.dataSource.Data[0].GetEntity().GetColumn('UID_AccProductGroup').GetValue();
+        await this.dynamicDataSource.setup(true);
+        if (this.dynamicDataSource.data.length > 1) {
+          this.dynamicDataSource.setSelection(this.dynamicDataSource.data[1]);
+        }
+      }
+    } finally {
+      this.productNavigationState.filter = [];
+      this.resetSidenav = true;
+    }
+  }
 }
diff --git a/imxweb/projects/qer/src/lib/new-request/new-request-product/product-entitlements/product-entitlements.component.html b/imxweb/projects/qer/src/lib/new-request/new-request-product/product-entitlements/product-entitlements.component.html
index 225b06e67..eb286e093 100644
--- a/imxweb/projects/qer/src/lib/new-request/new-request-product/product-entitlements/product-entitlements.component.html
+++ b/imxweb/projects/qer/src/lib/new-request/new-request-product/product-entitlements/product-entitlements.component.html
@@ -1,9 +1,9 @@
 <imx-data-source-toolbar #dst data-imx-identifier="product-entitlements-dst" [settings]="dstSettings"
-[searchBoxText]="'#LDS#Search' | translate" (navigationStateChanged)="navigate($event)" [options]="[]">
+[options]="[]" [isDataSourceLocal]="true">
 </imx-data-source-toolbar>
 <imx-data-table #dataTable data-imx-identifier="product-entitlements-table" [dst]="dst" detailViewVisible="false"
 [noDataText]="'#LDS#There are currently no entitlements assigned.'|translate" mode="manual" [selectable]="false"
-[showSelectionInfo]="false">
+[showSelectionInfo]="false" >
 <imx-data-table-generic-column columnName="entitlementDisplay"
   [columnLabel]="entitySchema.Columns[DisplayColumns.DISPLAY_PROPERTYNAME].Display">
   <ng-template let-item>
@@ -16,3 +16,4 @@
   </ng-template>
 </imx-data-table-column>
 </imx-data-table>
+<imx-data-source-paginator data-imx-identifier="product-entitlements-paginator" [dst]="dst"></imx-data-source-paginator>
diff --git a/imxweb/projects/qer/src/lib/new-request/new-request-product/product-entitlements/product-entitlements.component.ts b/imxweb/projects/qer/src/lib/new-request/new-request-product/product-entitlements/product-entitlements.component.ts
index 022bb0147..a20af2183 100644
--- a/imxweb/projects/qer/src/lib/new-request/new-request-product/product-entitlements/product-entitlements.component.ts
+++ b/imxweb/projects/qer/src/lib/new-request/new-request-product/product-entitlements/product-entitlements.component.ts
@@ -33,7 +33,7 @@ import { ProductEntitlementApiService } from './product-entitlement-api.service'
 @Component({
   selector: 'imx-product-entitlements',
   templateUrl: './product-entitlements.component.html',
-  styleUrls: ['./product-entitlements.component.scss']
+  styleUrls: ['./product-entitlements.component.scss'],
 })
 export class ProductEntitlementsComponent implements OnInit {
   @Input() public uidAccProduct: string;
@@ -46,10 +46,7 @@ export class ProductEntitlementsComponent implements OnInit {
   public entitlementTypes: Map<string, string>;
   private displayColumns: ClientPropertyForTableColumns[];
 
-  constructor(
-    private readonly entitlementApi: ProductEntitlementApiService,
-    private readonly metadata: MetadataService,
-  ) {
+  constructor(private readonly entitlementApi: ProductEntitlementApiService, private readonly metadata: MetadataService) {
     this.entitySchema = entitlementApi.productEntitlementSchema;
     this.displayColumns = this.displayColumns = [
       {
@@ -57,12 +54,12 @@ export class ProductEntitlementsComponent implements OnInit {
         ColumnName: 'entitlementDisplay',
         Display: this.entitySchema.Columns[DisplayColumns.DISPLAY_PROPERTYNAME].Display,
       },
-      this.entitySchema.Columns.TargetEntitlement
+      this.entitySchema.Columns.TargetEntitlement,
     ];
-   }
+  }
 
   public ngOnInit(): void {
-    setTimeout(async () => await this.navigate())
+    setTimeout(async () => await this.navigate());
   }
 
   public async navigate(parameter?: CollectionLoadParameters): Promise<void> {
@@ -72,14 +69,19 @@ export class ProductEntitlementsComponent implements OnInit {
 
       this.entitlementTypes = new Map();
 
-      dataSource.Data.forEach(async item => {
+      dataSource.Data.forEach(async (item) => {
         this.entitlementTypes.set(item.GetEntity().GetKeys().toString(), await this.getTypeDescription(item));
       });
 
       this.dstSettings = {
         dataSource,
         entitySchema: this.entitySchema,
-        navigationState: parameter,
+        navigationState: parameter
+          ? parameter
+          : {
+              StartIndex: 0,
+              PageSize: 20,
+            },
         displayedColumns: this.displayColumns,
       };
     } finally {
@@ -92,5 +94,4 @@ export class ProductEntitlementsComponent implements OnInit {
     const metadata = await this.metadata.GetTableMetadata(objKey.TableName);
     return metadata.DisplaySingular;
   }
-
 }
diff --git a/imxweb/projects/qer/src/lib/object-hyperview/object-hyperview.component.ts b/imxweb/projects/qer/src/lib/object-hyperview/object-hyperview.component.ts
index e2c430a25..d7667e120 100644
--- a/imxweb/projects/qer/src/lib/object-hyperview/object-hyperview.component.ts
+++ b/imxweb/projects/qer/src/lib/object-hyperview/object-hyperview.component.ts
@@ -32,6 +32,7 @@ import { ObjectHyperviewService } from './object-hyperview.service';
 import { Subscription } from 'rxjs';
 import { ObjectHyperview } from './object-hyperview-interface';
 import { DbObjectKey } from 'imx-qbm-dbts';
+import { ProjectConfigurationService } from '../project-configuration/project-configuration.service';
 
 @Component({
   selector: 'imx-object-hyperview',
@@ -76,7 +77,10 @@ export class ObjectHyperviewComponent implements OnInit, OnChanges, OnDestroy {
   private navigationSubscriptions: Subscription;
   private hyperviewStates: ObjectHyperview[] = [];
 
-  constructor(private readonly objectHyperviewService: ObjectHyperviewService) {}
+  constructor(
+    private readonly objectHyperviewService: ObjectHyperviewService,
+    private readonly configService: ProjectConfigurationService
+  ) {}
 
   ngOnChanges(changes: SimpleChanges): void {
     if (!(changes.objectUid?.isFirstChange() || changes.hyperviewName?.isFirstChange()) && (changes.hyperviewName || changes.objectUid)) {
@@ -95,17 +99,20 @@ export class ObjectHyperviewComponent implements OnInit, OnChanges, OnDestroy {
 
   public async ngOnInit(): Promise<void> {
     //If the user has navigation permission subscribe to the selected event emitter and set hyperviewStates to initial state.
-    this.navigation.navigation = true;
-    this.navigationSubscriptions = this.selected.subscribe((shape) => {
-      const hyperviewObject = DbObjectKey.FromXml(shape.objectKey);
-      this.addHyperviewObject(hyperviewObject.TableName, hyperviewObject.Keys[0], this.selectedHyperviewIndex + 1);
-    });
-    this.hyperviewStates = [{ type: this.objectType, uid: this.objectUid, selected: true }];
+    const projectConfig = await this.configService.getConfig();
+    if (!projectConfig.DisableHyperViewNavigation) {
+      this.navigation.navigation = true;
+      this.navigationSubscriptions = this.selected.subscribe((shape) => {
+        const hyperviewObject = DbObjectKey.FromXml(shape.objectKey);
+        this.addHyperviewObject(hyperviewObject.TableName, hyperviewObject.Keys[0], this.selectedHyperviewIndex + 1);
+      });
+      this.hyperviewStates = [{ type: this.objectType, uid: this.objectUid, selected: true }];
+    }
     await this.reload();
   }
 
   public ngOnDestroy(): void {
-    this.navigationSubscriptions.unsubscribe();
+    this.navigationSubscriptions?.unsubscribe();
   }
 
   public onNavigationChanged($event: HyperViewNavigationEnum) {
diff --git a/imxweb/projects/qer/src/lib/product-selection/product-selection.component.ts b/imxweb/projects/qer/src/lib/product-selection/product-selection.component.ts
index 59e41c31c..dffc3f7df 100644
--- a/imxweb/projects/qer/src/lib/product-selection/product-selection.component.ts
+++ b/imxweb/projects/qer/src/lib/product-selection/product-selection.component.ts
@@ -722,7 +722,8 @@ export class ProductSelectionComponent implements OnInit, OnDestroy {
         parameters: [possibleItems - savedItems, possibleItems],
       });
     }
-    if (savedItems > 0) {
+    if (savedItems > 0) {      
+      await this.userModelSvc.reloadPendingItems();
       this.router.navigate(['shoppingcart']);
     } else {
       this.onDeselectAll();
diff --git a/imxweb/projects/qer/src/lib/request-history/itshop-request.ts b/imxweb/projects/qer/src/lib/request-history/itshop-request.ts
index 819d54cda..5cd0f9098 100644
--- a/imxweb/projects/qer/src/lib/request-history/itshop-request.ts
+++ b/imxweb/projects/qer/src/lib/request-history/itshop-request.ts
@@ -58,7 +58,9 @@ export class ItshopRequest extends PortalItshopRequests implements RequestParame
 
     const isAffectedEmployee = this.UID_PersonInserted.value === userUid || this.UID_PersonOrdered.value === userUid;
 
-    this.canProlongate = this.UiOrderState.value === 'Assigned' && isAffectedEmployee;
+    // If the user can unsubscribe, we consider that the user can also renew
+    this.canProlongate = this.UiOrderState.value === 'Assigned' && this.UnsubscribeRequestAllowed.value;
+    
     this.canCopyItems = this.UID_PersonInserted.value === userUid && this.CanCopy.value; 
     if (pwoData) {
       this.pwoData = pwoData;
diff --git a/imxweb/projects/qer/src/lib/request-history/request-action/request-action.service.ts b/imxweb/projects/qer/src/lib/request-history/request-action/request-action.service.ts
index 6d3ea2bb6..f73d1bc61 100644
--- a/imxweb/projects/qer/src/lib/request-history/request-action/request-action.service.ts
+++ b/imxweb/projects/qer/src/lib/request-history/request-action/request-action.service.ts
@@ -361,7 +361,8 @@ export class RequestActionService {
         success = true;
       } catch (error) {
         this.errorHandler.handleError(error);
-      } finally {
+      } finally {     
+        await this.userService.reloadPendingItems();
         setTimeout(() => this.busyService.hide(busyIndicator));
       }