diff --git a/src/app/my-dspace-page/my-dspace-search.module.ts b/src/app/my-dspace-page/my-dspace-search.module.ts
index 066f144237..fbb23291f0 100644
--- a/src/app/my-dspace-page/my-dspace-search.module.ts
+++ b/src/app/my-dspace-page/my-dspace-search.module.ts
@@ -61,6 +61,9 @@ const DECLARATIONS = [
     ResearchEntitiesModule.withEntryComponents(),
     JournalEntitiesModule.withEntryComponents(),
   ],
+  exports: [
+    ...DECLARATIONS,
+  ],
   declarations: [
     ...DECLARATIONS,
   ],
diff --git a/src/app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component.ts b/src/app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component.ts
index f0ed56db71..dbf8e59300 100644
--- a/src/app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component.ts
+++ b/src/app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component.ts
@@ -28,7 +28,7 @@ export class ThemedComcolPageBrowseByComponent extends ThemedComponent<ComcolPag
   }
 
   protected importThemedComponent(themeName: string): Promise<any> {
-    return import(`../../../../themes/${themeName}/app/shared/comcol-page-browse-by/comcol-page-browse-by.component`);
+    return import(`../../../../themes/${themeName}/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component`);
   }
 
   protected importUnthemedComponent(): Promise<any> {
diff --git a/src/themes/custom/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts b/src/themes/custom/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts
deleted file mode 100644
index b5af81bab4..0000000000
--- a/src/themes/custom/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Component } from '@angular/core';
-
-import { ComcolPageBrowseByComponent as BaseComponent } from '../../../../../app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component';
-
-/**
- * A component to display the "Browse By" section of a Community or Collection page
- * It expects the ID of the Community or Collection as input to be passed on as a scope
- */
-@Component({
-  selector: 'ds-comcol-page-browse-by',
-  // styleUrls: ['./comcol-page-browse-by.component.scss'],
-  styleUrls: ['../../../../../app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.scss'],
-  // templateUrl: './comcol-page-browse-by.component.html'
-  templateUrl: '../../../../../app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html',
-})
-export class ComcolPageBrowseByComponent extends BaseComponent {}
diff --git a/src/themes/custom/app/shared/comcol-page-handle/comcol-page-handle.component.ts b/src/themes/custom/app/shared/comcol-page-handle/comcol-page-handle.component.ts
deleted file mode 100644
index 8beb56b596..0000000000
--- a/src/themes/custom/app/shared/comcol-page-handle/comcol-page-handle.component.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Component } from '@angular/core';
-
-import { ComcolPageHandleComponent as BaseComponent } from '../../../../../app/shared/comcol/comcol-page-handle/comcol-page-handle.component';
-
-
-/**
- * This component builds a URL from the value of "handle"
- */
-
-@Component({
-  selector: 'ds-comcol-page-handle',
-  // templateUrl: './comcol-page-handle.component.html',
-  templateUrl: '../../../../../app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html',
-  // styleUrls: ['./comcol-page-handle.component.scss'],
-  styleUrls: ['../../../../../app/shared/comcol/comcol-page-handle/comcol-page-handle.component.scss'],
-})
-
-
-export class ComcolPageHandleComponent extends BaseComponent {}
diff --git a/src/themes/custom/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.html b/src/themes/custom/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html
similarity index 100%
rename from src/themes/custom/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.html
rename to src/themes/custom/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html
diff --git a/src/themes/custom/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.scss b/src/themes/custom/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.scss
similarity index 100%
rename from src/themes/custom/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.scss
rename to src/themes/custom/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.scss
diff --git a/src/themes/custom/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts b/src/themes/custom/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts
new file mode 100644
index 0000000000..987db8f47c
--- /dev/null
+++ b/src/themes/custom/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts
@@ -0,0 +1,13 @@
+import { Component } from '@angular/core';
+
+import { ComcolPageBrowseByComponent as BaseComponent } from '../../../../../../app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component';
+
+@Component({
+  selector: 'ds-comcol-page-browse-by',
+  // styleUrls: ['./comcol-page-browse-by.component.scss'],
+  styleUrls: ['../../../../../../app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.scss'],
+  // templateUrl: './comcol-page-browse-by.component.html'
+  templateUrl: '../../../../../../app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html',
+})
+export class ComcolPageBrowseByComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/shared/comcol-page-handle/comcol-page-handle.component.html b/src/themes/custom/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html
similarity index 100%
rename from src/themes/custom/app/shared/comcol-page-handle/comcol-page-handle.component.html
rename to src/themes/custom/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html
diff --git a/src/themes/custom/app/shared/comcol-page-handle/comcol-page-handle.component.scss b/src/themes/custom/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.scss
similarity index 100%
rename from src/themes/custom/app/shared/comcol-page-handle/comcol-page-handle.component.scss
rename to src/themes/custom/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.scss
diff --git a/src/themes/custom/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.ts b/src/themes/custom/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.ts
new file mode 100644
index 0000000000..4d34425a97
--- /dev/null
+++ b/src/themes/custom/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.ts
@@ -0,0 +1,13 @@
+import { Component } from '@angular/core';
+
+import { ComcolPageHandleComponent as BaseComponent } from '../../../../../../app/shared/comcol/comcol-page-handle/comcol-page-handle.component';
+
+@Component({
+  selector: 'ds-comcol-page-handle',
+  // templateUrl: './comcol-page-handle.component.html',
+  templateUrl: '../../../../../../app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html',
+  // styleUrls: ['./comcol-page-handle.component.scss'],
+  styleUrls: ['../../../../../../app/shared/comcol/comcol-page-handle/comcol-page-handle.component.scss'],
+})
+export class ComcolPageHandleComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html b/src/themes/custom/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.scss b/src/themes/custom/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts b/src/themes/custom/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
new file mode 100644
index 0000000000..f1d96b7df8
--- /dev/null
+++ b/src/themes/custom/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
@@ -0,0 +1,15 @@
+import { Component } from '@angular/core';
+
+import { fadeInOut } from '../../../../../../../app/shared/animations/fade';
+import { ItemListPreviewComponent as BaseComponent } from '../../../../../../../app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component';
+
+@Component({
+  selector: 'ds-item-list-preview',
+  // styleUrls: ['./item-list-preview.component.scss'],
+  styleUrls: ['../../../../../../../app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.scss'],
+  // templateUrl: './item-list-preview.component.html',
+  templateUrl: '../../../../../../../app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html',
+  animations: [fadeInOut],
+})
+export class ItemListPreviewComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/shared/search/search.component.html b/src/themes/custom/app/shared/search/search.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/search/search.component.scss b/src/themes/custom/app/shared/search/search.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/search/search.component.ts b/src/themes/custom/app/shared/search/search.component.ts
new file mode 100644
index 0000000000..73bdc61cfb
--- /dev/null
+++ b/src/themes/custom/app/shared/search/search.component.ts
@@ -0,0 +1,17 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+} from '@angular/core';
+
+import { pushInOut } from '../../../../../app/shared/animations/push';
+import { SearchComponent as BaseComponent } from '../../../../../app/shared/search/search.component';
+
+@Component({
+  selector: 'ds-search',
+  styleUrls: ['./search.component.scss'],
+  templateUrl: './search.component.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  animations: [pushInOut],
+})
+export class SearchComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts
index 814313f46e..02d2ac28ae 100644
--- a/src/themes/custom/lazy-theme.module.ts
+++ b/src/themes/custom/lazy-theme.module.ts
@@ -108,8 +108,8 @@ import { SearchPageComponent } from './app/search-page/search-page.component';
 import { AuthNavMenuComponent } from './app/shared/auth-nav-menu/auth-nav-menu.component';
 import { UserMenuComponent } from './app/shared/auth-nav-menu/user-menu/user-menu.component';
 import { BrowseByComponent } from './app/shared/browse-by/browse-by.component';
