diff --git a/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html b/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html
index 31e2e95ba..806818f86 100644
--- a/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html
+++ b/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html
@@ -173,7 +173,6 @@
                     <redaction-annotations-list
                         (deselectAnnotations)="deselectAnnotations.emit($event)"
                         (pagesPanelActive)="pagesPanelActive = $event"
-                        (selectAnnotations)="selectAnnotations.emit($event)"
                         [(multiSelectActive)]="multiSelectActive"
                         [activeViewerPage]="activeViewerPage"
                         [annotationActionsTemplate]="annotationActionsTemplate"
@@ -196,7 +195,7 @@
 <ng-template #annotationFilterActionTemplate let-filter="filter">
     <iqser-circle-button
         (action)="toggleSkipped.emit($event)"
-        *ngIf="filter.key === 'skipped'"
+        *ngIf="filter.id === 'skipped'"
         [icon]="hideSkipped ? 'red:visibility-off' : 'red:visibility'"
         [type]="circleButtonTypes.dark"
     ></iqser-circle-button>
diff --git a/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.ts b/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.ts
index a0fc2b05a..5370f44ed 100644
--- a/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.ts
@@ -8,7 +8,7 @@ import { FileDataModel } from '@models/file/file-data.model';
 import { PermissionsService } from '@services/permissions.service';
 import { WebViewerInstance } from '@pdftron/webviewer';
 import { BehaviorSubject, combineLatest, Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map, tap } from 'rxjs/operators';
 
 const COMMAND_KEY_ARRAY = ['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown', 'Escape'];
 const ALL_HOTKEY_ARRAY = ['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown'];
