diff --git a/lib/content-services/src/lib/common/public-api.ts b/lib/content-services/src/lib/common/public-api.ts
index cca99f28e4..d66f9fcbd6 100644
--- a/lib/content-services/src/lib/common/public-api.ts
+++ b/lib/content-services/src/lib/common/public-api.ts
@@ -26,6 +26,7 @@ export * from './services/people-content.service';
 export * from './services/content.service';
 export * from './services/saved-searches.service';
 export * from './services/saved-searches-legacy.service';
+export * from './services/saved-searches-base.service';
 
 export * from './events/file.event';
 
diff --git a/lib/content-services/src/lib/common/services/saved-searches-base.service.spec.ts b/lib/content-services/src/lib/common/services/saved-searches-base.service.spec.ts
index e8d822dc78..939d2c4950 100644
--- a/lib/content-services/src/lib/common/services/saved-searches-base.service.spec.ts
+++ b/lib/content-services/src/lib/common/services/saved-searches-base.service.spec.ts
@@ -16,7 +16,7 @@
  */
 
 import { TestBed } from '@angular/core/testing';
-import { AlfrescoApiService } from '../../services/alfresco-api.service';
+import { AlfrescoApiService } from '../../services';
 import { AlfrescoApiServiceMock } from '../../mock';
 import { MockSavedSearchesService } from '../../mock/saved-searches-derived.mock';
 import { SavedSearch } from '../interfaces/saved-search.interface';
diff --git a/lib/content-services/src/lib/common/services/saved-searches-base.service.ts b/lib/content-services/src/lib/common/services/saved-searches-base.service.ts
index 3bf4bc5333..6a4e1da4bb 100644
--- a/lib/content-services/src/lib/common/services/saved-searches-base.service.ts
+++ b/lib/content-services/src/lib/common/services/saved-searches-base.service.ts
@@ -21,7 +21,7 @@ import { AuthenticationService } from '@alfresco/adf-core';
 import { ReplaySubject, Observable, catchError, switchMap, take, tap, throwError, map } from 'rxjs';
 import { NodeEntry, NodesApi } from '@alfresco/js-api';
 import { SavedSearch } from '../interfaces/saved-search.interface';
-import { AlfrescoApiService } from '../../services/alfresco-api.service';
+import { AlfrescoApiService } from '../../services';
 
 @Injectable()
 export abstract class SavedSearchesBaseService implements SavedSearchStrategy {
diff --git a/lib/content-services/src/lib/common/services/saved-searches-legacy.service.spec.ts b/lib/content-services/src/lib/common/services/saved-searches-legacy.service.spec.ts
index 4b643fcafa..9e4ab65464 100644
--- a/lib/content-services/src/lib/common/services/saved-searches-legacy.service.spec.ts
+++ b/lib/content-services/src/lib/common/services/saved-searches-legacy.service.spec.ts
@@ -16,7 +16,7 @@
  */
 
 import { TestBed } from '@angular/core/testing';
-import { AlfrescoApiService } from '../../services/alfresco-api.service';
+import { AlfrescoApiService } from '../../services';
 import { NodeEntry } from '@alfresco/js-api';
 import { AlfrescoApiServiceMock } from '../../mock';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
diff --git a/lib/content-services/src/lib/common/services/saved-searches-legacy.service.ts b/lib/content-services/src/lib/common/services/saved-searches-legacy.service.ts
index 8fb9196b99..1cfb8f4657 100644
--- a/lib/content-services/src/lib/common/services/saved-searches-legacy.service.ts
+++ b/lib/content-services/src/lib/common/services/saved-searches-legacy.service.ts
@@ -19,7 +19,7 @@ import { NodeEntry } from '@alfresco/js-api';
 import { Injectable } from '@angular/core';
 import { Observable, of, from, throwError } from 'rxjs';
 import { catchError, concatMap, first, map } from 'rxjs/operators';
-import { AlfrescoApiService } from '../../services/alfresco-api.service';
+import { AlfrescoApiService } from '../../services';
 import { SavedSearch } from '../interfaces/saved-search.interface';
 import { AuthenticationService } from '@alfresco/adf-core';
 import { SavedSearchesBaseService } from './saved-searches-base.service';
diff --git a/lib/content-services/src/lib/mock/saved-searches-derived.mock.ts b/lib/content-services/src/lib/mock/saved-searches-derived.mock.ts
index adb4955556..a2da535b65 100644
--- a/lib/content-services/src/lib/mock/saved-searches-derived.mock.ts
+++ b/lib/content-services/src/lib/mock/saved-searches-derived.mock.ts
@@ -16,11 +16,10 @@
  */
 
 import { NodeEntry } from '@alfresco/js-api';
-import { SavedSearchesBaseService } from '../common/services/saved-searches-base.service';
 import { of, Observable, ReplaySubject } from 'rxjs';
-import { AlfrescoApiService } from '../services/alfresco-api.service';
+import { AlfrescoApiService } from '../services';
 import { AuthenticationService } from '@alfresco/adf-core';
-import { SavedSearch } from '../common/interfaces/saved-search.interface';
+import { SavedSearch, SavedSearchesBaseService } from '../common';
 import { Injectable } from '@angular/core';
 
 @Injectable()