-import { ComcolPageBrowseByComponent } from './app/shared/comcol-page-browse-by/comcol-page-browse-by.component';
-import { ComcolPageHandleComponent } from './app/shared/comcol-page-handle/comcol-page-handle.component';
+import { ComcolPageBrowseByComponent } from './app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component';
+import { ComcolPageHandleComponent } from './app/shared/comcol/comcol-page-handle/comcol-page-handle.component';
 import { DsDynamicLookupRelationExternalSourceTabComponent } from './app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component';
 import { ExternalSourceEntryImportModalComponent } from './app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component';
 import { DsDynamicLookupRelationSearchTabComponent } from './app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component';
@@ -119,8 +119,10 @@ import { BadgesComponent } from './app/shared/object-collection/shared/badges/ba
 import { MyDSpaceStatusBadgeComponent } from './app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component';
 import { StatusBadgeComponent } from './app/shared/object-collection/shared/badges/status-badge/status-badge.component';
 import { TypeBadgeComponent } from './app/shared/object-collection/shared/badges/type-badge/type-badge.component';
+import { ItemListPreviewComponent } from './app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component';
 import { ObjectListComponent } from './app/shared/object-list/object-list.component';
 import { ResultsBackButtonComponent } from './app/shared/results-back-button/results-back-button.component';
+import { SearchComponent } from './app/shared/search/search.component';
 import { SearchFiltersComponent } from './app/shared/search/search-filters/search-filters.component';
 import { SearchResultsComponent } from './app/shared/search/search-results/search-results.component';
 import { SearchSettingsComponent } from './app/shared/search/search-settings/search-settings.component';
@@ -223,6 +225,8 @@ const DECLARATIONS = [
   UserMenuComponent,
   BrowseByComponent,
   RegisterEmailFormComponent,
+  SearchComponent,
+  ItemListPreviewComponent,
 ];
 
 @NgModule({