diff --git a/web/src/app/administration/components/workbasket-list/workbasket-list.component.ts b/web/src/app/administration/components/workbasket-list/workbasket-list.component.ts
index 26b70777b..0890a23f5 100644
--- a/web/src/app/administration/components/workbasket-list/workbasket-list.component.ts
+++ b/web/src/app/administration/components/workbasket-list/workbasket-list.component.ts
@@ -10,7 +10,7 @@ import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.ser
 import { OrientationService } from 'app/shared/services/orientation/orientation.service';
 import { ImportExportService } from 'app/administration/services/import-export.service';
 import { Actions, ofActionCompleted, ofActionDispatched, Select, Store } from '@ngxs/store';
-import { takeUntil } from 'rxjs/operators';
+import { takeUntil, take } from 'rxjs/operators';
 import {
   DeselectWorkbasket,
   GetWorkbasketsSummary,
@@ -44,6 +44,7 @@ export class WorkbasketListComponent implements OnInit, OnDestroy {
   };
   requestInProgress: boolean;
   requestInProgressLocal = false;
+
   @Input() expanded: boolean;
 
   @ViewChild('wbToolbar', { static: true })
@@ -83,7 +84,6 @@ export class WorkbasketListComponent implements OnInit, OnDestroy {
 
   ngOnInit() {
     this.requestInProgressService.setRequestInProgress(true);
-
     this.selectedWorkbasket$.pipe(takeUntil(this.destroy$)).subscribe((selectedWorkbasket) => {
       if (typeof selectedWorkbasket !== 'undefined') {
         this.selectedId = selectedWorkbasket.workbasketId;
@@ -117,6 +117,7 @@ export class WorkbasketListComponent implements OnInit, OnDestroy {
       .getSelectedDomain()
       .pipe(takeUntil(this.destroy$))
       .subscribe((domain) => {
+        this.filterBy.domain = [domain];
         this.performRequest();
       });
 
@@ -157,7 +158,9 @@ export class WorkbasketListComponent implements OnInit, OnDestroy {
   }
 
   performFilter(filterBy: WorkbasketQueryFilterParameter) {
+    const domain = this.filterBy.domain;
     this.filterBy = filterBy;
+    this.filterBy.domain = domain;
     this.performRequest();
   }
 
diff --git a/web/src/app/shared/components/nav-bar/nav-bar.component.ts b/web/src/app/shared/components/nav-bar/nav-bar.component.ts
index bce0a4436..a1517f913 100644
--- a/web/src/app/shared/components/nav-bar/nav-bar.component.ts
+++ b/web/src/app/shared/components/nav-bar/nav-bar.component.ts
@@ -12,8 +12,6 @@ import { SidenavService } from '../../services/sidenav/sidenav.service';
 })
 export class NavBarComponent implements OnInit {
   selectedRoute = '';
-  title = '';
-
   titleWorkbaskets = 'Workbaskets';
   titleClassifications = 'Classifications';
   titleAccessItems = 'Access items';
@@ -21,6 +19,7 @@ export class NavBarComponent implements OnInit {
   titleWorkplace = 'Workplace';
   titleHistory = 'History';
   toggle: boolean = false;
+  title = this.titleWorkplace;
 
   selectedRouteSubscription: Subscription;
 
@@ -38,7 +37,7 @@ export class NavBarComponent implements OnInit {
     this.sidenavService.toggleSidenav();
   }
 
-  setTitle(value: string = 'workbaskets') {
+  setTitle(value: string = '') {
     if (value.indexOf('workbaskets') === 0) {
       this.title = this.titleWorkbaskets;
     } else if (value.indexOf('classifications') === 0) {
diff --git a/web/src/app/shared/components/sidenav-list/sidenav-list.component.ts b/web/src/app/shared/components/sidenav-list/sidenav-list.component.ts
index f4c4c4c69..feb3e2aa7 100644
--- a/web/src/app/shared/components/sidenav-list/sidenav-list.component.ts
+++ b/web/src/app/shared/components/sidenav-list/sidenav-list.component.ts
@@ -19,7 +19,7 @@ export class SidenavListComponent implements OnInit {
   accessUrl = 'taskana/administration/access-items-management';
   classificationUrl = 'taskana/administration/classifications';
   workbasketsUrl = 'taskana/administration/workbaskets';
-  administrationsUrl = 'taskana/administration';
+  administrationsUrl = 'taskana/administration/workbaskets';
 
   administrationAccess = false;
   monitorAccess = false;