diff --git a/libs/rucken/web/src/lib/components/base/base-entity-list.component.ts b/libs/rucken/web/src/lib/components/base/base-entity-list.component.ts
index 1cd1c34a..d910c6c1 100644
--- a/libs/rucken/web/src/lib/components/base/base-entity-list.component.ts
+++ b/libs/rucken/web/src/lib/components/base/base-entity-list.component.ts
@@ -3,7 +3,7 @@ import { ErrorsExtractor, translate } from '@rucken/core';
 import { BsModalRef, BsModalService } from 'ngx-bootstrap/modal';
 import { IFactoryModel, IModel, Repository, PaginationMeta, IPaginationMeta } from 'ngx-repository';
 import { forkJoin, Observable } from 'rxjs';
-import { first, map } from 'rxjs/operators';
+import { first } from 'rxjs/operators';
 import { IBaseEntityListModal } from '../base/base-entity-list-modal.interface';
 import { MessageModalService } from '../modals/message-modal/message-modal.service';
 import { IEntityGridFilter } from '../others/entity-grid/entity-grid-filter.interface';
@@ -99,6 +99,12 @@ export class BaseEntityListComponent<TModel extends IModel>
       .pipe(first())
       .subscribe(items => this.onSuccess(items), error => this.onError(error));
   }
+  onSearch(searchText: string) {
+    this.onChangeFilter({ searchText });
+  }
+  onChangeOrder(fieldName: string) {
+    this.onChangeFilter({ sort: fieldName });
+  }
   onSuccess(items: TModel[]) {
     this.processing = false;
   }
diff --git a/libs/rucken/web/src/lib/components/entities/content-type/content-type-select/content-type-select.component.html b/libs/rucken/web/src/lib/components/entities/content-type/content-type-select/content-type-select.component.html
index 95966dcd..d66daf95 100644
--- a/libs/rucken/web/src/lib/components/entities/content-type/content-type-select/content-type-select.component.html
+++ b/libs/rucken/web/src/lib/components/entities/content-type/content-type-select/content-type-select.component.html
@@ -1,6 +1,6 @@
 <entity-select
     [readonly]="readonly"
     [searchField]="searchField"
-    (search)="onChangeFilter({searchText:$event})">
+    (search)="onSearch($event)">
     <ng-content></ng-content>
 </entity-select>
diff --git a/libs/rucken/web/src/lib/components/entities/content-type/content-types-grid/content-types-grid.component.html b/libs/rucken/web/src/lib/components/entities/content-type/content-types-grid/content-types-grid.component.html
index 633a4992..dcfd1ec6 100644
--- a/libs/rucken/web/src/lib/components/entities/content-type/content-types-grid/content-types-grid.component.html
+++ b/libs/rucken/web/src/lib/components/entities/content-type/content-types-grid/content-types-grid.component.html
@@ -9,8 +9,8 @@
     (update)="onUpdateClick($event)"
     (delete)="onDeleteClick($event)"
     (view)="onViewClick($event)"
-    (search)="onChangeFilter({searchText:$event})"
-    (changeOrder)="onChangeFilter({sort:$event})"
+    (search)="onSearch($event)"
+    (changeOrder)="onChangeOrder($event)"
     [paginationMeta]="paginationMeta$ | async"
     [enableCreate]="'add_content-type' | perm:false | async"
     [enableUpdate]="'change_content-type' | perm:false | async"
diff --git a/libs/rucken/web/src/lib/components/entities/content-type/content-types-grid/content-types-grid.component.ts b/libs/rucken/web/src/lib/components/entities/content-type/content-types-grid/content-types-grid.component.ts
index d324fbda..12ab0473 100644
--- a/libs/rucken/web/src/lib/components/entities/content-type/content-types-grid/content-types-grid.component.ts
+++ b/libs/rucken/web/src/lib/components/entities/content-type/content-types-grid/content-types-grid.component.ts
@@ -1,11 +1,6 @@
 import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
-import {
-  ContentType,
-  ContentTypesConfig,
-  ErrorsExtractor,
-  translate
-} from '@rucken/core';
+import { ContentType, ContentTypesConfig, ErrorsExtractor, translate } from '@rucken/core';
 import { BsModalRef, BsModalService } from 'ngx-bootstrap/modal';
 import { DynamicRepository } from 'ngx-repository';
 import { BaseEntityListComponent } from '../../../base/base-entity-list.component';
diff --git a/libs/rucken/web/src/lib/components/entities/group/groups-grid/groups-grid.component.html b/libs/rucken/web/src/lib/components/entities/group/groups-grid/groups-grid.component.html
index 20ed8ca8..38c1f403 100644
--- a/libs/rucken/web/src/lib/components/entities/group/groups-grid/groups-grid.component.html
+++ b/libs/rucken/web/src/lib/components/entities/group/groups-grid/groups-grid.component.html
@@ -10,12 +10,12 @@
     (update)="onUpdateClick($event)"
     (delete)="onDeleteClick($event)"
     (view)="onViewClick($event)"
-    (search)="onChangeFilter({searchText:$event})"
+    (search)="onSearch($event)"
     [paginationMeta]="paginationMeta$ | async"
     [enableCreate]="'add_group' | perm:false | async"
     [enableUpdate]="'change_group' | perm:false | async"
     [enableDelete]="'delete_group' | perm:false | async"
     (changePage)="onChangePage($event)"
