diff --git a/src/lib/listing/listing-component.directive.ts b/src/lib/listing/listing-component.directive.ts
index 26baee4..7f2203a 100644
--- a/src/lib/listing/listing-component.directive.ts
+++ b/src/lib/listing/listing-component.directive.ts
@@ -9,6 +9,7 @@ import { EntitiesService } from './services';
 import { IListable, ListingMode, ListingModes, TableColumnConfig } from './models';
 
 export const DefaultListingServices = [FilterService, SearchService, EntitiesService, SortingService] as const;
+export const DefaultListingServicesTmp = [FilterService, SearchService, SortingService] as const;
 
 @Directive()
 export abstract class ListingComponent<T extends IListable> extends AutoUnsubscribe implements OnDestroy {
diff --git a/src/lib/listing/table/table.component.html b/src/lib/listing/table/table.component.html
index c85292f..76341b7 100644
--- a/src/lib/listing/table/table.component.html
+++ b/src/lib/listing/table/table.component.html
@@ -26,7 +26,7 @@
     <div
         (mouseenter)="itemMouseEnterFn && itemMouseEnterFn(entity)"
         (mouseleave)="itemMouseLeaveFn && itemMouseLeaveFn(entity)"
-        *cdkVirtualFor="let entity of listingComponent.sortedDisplayedEntities$ | async"
+        *cdkVirtualFor="let entity of listingComponent.sortedDisplayedEntities$ | async; trackBy: trackById"
         [ngClass]="getTableItemClasses(entity)"
         [routerLink]="entity.routerLink"
     >
diff --git a/src/lib/listing/table/table.component.ts b/src/lib/listing/table/table.component.ts
index 458c721..ddd72a9 100644
--- a/src/lib/listing/table/table.component.ts
+++ b/src/lib/listing/table/table.component.ts
@@ -65,6 +65,10 @@ export class TableComponent<T extends IListable> implements OnInit {
         return this.listingComponent.tableHeaderLabel;
     }
 
+    trackById(index: number, entity: T): string {
+        return entity.id;
+    }
+
     ngOnInit(): void {
         this.listingComponent.noContent$.subscribe(() => {
             setTimeout(() => {
diff --git a/src/lib/loading/loading.service.ts b/src/lib/loading/loading.service.ts
index af0d83f..15ac265 100644
--- a/src/lib/loading/loading.service.ts
+++ b/src/lib/loading/loading.service.ts
@@ -23,7 +23,7 @@ export class LoadingService {
         return remainingLoadingTime > 0 ? this._stopAfter(remainingLoadingTime) : this._stop();
     }
 
-    loadWhile(func: Promise<void>): void {
+    loadWhile(func: Promise<unknown>): void {
         this.start();
 
         func.then(