@@ -43,17 +43,19 @@ export class FileWorkloadComponent {
     @Output() readonly actionPerformed = new EventEmitter<string>();
     displayedPages: number[] = [];
     pagesPanelActive = true;
-    readonly displayedAnnotations$ = this._displayedAnnotations$;
+    private _annotations$ = new BehaviorSubject<AnnotationWrapper[]>([]);
     @ViewChild('annotationsElement') private readonly _annotationsElement: ElementRef;
     @ViewChild('quickNavigation') private readonly _quickNavigationElement: ElementRef;
-    private _annotations$ = new BehaviorSubject<AnnotationWrapper[]>([]);
+    readonly displayedAnnotations$: Observable<Map<number, AnnotationWrapper[]>>;
 
     constructor(
         private readonly _permissionsService: PermissionsService,
         private readonly _changeDetectorRef: ChangeDetectorRef,
         private readonly _filterService: FilterService,
         private readonly _annotationProcessingService: AnnotationProcessingService
-    ) {}
+    ) {
+        this.displayedAnnotations$ = this._displayedAnnotations$;
+    }
 
     @Input()
     set annotations(value: AnnotationWrapper[]) {
@@ -95,7 +97,8 @@ export class FileWorkloadComponent {
     private get _displayedAnnotations$(): Observable<Map<number, AnnotationWrapper[]>> {
         const primary$ = this._filterService.getFilterModels$('primaryFilters');
         const secondary$ = this._filterService.getFilterModels$('secondaryFilters');
-        return combineLatest([this._annotations$, primary$, secondary$]).pipe(
+
+        return combineLatest([this._annotations$.asObservable(), primary$, secondary$]).pipe(
             map(([annotations, primary, secondary]) => this._filterAnnotations(annotations, primary, secondary))
         );
     }
@@ -111,10 +114,6 @@ export class FileWorkloadComponent {
         }
     }
 
-    logAnnotation(annotation: AnnotationWrapper) {
-        console.log(annotation);
-    }
-
     pageHasSelection(page: number) {
         return this.multiSelectActive && !!this.selectedAnnotations?.find(a => a.pageNumber === page);
     }
diff --git a/apps/red-ui/src/app/modules/dossier/components/page-indicator/page-indicator.component.ts b/apps/red-ui/src/app/modules/dossier/components/page-indicator/page-indicator.component.ts
index 0ee4986c0..7e6cdf763 100644
--- a/apps/red-ui/src/app/modules/dossier/components/page-indicator/page-indicator.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/components/page-indicator/page-indicator.component.ts
@@ -1,9 +1,9 @@
-import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges } from '@angular/core';
-import { ViewedPages, ViewedPagesControllerService } from '@redaction/red-ui-http';
-import { AppStateService } from '@state/app-state.service';
-import { PermissionsService } from '@services/permissions.service';
-import { ConfigService } from '@services/config.service';
-import { Subscription } from 'rxjs';
+import {Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges} from '@angular/core';
+import {ViewedPages, ViewedPagesControllerService} from '@redaction/red-ui-http';
+import {AppStateService} from '@state/app-state.service';
+import {PermissionsService} from '@services/permissions.service';
+import {ConfigService} from '@services/config.service';
+import {Subscription} from 'rxjs';
 
 @Component({
     selector: 'redaction-page-indicator',
@@ -27,7 +27,8 @@ export class PageIndicatorComponent implements OnChanges, OnInit, OnDestroy {
         private readonly _appStateService: AppStateService,
         private readonly _configService: ConfigService,
         private readonly _permissionService: PermissionsService
-    ) {}
+    ) {
+    }
 
     get read() {
         return this.viewedPages?.pages?.findIndex(p => p.page === this.number) >= 0;
@@ -95,9 +96,9 @@ export class PageIndicatorComponent implements OnChanges, OnInit, OnDestroy {
 
     private _markPageRead() {
         this._viewedPagesControllerService
-            .addPage({ page: this.number }, this._appStateService.activeDossierId, this._appStateService.activeFileId)
-            .subscribe(page => {
-                this.viewedPages?.pages?.push(page);
+            .addPage({page: this.number}, this._appStateService.activeDossierId, this._appStateService.activeFileId)
+            .subscribe(() => {
+                this.viewedPages?.pages?.push({page: this.number, fileId: this._appStateService.activeFileId});
             });
     }
 
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.html b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.html
index 583a45ec0..d611abff6 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.html
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.html
@@ -198,7 +198,7 @@
 <ng-template #annotationFilterTemplate let-filter="filter">
     <redaction-type-filter *ngIf="filter.topLevelFilter" [filter]="filter"></redaction-type-filter>
     <ng-container *ngIf="!filter.topLevelFilter">
-        <redaction-dictionary-annotation-icon [dictionaryKey]="filter.key"></redaction-dictionary-annotation-icon>
-        {{ filter.key | humanize: false }}
+        <redaction-dictionary-annotation-icon [dictionaryKey]="filter.id"></redaction-dictionary-annotation-icon>
+        {{ filter.id | humanize: false }}
     </ng-container>
 </ng-template>
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts
index c87e48f9c..39ee44aa1 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts
@@ -289,6 +289,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
         this.annotationData = newAnnotationsData;
         const annotationFilters = this._annotationProcessingService.getAnnotationFilter(this.annotations);
         const primaryFilters = this._filterService.getGroup('primaryFilters')?.filters;
+        console.log(annotationFilters);
         this._filterService.addFilterGroup({
             slug: 'primaryFilters',
             filterTemplate: this._filterTemplate,
@@ -300,6 +301,8 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
             filterTemplate: this._filterTemplate,
             filters: processFilters(secondaryFilters, AnnotationProcessingService.secondaryAnnotationFilters)
         });
+        console.log(this.annotations);
+        console.log(this.appStateService.activeFile);
         console.log('[REDACTION] Process time: ' + (new Date().getTime() - processStartTime) + 'ms');
         console.log(
             '[REDACTION] Annotation Redraw and filter rebuild time: ' +
diff --git a/apps/red-ui/src/assets/config/config.json b/apps/red-ui/src/assets/config/config.json
index ada134004..4b4441fbb 100644
--- a/apps/red-ui/src/assets/config/config.json
+++ b/apps/red-ui/src/assets/config/config.json
@@ -1,7 +1,7 @@
 {
   "ADMIN_CONTACT_NAME": null,
   "ADMIN_CONTACT_URL": null,
-  "API_URL": "https://dom1.iqser.cloud/redaction-gateway-v1",
+  "API_URL": "https://dev-06.iqser.cloud/redaction-gateway-v1",
   "APP_NAME": "RedactManager",
   "AUTO_READ_TIME": 1.5,
   "BACKEND_APP_VERSION": "4.4.40",
@@ -17,7 +17,7 @@
   "MAX_RETRIES_ON_SERVER_ERROR": 3,
   "OAUTH_CLIENT_ID": "redaction",
   "OAUTH_IDP_HINT": null,
-  "OAUTH_URL": "https://dom1.iqser.cloud/auth/realms/redaction",
+  "OAUTH_URL": "https://dev-06.iqser.cloud/auth/realms/redaction",
   "RECENT_PERIOD_IN_HOURS": 24,
   "SELECTION_MODE": "structural"
 }
diff --git a/bamboo-specs/pom.xml b/bamboo-specs/pom.xml
index 8e3543b0f..b32dbf5f6 100644
--- a/bamboo-specs/pom.xml
+++ b/bamboo-specs/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.atlassian.bamboo</groupId>
     <artifactId>bamboo-specs-parent</artifactId>
-    <version>7.2.2</version>
+    <version>8.0.2</version>
     <relativePath/>
   </parent>
 
diff --git a/bamboo-specs/src/main/java/buildjob/PlanSpec.java b/bamboo-specs/src/main/java/buildjob/PlanSpec.java
index de26a8eea..b500cb1e7 100644
--- a/bamboo-specs/src/main/java/buildjob/PlanSpec.java
+++ b/bamboo-specs/src/main/java/buildjob/PlanSpec.java
@@ -94,7 +94,7 @@ public class PlanSpec {
                 // create tag with this version
                 new VcsTagTask().tagName("${bamboo.inject.APP_VERSION}").repository("RED / ui")
             ).dockerConfiguration(
-                new DockerConfiguration().image("nexus.iqser.com:5001/infra/release_build:2.9.1")
+                new DockerConfiguration().image("nexus.iqser.com:5001/infra/release_build:4.2.0")
                     .volume("/var/lib/docker", "/var/lib/docker")
                     .volume("/var/run/docker.sock", "/var/run/docker.sock"))
             .artifacts(new Artifact("version").location(".").copyPattern("**/version.properties").shared(true),
diff --git a/libs/common-ui b/libs/common-ui
index 1ab7d6bba..54eb8173c 160000
--- a/libs/common-ui
+++ b/libs/common-ui
@@ -1 +1 @@
-Subproject commit 1ab7d6bbad76ab82ce3582101d60cecb5494122b
+Subproject commit 54eb8173cf7ce35f29f4e9df309954bbd1cf7a5c
diff --git a/package.json b/package.json
index ca6fd11d3..debbba1aa 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "redaction",
-  "version": "2.241.0",
+  "version": "2.242.0",
   "private": true,
   "license": "MIT",
   "scripts": {
diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz
index aad1ae94a..e1fb9128d 100644
Binary files a/paligo-theme.tar.gz and b/paligo-theme.tar.gz differ