-    (changeOrder)="onChangeFilter({sort:$event})"
+    (changeOrder)="onChangeOrder($event)"
     [processing]="processing$ | async">
 </entity-grid>
diff --git a/libs/rucken/web/src/lib/components/entities/permission/permissions-grid/permissions-grid.component.html b/libs/rucken/web/src/lib/components/entities/permission/permissions-grid/permissions-grid.component.html
index e42f5a26..1f0e890b 100644
--- a/libs/rucken/web/src/lib/components/entities/permission/permissions-grid/permissions-grid.component.html
+++ b/libs/rucken/web/src/lib/components/entities/permission/permissions-grid/permissions-grid.component.html
@@ -10,12 +10,12 @@
     (update)="onUpdateClick($event)"
     (delete)="onDeleteClick($event)"
     (view)="onViewClick($event)"
-    (search)="onChangeFilter({searchText:$event})"
+    (search)="onSearch($event)"
     [paginationMeta]="paginationMeta$ | async"
     [enableCreate]="'add_permission' | perm:false | async"
     [enableUpdate]="'change_permission' | perm:false | async"
     [enableDelete]="'delete_permission' | perm:false | async"
     (changePage)="onChangePage($event)"
-    (changeOrder)="onChangeFilter({sort:$event})"
+    (changeOrder)="onChangeOrder($event)"
     [processing]="processing$ | async">
 </entity-grid>
diff --git a/libs/rucken/web/src/lib/components/entities/user/users-grid/users-grid.component.html b/libs/rucken/web/src/lib/components/entities/user/users-grid/users-grid.component.html
index fe434937..81a52810 100644
--- a/libs/rucken/web/src/lib/components/entities/user/users-grid/users-grid.component.html
+++ b/libs/rucken/web/src/lib/components/entities/user/users-grid/users-grid.component.html
@@ -9,8 +9,8 @@
     (update)="onUpdateClick($event)"
     (delete)="onDeleteClick($event)"
     (view)="onViewClick($event)"
-    (search)="onChangeFilter({searchText:$event})"
-    (changeOrder)="onChangeFilter({sort:$event})"
+    (search)="onSearch($event)"
+    (changeOrder)="onChangeOrder($event)"
     [paginationMeta]="paginationMeta$ | async"
     [enableCreate]="'add_user' | perm:false | async"
     [enableUpdate]="'change_user' | perm:false | async"
diff --git a/libs/rucken/web/src/lib/components/others/entity-grid/entity-grid.component.ts b/libs/rucken/web/src/lib/components/others/entity-grid/entity-grid.component.ts
index cb8f2848..4adee40c 100644
--- a/libs/rucken/web/src/lib/components/others/entity-grid/entity-grid.component.ts
+++ b/libs/rucken/web/src/lib/components/others/entity-grid/entity-grid.component.ts
@@ -1,14 +1,4 @@
-import {
-  ChangeDetectionStrategy,
-  Component,
-  ContentChild,
-  EventEmitter,
-  Input,
-  Output,
-  TemplateRef,
-  ViewContainerRef,
-  isDevMode
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, ContentChild, EventEmitter, Input, isDevMode, Output, TemplateRef, ViewContainerRef } from '@angular/core';
 import { FormControl } from '@angular/forms';
 import { translate } from '@rucken/core';
 import { IModel, PaginationMeta } from 'ngx-repository';
@@ -123,6 +113,7 @@ export class EntityGridComponent<TModel extends IModel> {
   get items() {
     return this._items;
   }
+
   @Output()
   delete: EventEmitter<TModel> = new EventEmitter<TModel>();
   @Output()
@@ -146,6 +137,7 @@ export class EntityGridComponent<TModel extends IModel> {
     page: number;
     itemsPerPage: number;
   }> = new EventEmitter<{ page: number; itemsPerPage: number }>();
+
   @Input()
   readonly: boolean;
   @Input()
diff --git a/libs/rucken/web/src/lib/directives/focused.directive.ts b/libs/rucken/web/src/lib/directives/focused.directive.ts
index 99978260..304431df 100644
--- a/libs/rucken/web/src/lib/directives/focused.directive.ts
+++ b/libs/rucken/web/src/lib/directives/focused.directive.ts
@@ -1,26 +1,18 @@
 import { isPlatformBrowser } from '@angular/common';
-import {
-  AfterContentInit,
-  Directive,
-  ElementRef,
-  Inject,
-  Input,
-  PLATFORM_ID,
-  Renderer
-} from '@angular/core';
+import { AfterContentInit, Directive, ElementRef, Inject, Input, PLATFORM_ID, Renderer } from '@angular/core';
 
 @Directive({
   selector: '[focused]'
 })
 export class FocusedDirective implements AfterContentInit {
-  @Input('focused')
+  @Input()
   focused: boolean | string;
 
   constructor(
     @Inject(PLATFORM_ID) private _platformId: Object,
     private ele: ElementRef,
     private renderer: Renderer
-  ) {}
+  ) { }
 
   ngAfterContentInit() {
     if (isPlatformBrowser(this._platformId)) {