diff --git a/nae.json b/nae.json
index 7a6220f30..1a5e6bf93 100644
--- a/nae.json
+++ b/nae.json
@@ -24,7 +24,7 @@
                 "enable": false,
                 "clientId": "dev-cluster-worker",
                 "redirectUrl": "http://localhost:8081/realms/netgrif-cloud-testing/protocol/openid-connect/auth",
-                "refreshUrl": "http://localhost:8800/api/auth/login",
+                "refreshUrl": "http://localhost:8080/api/auth/login",
                 "scopes": ["openid","email","profile","roles"]
             }
         },
diff --git a/projects/netgrif-components-core/src/lib/header/header-modes/abstract-header-mode.component.ts b/projects/netgrif-components-core/src/lib/header/header-modes/abstract-header-mode.component.ts
index 661b3cad4..1f5a89b70 100644
--- a/projects/netgrif-components-core/src/lib/header/header-modes/abstract-header-mode.component.ts
+++ b/projects/netgrif-components-core/src/lib/header/header-modes/abstract-header-mode.component.ts
@@ -1,6 +1,9 @@
 import {Component, Input} from '@angular/core';
 import {FormControl} from '@angular/forms';
-import {HeaderColumn} from '../models/header-column';
+import {HeaderColumn} from "../models/header-column";
+import {AbstractHeaderService} from "../abstract-header-service";
+import {HeaderSortingMode} from "../models/header-sorting-mode";
+import {HeaderMode} from "../models/header-mode";
 
 @Component({
     selector: 'ncc-abstract-header-mode',
@@ -13,6 +16,7 @@ export abstract class AbstractHeaderModeComponent {
     @Input() public indeterminate: boolean;
     @Input() public approvalFormControl: FormControl<boolean>;
     @Input() public typeApproval: string;
+    @Input() public headerService: AbstractHeaderService;
 
     constructor() {
     }
@@ -40,4 +44,13 @@ export abstract class AbstractHeaderModeComponent {
         }
         return true;
     }
+
+    public sortingPriority(header: HeaderColumn | null | undefined): number | null {
+        if (!header?.sortDirection || this.headerService.sortingMode === HeaderSortingMode.SINGLE || (this.headerService.sortingMode === HeaderSortingMode.COMBINED && this.headerService.headerState.mode === HeaderMode.SORT)) {
+            return null;
+        }
+
+        const index = this.headerService.headerState.selectedSorts.indexOf(header);
+        return index === -1 ? null : index + 1;
+    }
 }
diff --git a/projects/netgrif-components-core/src/lib/header/header-modes/edit-mode/abstract-edit-mode.component.ts b/projects/netgrif-components-core/src/lib/header/header-modes/edit-mode/abstract-edit-mode.component.ts
index 5abe3c761..d7ed5cc1c 100644
--- a/projects/netgrif-components-core/src/lib/header/header-modes/edit-mode/abstract-edit-mode.component.ts
+++ b/projects/netgrif-components-core/src/lib/header/header-modes/edit-mode/abstract-edit-mode.component.ts
@@ -1,5 +1,4 @@
-import {Component, Input, OnDestroy, OnInit} from '@angular/core';
-import {AbstractHeaderService} from '../../abstract-header-service';
+import {Component, OnDestroy, OnInit} from '@angular/core';
 import {HeaderColumn} from '../../models/header-column';
 import {FormControl} from '@angular/forms';
 import {map, startWith} from 'rxjs/operators';
@@ -9,7 +8,6 @@ import {orderBy} from 'natural-orderby';
 import {Observable, Subscription} from 'rxjs';
 import {LoggerService} from '../../../logger/services/logger.service';
 import {AbstractHeaderModeComponent} from '../abstract-header-mode.component';
-import {HeaderSortingMode} from '../../models/header-sorting-mode';
 
 export interface HeaderOption {
     groupTitle: string;
@@ -25,8 +23,6 @@ export abstract class AbstractEditModeComponent extends AbstractHeaderModeCompon
     public filterOptions: Array<Observable<Array<HeaderOption>>> = [];
     protected subHeader: Subscription;
 
-    @Input() public headerService: AbstractHeaderService;
-
     protected constructor(protected _translate: TranslateService,
                           protected _log: LoggerService) {
         super();
@@ -100,15 +96,6 @@ export abstract class AbstractEditModeComponent extends AbstractHeaderModeCompon
         this.headerService.applySelectedSorts();
     }
 
-    public sortingPriority(header: HeaderColumn | null | undefined): number | null {
-        if (!header?.sortDirection || this.headerService.sortingMode === HeaderSortingMode.SINGLE) {
-            return null;
-        }
-
-        const index = this.headerService.headerState.selectedSorts.indexOf(header);
-        return index === -1 ? null : index + 1;
-    }
-
     protected removeHiddenSorts(visibleHeaderCount: number): void {
         const visibleHeaders = new Set(this.headerService.headerState.selectedHeaders.slice(0, visibleHeaderCount));
         const hiddenSorts = this.headerService.headerState.selectedSorts
diff --git a/projects/netgrif-components-core/src/lib/header/header-modes/loading-mode/abstract-loading-mode.component.ts b/projects/netgrif-components-core/src/lib/header/header-modes/loading-mode/abstract-loading-mode.component.ts
index 93dbe316c..16f8cfad5 100644
--- a/projects/netgrif-components-core/src/lib/header/header-modes/loading-mode/abstract-loading-mode.component.ts
+++ b/projects/netgrif-components-core/src/lib/header/header-modes/loading-mode/abstract-loading-mode.component.ts
@@ -1,5 +1,4 @@
-import {Component, Input} from '@angular/core';
-import {AbstractHeaderService} from '../../abstract-header-service';
+import {Component} from '@angular/core';
 import {AbstractHeaderModeComponent} from '../abstract-header-mode.component';
 
 @Component({
@@ -8,9 +7,6 @@ import {AbstractHeaderModeComponent} from '../abstract-header-mode.component';
 })
 export abstract class AbstractLoadingModeComponent extends AbstractHeaderModeComponent {
 
-    @Input()
-    public headerService: AbstractHeaderService;
-
     constructor() {
         super();
     }
diff --git a/projects/netgrif-components-core/src/lib/header/header-modes/search-mode/abstract-search-mode.component.ts b/projects/netgrif-components-core/src/lib/header/header-modes/search-mode/abstract-search-mode.component.ts
index f11944649..47d810671 100644
--- a/projects/netgrif-components-core/src/lib/header/header-modes/search-mode/abstract-search-mode.component.ts
+++ b/projects/netgrif-components-core/src/lib/header/header-modes/search-mode/abstract-search-mode.component.ts
@@ -1,12 +1,9 @@
-import {Component, Input, OnDestroy, OnInit, Type} from '@angular/core';
-import {AbstractHeaderService} from '../../abstract-header-service';
+import {Component, OnDestroy, OnInit, Type} from '@angular/core';
 import {FormControl} from '@angular/forms';
 import {debounceTime, map} from 'rxjs/operators';
 import {UserValue} from '../../../data-fields/user-field/models/user-value';
-import {SideMenuService} from '../../../side-menu/services/side-menu.service';
 import {Subscription} from 'rxjs';
 import {AbstractHeaderModeComponent} from '../abstract-header-mode.component';
-import {UserListInjectedData} from '../../../side-menu/content-components/user-assign/model/user-list-injected-data';
 import {MatDialog} from '@angular/material/dialog';
 
 @Component({
@@ -24,9 +21,6 @@ export abstract class AbstractSearchModeComponent extends AbstractHeaderModeComp
 
     public formControls: Array<FormControl> = [];
 
-    @Input()
-    public headerService: AbstractHeaderService;
-
     constructor(protected _dialog: MatDialog) {
         super();
     }
diff --git a/projects/netgrif-components-core/src/lib/header/header-modes/sort-mode/abstract-sort-mode.component.ts b/projects/netgrif-components-core/src/lib/header/header-modes/sort-mode/abstract-sort-mode.component.ts
index f3be2741a..cba149092 100644
--- a/projects/netgrif-components-core/src/lib/header/header-modes/sort-mode/abstract-sort-mode.component.ts
+++ b/projects/netgrif-components-core/src/lib/header/header-modes/sort-mode/abstract-sort-mode.component.ts
@@ -1,5 +1,4 @@
-import {Component, Input} from '@angular/core';
-import {AbstractHeaderService} from '../../abstract-header-service';
+import {Component} from '@angular/core';
 import {Sort} from '@angular/material/sort';
 import {AbstractHeaderModeComponent} from '../abstract-header-mode.component';
 import {HeaderColumn} from "../../models/header-column";
@@ -11,9 +10,6 @@ import {HeaderColumn} from "../../models/header-column";
 })
 export abstract class AbstractSortModeComponent extends AbstractHeaderModeComponent {
 
-    @Input()
-    public headerService: AbstractHeaderService;
-
     constructor() {
         super();
     }
diff --git a/projects/netgrif-components-core/src/lib/user/services/user-preference.service.ts b/projects/netgrif-components-core/src/lib/user/services/user-preference.service.ts
index 1854f28de..ec4d48abf 100644
--- a/projects/netgrif-components-core/src/lib/user/services/user-preference.service.ts
+++ b/projects/netgrif-components-core/src/lib/user/services/user-preference.service.ts
@@ -100,7 +100,9 @@ export class UserPreferenceService implements OnDestroy {
     }
 
     public setHeadersAndSorts(viewId: string, headers: Array<string>, sorts?: Array<SortingHeader>): void {
-        this._preferences.sorts[viewId] = sorts;
+        if (!!sorts) {
+            this._preferences.sorts[viewId] = sorts;
+        }
         this.setHeaders(viewId, headers);
     }
 
diff --git a/projects/netgrif-components-core/src/lib/utility/tests/mocks/mock-user-resource.service.ts b/projects/netgrif-components-core/src/lib/utility/tests/mocks/mock-user-resource.service.ts
index 05f604f66..994956245 100644
--- a/projects/netgrif-components-core/src/lib/utility/tests/mocks/mock-user-resource.service.ts
+++ b/projects/netgrif-components-core/src/lib/utility/tests/mocks/mock-user-resource.service.ts
@@ -3,17 +3,22 @@ import {Observable, of} from 'rxjs';
 import {Preferences} from '../../../resources/interface/preferences';
 import {MessageResource} from '../../../resources/interface/message-resource';
 import {UserResource} from '../../../resources/interface/user-resource';
+import {PreferenceResource} from "../../../resources/interface/preference-resource";
 
 @Injectable()
 export class MockUserResourceService {
 
-    public getPreferences(): Observable<Preferences> {
+    public getPreferences(): Observable<PreferenceResource> {
         return of({
-            headers: {},
-            caseFilters: {},
-            taskFilters: {},
-            other: {},
-            sorts: {}
+            preferences: {
+                headers: {},
+                caseFilters: {},
+                taskFilters: {},
+                other: {},
+                sorts: {}
+            },
+            error: '',
+            message: ''
         });
     }
 
diff --git a/projects/netgrif-components/src/lib/header/header-modes/edit-mode/edit-mode.component.html b/projects/netgrif-components/src/lib/header/header-modes/edit-mode/edit-mode.component.html
index adeb035b8..269602ea9 100644
--- a/projects/netgrif-components/src/lib/header/header-modes/edit-mode/edit-mode.component.html
+++ b/projects/netgrif-components/src/lib/header/header-modes/edit-mode/edit-mode.component.html
@@ -1,9 +1,10 @@
 <div fxLayout="row" fxFlex="100" fxLayoutAlign="start center"
      class="netgrif-input netgrif-header-input netgrif-input-fix netgrif-zero-field-wrapper">
-    <mat-checkbox *ngIf="approval && typeApproval === 'multichoice'" [formControl]="approvalFormControl"
+    <mat-checkbox (keydown.enter)="$event.stopPropagation();" (keyup.enter)="$event.stopPropagation();" *ngIf="approval && typeApproval === 'multichoice'" [formControl]="approvalFormControl"
                   [indeterminate]="indeterminate"
                   (click)="$event.stopPropagation();" color='primary' class="checkbox-padding"></mat-checkbox>
     <mat-icon *ngIf="approval && typeApproval === 'enumeration'" color="warn"
+              (keydown.enter)="$event.stopPropagation();" (keyup.enter)="$event.stopPropagation();"
               (click)="setValue();$event.stopPropagation();" class="checkbox-padding cursor-fix">close
     </mat-icon>
     <span fxLayout="row" fxLayoutAlign="start center" fxFlex *ngFor="let header of this.headerService.selectedHeaders$ | async; let i = index" class="header-field-icon-container"
diff --git a/projects/netgrif-components/src/lib/header/header-modes/edit-mode/edit-mode.component.spec.ts b/projects/netgrif-components/src/lib/header/header-modes/edit-mode/edit-mode.component.spec.ts
index b1f837ca4..5c01dc008 100644
--- a/projects/netgrif-components/src/lib/header/header-modes/edit-mode/edit-mode.component.spec.ts
+++ b/projects/netgrif-components/src/lib/header/header-modes/edit-mode/edit-mode.component.spec.ts
@@ -28,7 +28,8 @@ import {
 } from '@netgrif/components-core';
 import {RouterTestingModule} from '@angular/router/testing';
 import {TranslateService} from '@ngx-translate/core';
-import {of, Subject} from 'rxjs';
+import {Observable, of, Subject} from "rxjs";
+import {MediaChange} from "@ngbracket/ngx-layout/core/media-change";
 
 describe('EditModeComponent', () => {
     let component: EditModeComponent;
diff --git a/projects/netgrif-components/src/lib/header/header-modes/sort-mode/sort-mode.component.html b/projects/netgrif-components/src/lib/header/header-modes/sort-mode/sort-mode.component.html
index 2f9e7f5ae..00cef343d 100644
--- a/projects/netgrif-components/src/lib/header/header-modes/sort-mode/sort-mode.component.html
+++ b/projects/netgrif-components/src/lib/header/header-modes/sort-mode/sort-mode.component.html
@@ -22,7 +22,7 @@
                               }">
                         {{ header?.sortDirection === 'asc' ? 'arrow_upward' : (header?.sortDirection === 'desc' ? 'arrow_downward' : 'swap_vert') }}
                     </mat-icon>
-                </button>
+                </button><sub *ngIf="sortingPriority(header) as priority" class="sort-priority">{{ priority }}</sub>
             </span>
         </ng-template>
         <ng-template #elseBlock>