diff --git a/packages/angular-sdk-components/src/lib/_components/template/advanced-search/advanced-search.component.ts b/packages/angular-sdk-components/src/lib/_components/template/advanced-search/advanced-search.component.ts
index a13fd9ee..8d201661 100644
--- a/packages/angular-sdk-components/src/lib/_components/template/advanced-search/advanced-search.component.ts
+++ b/packages/angular-sdk-components/src/lib/_components/template/advanced-search/advanced-search.component.ts
@@ -2,7 +2,7 @@ import { Component, forwardRef, Input, OnInit, OnChanges } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormGroup } from '@angular/forms';
 import { ComponentMapperComponent } from '../../../_bridge/component-mapper/component-mapper.component';
-import { DataReferenceAdvancedSearchService } from '../data-reference/data-reference-advanced-search.service';
+import { DataReferenceAdvancedSearchService } from '../../../_services/data-reference-advanced-search.service';
 import { getFirstChildConfig } from '../data-reference/utils';
 
 @Component({
diff --git a/packages/angular-sdk-components/src/lib/_components/template/data-reference/data-reference.component.ts b/packages/angular-sdk-components/src/lib/_components/template/data-reference/data-reference.component.ts
index 0f6ea151..715dc013 100644
--- a/packages/angular-sdk-components/src/lib/_components/template/data-reference/data-reference.component.ts
+++ b/packages/angular-sdk-components/src/lib/_components/template/data-reference/data-reference.component.ts
@@ -6,7 +6,7 @@ import { ComponentMapperComponent } from '../../../_bridge/component-mapper/comp
 import { getMappedKey } from '../advanced-search/search-group/persist-utils';
 import { componentCachePersistUtils } from '../advanced-search/search-group/persist-utils';
 import { getFirstChildConfig } from '../data-reference/utils';
-import { DataReferenceAdvancedSearchService } from './data-reference-advanced-search.service';
+import { DataReferenceAdvancedSearchService } from '../../../_services/data-reference-advanced-search.service';
 
 const SELECTION_MODE = { SINGLE: 'single', MULTI: 'multi' };
 
diff --git a/packages/angular-sdk-components/src/lib/_components/template/data-reference/data-reference-advanced-search.service.ts b/packages/angular-sdk-components/src/lib/_services/data-reference-advanced-search.service.ts
similarity index 100%
rename from packages/angular-sdk-components/src/lib/_components/template/data-reference/data-reference-advanced-search.service.ts
rename to packages/angular-sdk-components/src/lib/_services/data-reference-advanced-search.service.ts
diff --git a/packages/angular-sdk-components/src/public-api.ts b/packages/angular-sdk-components/src/public-api.ts
index ae7aef84..b7829360 100644
--- a/packages/angular-sdk-components/src/public-api.ts
+++ b/packages/angular-sdk-components/src/public-api.ts
@@ -64,7 +64,6 @@ export * from './lib/_components/template/case-summary/case-summary.component';
 export * from './lib/_components/template/case-view/case-view.component';
 export * from './lib/_components/template/confirmation/confirmation.component';
 export * from './lib/_components/template/data-reference/data-reference.component';
-export * from './lib/_components/template/data-reference/data-reference-advanced-search.service';
 export * from './lib/_components/template/data-reference/search-form/tabsData';
 export * from './lib/_components/template/data-reference/search-form/search-form.component';
 export * from './lib/_components/template/data-reference/utils';
@@ -138,6 +137,7 @@ export * from './lib/_services/datapage.service';
 export * from './lib/_services/endpoints';
 export * from './lib/_services/google-maps-loader.service';
 export * from './lib/_services/server-config.service';
+export * from './lib/_services/data-reference-advanced-search.service';
 
 export * from './lib/_helpers/case-utils';
 export * from './lib/_helpers/common';
@@ -160,6 +160,7 @@ export * from './lib/_helpers/tab-utils';
 export * from './lib/_helpers/template-utils';
 export * from './lib/_helpers/utils';
 export * from './lib/_helpers/versionHelpers';
+export * from './lib/_helpers/object-utils';
 
 export * from './lib/_messages/error-messages.service';
 export * from './lib/_messages/progress-spinner.service';