diff --git a/lib/content-services/src/lib/document-list/services/custom-resources.service.ts b/lib/content-services/src/lib/document-list/services/custom-resources.service.ts
index 135ed9b10e..5bf7d17583 100644
--- a/lib/content-services/src/lib/document-list/services/custom-resources.service.ts
+++ b/lib/content-services/src/lib/document-list/services/custom-resources.service.ts
@@ -98,7 +98,7 @@ export class CustomResourcesService {
     getRecentFiles(personId: string, pagination: PaginationModel, filters?: string[]): Observable<ResultSetPaging> {
         const defaultFilter = [
             'TYPE:"content"',
-            '-PNAME:"0/wiki"',
+            '-PATH:"//cm:wiki/*"',
             '-TYPE:"app:filelink"',
             '-TYPE:"cm:thumbnail"',
             '-TYPE:"cm:failedThumbnail"',
diff --git a/lib/content-services/src/lib/permission-manager/components/add-permission/search-config-permission.service.ts b/lib/content-services/src/lib/permission-manager/components/add-permission/search-config-permission.service.ts
index 391e2e7079..75441e0d99 100644
--- a/lib/content-services/src/lib/permission-manager/components/add-permission/search-config-permission.service.ts
+++ b/lib/content-services/src/lib/permission-manager/components/add-permission/search-config-permission.service.ts
@@ -54,7 +54,7 @@ export class SearchPermissionConfigurationService implements SearchConfiguration
         if (this.queryProvider?.query) {
             query = this.queryProvider.query.replace(new RegExp(/\${([^}]+)}/g), searchTerm);
         } else {
-            query = `(email:*${searchTerm}* OR firstName:*${searchTerm}* OR lastName:*${searchTerm}* OR displayName:*${searchTerm}* OR authorityName:*${searchTerm}* OR authorityDisplayName:*${searchTerm}*) AND ANAME:("0/APP.DEFAULT")`;
+            query = `(userName:*${searchTerm}* OR email:*${searchTerm}* OR firstName:*${searchTerm}* OR lastName:*${searchTerm}* OR authorityName:*${searchTerm}* OR authorityDisplayName:*${searchTerm}*) AND PATH:"//cm:APP.DEFAULT/*"`;
         }
         return query;
     }
diff --git a/lib/content-services/src/lib/search/components/search-filter-autocomplete-chips/search-filter-autocomplete-chips.component.ts b/lib/content-services/src/lib/search/components/search-filter-autocomplete-chips/search-filter-autocomplete-chips.component.ts
index a13747f254..7b41ec6474 100644
--- a/lib/content-services/src/lib/search/components/search-filter-autocomplete-chips/search-filter-autocomplete-chips.component.ts
+++ b/lib/content-services/src/lib/search/components/search-filter-autocomplete-chips/search-filter-autocomplete-chips.component.ts
@@ -110,7 +110,7 @@ export class SearchFilterAutocompleteChipsComponent implements SearchWidget, OnI
             if (this.settings.field === AutocompleteField.CATEGORIES) {
                 queryFragments = this.selectedOptions.map(val => `${this.settings.field}:"workspace://SpacesStore/${val.id}"`);
             } else {
-                queryFragments = this.selectedOptions.map(val => `${this.settings.field}:"${val.value}"`);
+                queryFragments = this.selectedOptions.map(val => val.query ?? `${this.settings.field}:"${val.value}"`);
             }
             this.context.queryFragments[this.id] = queryFragments.join(' OR ');
             this.context.update();
diff --git a/lib/content-services/src/lib/search/models/autocomplete-option.interface.ts b/lib/content-services/src/lib/search/models/autocomplete-option.interface.ts
index a4fc71b5d8..8171ebb152 100644
--- a/lib/content-services/src/lib/search/models/autocomplete-option.interface.ts
+++ b/lib/content-services/src/lib/search/models/autocomplete-option.interface.ts
@@ -19,6 +19,7 @@ export interface AutocompleteOption {
     value: string;
     id?: string;
     fullPath?: string;
+    query?: string;
 }
 
 export enum AutocompleteField {