diff --git a/src/themes/alliance/eager-theme.module.ts b/src/themes/alliance/eager-theme.module.ts
index 1caa8966d4c..e4acb044104 100644
--- a/src/themes/alliance/eager-theme.module.ts
+++ b/src/themes/alliance/eager-theme.module.ts
@@ -1,8 +1,6 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
 import { SharedModule } from '../../app/shared/shared.module';
-import { SearchModule } from '../../app/shared/search/search.module';
 import { RootModule } from '../../app/root.module';
 import { NavbarModule } from '../../app/navbar/navbar.module';
 import { ItemPageModule } from '../../app/item-page/item-page.module';
@@ -14,8 +12,7 @@ import { DsoPageModule } from '../../app/shared/dso-page/dso-page.module';
  * Add components that use a custom decorator to ENTRY_COMPONENTS as well as DECLARATIONS.
  * This will ensure that decorator gets picked up when the app loads
  */
-const ENTRY_COMPONENTS = [
-];
+const ENTRY_COMPONENTS = [];
 
 const DECLARATIONS = [
   ...ENTRY_COMPONENTS,
@@ -25,8 +22,6 @@ const DECLARATIONS = [
   imports: [
     CommonModule,
     SharedModule,
-    SearchModule,
-    FormsModule,
     RootModule,
     NavbarModule,
     ResultsBackButtonModule,
@@ -36,7 +31,7 @@ const DECLARATIONS = [
   ],
   declarations: DECLARATIONS,
   providers: [
-    ...ENTRY_COMPONENTS.map((component) => ({ provide: component }))
+    ...ENTRY_COMPONENTS.map((component) => ({provide: component}))
   ],
 })
 /**
diff --git a/src/themes/cgspace/eager-theme.module.ts b/src/themes/cgspace/eager-theme.module.ts
index 9b458a63372..25670788caa 100644
--- a/src/themes/cgspace/eager-theme.module.ts
+++ b/src/themes/cgspace/eager-theme.module.ts
@@ -1,12 +1,10 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
 import { SharedModule } from '../../app/shared/shared.module';
 import { HomeNewsComponent } from './app/home-page/home-news/home-news.component';
 import { NavbarComponent } from './app/navbar/navbar.component';
 import { HeaderComponent } from './app/header/header.component';
 import { HeaderNavbarWrapperComponent } from './app/header-nav-wrapper/header-navbar-wrapper.component';
-import { SearchModule } from '../../app/shared/search/search.module';
 import { RootModule } from '../../app/root.module';
 import { NavbarModule } from '../../app/navbar/navbar.module';
 import { ItemPageModule } from '../../app/item-page/item-page.module';
@@ -37,8 +35,6 @@ const DECLARATIONS = [
   imports: [
     CommonModule,
     SharedModule,
-    SearchModule,
-    FormsModule,
     RootModule,
     NavbarModule,
     ResultsBackButtonModule,
@@ -48,7 +44,7 @@ const DECLARATIONS = [
   ],
   declarations: DECLARATIONS,
   providers: [
-    ...ENTRY_COMPONENTS.map((component) => ({ provide: component }))
+    ...ENTRY_COMPONENTS.map((component) => ({provide: component}))
   ],
 })
 /**
diff --git a/src/themes/cip/eager-theme.module.ts b/src/themes/cip/eager-theme.module.ts
index 1caa8966d4c..e4acb044104 100644
--- a/src/themes/cip/eager-theme.module.ts
+++ b/src/themes/cip/eager-theme.module.ts
@@ -1,8 +1,6 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
 import { SharedModule } from '../../app/shared/shared.module';
-import { SearchModule } from '../../app/shared/search/search.module';
 import { RootModule } from '../../app/root.module';
 import { NavbarModule } from '../../app/navbar/navbar.module';
 import { ItemPageModule } from '../../app/item-page/item-page.module';
@@ -14,8 +12,7 @@ import { DsoPageModule } from '../../app/shared/dso-page/dso-page.module';
  * Add components that use a custom decorator to ENTRY_COMPONENTS as well as DECLARATIONS.
  * This will ensure that decorator gets picked up when the app loads
  */
-const ENTRY_COMPONENTS = [
-];
+const ENTRY_COMPONENTS = [];
 
 const DECLARATIONS = [
   ...ENTRY_COMPONENTS,
@@ -25,8 +22,6 @@ const DECLARATIONS = [
   imports: [
     CommonModule,
     SharedModule,
-    SearchModule,
-    FormsModule,
     RootModule,
     NavbarModule,
     ResultsBackButtonModule,
@@ -36,7 +31,7 @@ const DECLARATIONS = [
   ],
   declarations: DECLARATIONS,
   providers: [
-    ...ENTRY_COMPONENTS.map((component) => ({ provide: component }))
+    ...ENTRY_COMPONENTS.map((component) => ({provide: component}))
   ],
 })
 /**
diff --git a/src/themes/iita/eager-theme.module.ts b/src/themes/iita/eager-theme.module.ts
index 1caa8966d4c..e4acb044104 100644
--- a/src/themes/iita/eager-theme.module.ts
+++ b/src/themes/iita/eager-theme.module.ts
@@ -1,8 +1,6 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
 import { SharedModule } from '../../app/shared/shared.module';
-import { SearchModule } from '../../app/shared/search/search.module';
 import { RootModule } from '../../app/root.module';
 import { NavbarModule } from '../../app/navbar/navbar.module';
 import { ItemPageModule } from '../../app/item-page/item-page.module';
@@ -14,8 +12,7 @@ import { DsoPageModule } from '../../app/shared/dso-page/dso-page.module';
  * Add components that use a custom decorator to ENTRY_COMPONENTS as well as DECLARATIONS.
  * This will ensure that decorator gets picked up when the app loads
  */
-const ENTRY_COMPONENTS = [
-];
+const ENTRY_COMPONENTS = [];
 
 const DECLARATIONS = [
   ...ENTRY_COMPONENTS,
@@ -25,8 +22,6 @@ const DECLARATIONS = [
   imports: [
     CommonModule,
     SharedModule,
-    SearchModule,
-    FormsModule,
     RootModule,
     NavbarModule,
     ResultsBackButtonModule,
@@ -36,7 +31,7 @@ const DECLARATIONS = [
   ],
   declarations: DECLARATIONS,
   providers: [
-    ...ENTRY_COMPONENTS.map((component) => ({ provide: component }))
+    ...ENTRY_COMPONENTS.map((component) => ({provide: component}))
   ],
 })
 /**
diff --git a/src/themes/ilri/eager-theme.module.ts b/src/themes/ilri/eager-theme.module.ts
index 1caa8966d4c..e4acb044104 100644
--- a/src/themes/ilri/eager-theme.module.ts
+++ b/src/themes/ilri/eager-theme.module.ts
@@ -1,8 +1,6 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
 import { SharedModule } from '../../app/shared/shared.module';
-import { SearchModule } from '../../app/shared/search/search.module';
 import { RootModule } from '../../app/root.module';
 import { NavbarModule } from '../../app/navbar/navbar.module';
 import { ItemPageModule } from '../../app/item-page/item-page.module';
@@ -14,8 +12,7 @@ import { DsoPageModule } from '../../app/shared/dso-page/dso-page.module';
  * Add components that use a custom decorator to ENTRY_COMPONENTS as well as DECLARATIONS.
  * This will ensure that decorator gets picked up when the app loads
  */
-const ENTRY_COMPONENTS = [
-];
+const ENTRY_COMPONENTS = [];
 
 const DECLARATIONS = [
   ...ENTRY_COMPONENTS,
@@ -25,8 +22,6 @@ const DECLARATIONS = [
   imports: [
     CommonModule,
     SharedModule,
-    SearchModule,
-    FormsModule,
     RootModule,
     NavbarModule,
     ResultsBackButtonModule,
@@ -36,7 +31,7 @@ const DECLARATIONS = [
   ],
   declarations: DECLARATIONS,
   providers: [
-    ...ENTRY_COMPONENTS.map((component) => ({ provide: component }))
+    ...ENTRY_COMPONENTS.map((component) => ({provide: component}))
   ],
 })
 /**
diff --git a/src/themes/iwmi/eager-theme.module.ts b/src/themes/iwmi/eager-theme.module.ts
index 1caa8966d4c..e4acb044104 100644
--- a/src/themes/iwmi/eager-theme.module.ts
+++ b/src/themes/iwmi/eager-theme.module.ts
@@ -1,8 +1,6 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
 import { SharedModule } from '../../app/shared/shared.module';
-import { SearchModule } from '../../app/shared/search/search.module';
 import { RootModule } from '../../app/root.module';
 import { NavbarModule } from '../../app/navbar/navbar.module';
 import { ItemPageModule } from '../../app/item-page/item-page.module';
@@ -14,8 +12,7 @@ import { DsoPageModule } from '../../app/shared/dso-page/dso-page.module';
  * Add components that use a custom decorator to ENTRY_COMPONENTS as well as DECLARATIONS.
  * This will ensure that decorator gets picked up when the app loads
  */
-const ENTRY_COMPONENTS = [
-];
+const ENTRY_COMPONENTS = [];
 
 const DECLARATIONS = [
   ...ENTRY_COMPONENTS,
@@ -25,8 +22,6 @@ const DECLARATIONS = [
   imports: [
     CommonModule,
     SharedModule,
-    SearchModule,
-    FormsModule,
     RootModule,
     NavbarModule,
     ResultsBackButtonModule,
@@ -36,7 +31,7 @@ const DECLARATIONS = [
   ],
   declarations: DECLARATIONS,
   providers: [
-    ...ENTRY_COMPONENTS.map((component) => ({ provide: component }))
+    ...ENTRY_COMPONENTS.map((component) => ({provide: component}))
   ],
 })
 /**