diff --git a/src/app/shared/components/presentationals/shared-data-table/shared-data-table.presentational.ts b/src/app/shared/components/presentationals/shared-data-table/shared-data-table.presentational.ts
index 0287313e7782751db23e3bf51bf0c84cdaa8562a..2f40c6a9d770720075bcddb3655d015a49ebb26c 100644
--- a/src/app/shared/components/presentationals/shared-data-table/shared-data-table.presentational.ts
+++ b/src/app/shared/components/presentationals/shared-data-table/shared-data-table.presentational.ts
@@ -256,7 +256,7 @@ export class SharedDataTablePresentational<TResource extends BaseResource> exten
 
   isFilterApplied(): boolean {
     let toSkip: boolean = false;
-    if (this._queryParameters.search.searchItems.size !== 0) {
+    if (MappingObjectUtil.size(QueryParametersUtil.getSearchItems(this.queryParameters)) > 0) {
       if (this.columnsSkippedToClear === undefined || isEmptyArray(this.columnsSkippedToClear)) {
         return true;
       }
@@ -272,11 +272,11 @@ export class SharedDataTablePresentational<TResource extends BaseResource> exten
 
   clearFilters(): void {
     let queryParameters = QueryParametersUtil.clone(this.queryParameters);
-    const searchItems: Map<string, string> = MappingObjectUtil.toMap(QueryParametersUtil.getSearchItems(queryParameters));
+    const searchItems = QueryParametersUtil.getSearchItems(queryParameters);
     if (this.columnsSkippedToClear === undefined || isEmptyArray(this.columnsSkippedToClear)) {
-      searchItems.clear();
+      MappingObjectUtil.clear(searchItems);
     } else {
-      searchItems.forEach((value: string, key: string) => {
+      MappingObjectUtil.forEach(searchItems, (value: string, key: string) => {
         if (this.columnsSkippedToClear.some(c => c.includes(key)) === false) {
           MappingObjectUtil.delete(searchItems, key);
         }