diff --git a/explore/src/app/deposit/searchDataprovidersToDeposit.component.ts b/explore/src/app/deposit/searchDataprovidersToDeposit.component.ts
index c59340bc..c963b778 100644
--- a/explore/src/app/deposit/searchDataprovidersToDeposit.component.ts
+++ b/explore/src/app/deposit/searchDataprovidersToDeposit.component.ts
@@ -4,7 +4,7 @@ import {Component} from '@angular/core';
 @Component({
   selector: 'openaire-search-deposit',
   template: `
-    <search-dataproviders></search-dataproviders>
+    <deposit-search-dataproviders></deposit-search-dataproviders>
     `
 })
 
diff --git a/explore/src/app/searchPages/dataProviders/compatibleDataProviders.component.ts b/explore/src/app/searchPages/dataProviders/compatibleDataProviders.component.ts
index d74440b1..aa00b948 100644
--- a/explore/src/app/searchPages/dataProviders/compatibleDataProviders.component.ts
+++ b/explore/src/app/searchPages/dataProviders/compatibleDataProviders.component.ts
@@ -5,8 +5,10 @@ import { ActivatedRoute} from '@angular/router';
     selector: 'openaire-search-content-providers',
     template: `
 
-    <search-content-providers>
-    </search-content-providers>
+<!--    <search-content-providers>-->
+<!--    </search-content-providers>-->
+    <search-dataproviders  [simpleView]="true" type="compatible" simpleSearchLink="/search/content-providers"  tableViewLink="/search/content-providers-table">
+    </search-dataproviders>
 
     `
 
diff --git a/explore/src/app/searchPages/dataProviders/compatibleDataProviders.module.ts b/explore/src/app/searchPages/dataProviders/compatibleDataProviders.module.ts
index 8ce1cb9d..b7a95c6a 100644
--- a/explore/src/app/searchPages/dataProviders/compatibleDataProviders.module.ts
+++ b/explore/src/app/searchPages/dataProviders/compatibleDataProviders.module.ts
@@ -10,12 +10,13 @@ import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousR
 import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
 
 import {  CompatibleDataProvidersModule} from '../../openaireLibrary/searchPages/dataProviders/compatibleDataProviders.module';
+import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searchDataProviders.module";
 
 @NgModule({
   imports: [
     CommonModule, FormsModule,
     CompatibleDataProvidersModule,
-    CompatibleDataProvidersRoutingModule
+    CompatibleDataProvidersRoutingModule, SearchDataProvidersModule
 
   ],
   declarations: [
diff --git a/explore/src/app/searchPages/dataProviders/entityRegistries.component.ts b/explore/src/app/searchPages/dataProviders/entityRegistries.component.ts
index 82336f90..a7e69561 100644
--- a/explore/src/app/searchPages/dataProviders/entityRegistries.component.ts
+++ b/explore/src/app/searchPages/dataProviders/entityRegistries.component.ts
@@ -5,9 +5,10 @@ import { ActivatedRoute} from '@angular/router';
     selector: 'openaire-search-entity-registries',
     template: `
 
-    <search-entity-registries>
-    </search-entity-registries>
-
+   <!-- <search-entity-registries>
+    </search-entity-registries>-->
+    <search-dataproviders  [simpleView]="true" type="registries" simpleSearchLink="/search/entity-registries"  tableViewLink="/search/entity-registries-table">
+    </search-dataproviders>
     `
 
 })
diff --git a/explore/src/app/searchPages/dataProviders/entityRegistries.module.ts b/explore/src/app/searchPages/dataProviders/entityRegistries.module.ts
index 8d81f190..669bde88 100644
--- a/explore/src/app/searchPages/dataProviders/entityRegistries.module.ts
+++ b/explore/src/app/searchPages/dataProviders/entityRegistries.module.ts
@@ -9,11 +9,12 @@ import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousR
 import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
 
 import {EntityRegistriesModule } from '../../openaireLibrary/searchPages/dataProviders/entityRegistries.module';
+import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searchDataProviders.module";
 
 @NgModule({
   imports: [
     CommonModule, FormsModule,
-    EntityRegistriesModule, EntityRegistriesRoutingModule
+    EntityRegistriesModule, EntityRegistriesRoutingModule, SearchDataProvidersModule
 
   ],
   declarations: [
diff --git a/explore/src/app/searchPages/dataProviders/journals.component.ts b/explore/src/app/searchPages/dataProviders/journals.component.ts
index e54fae66..87a5bbb7 100644
--- a/explore/src/app/searchPages/dataProviders/journals.component.ts
+++ b/explore/src/app/searchPages/dataProviders/journals.component.ts
@@ -5,8 +5,10 @@ import { ActivatedRoute} from '@angular/router';
     selector: 'openaire-search-journals',
     template: `
 
-    <search-journals>
-    </search-journals>
+    <!--<search-journals>
+    </search-journals>-->
+    <search-dataproviders  [simpleView]="true" type="journals" simpleSearchLink="/search/journals" >
+    </search-dataproviders>
     `
 
 })
diff --git a/explore/src/app/searchPages/dataProviders/journals.module.ts b/explore/src/app/searchPages/dataProviders/journals.module.ts
index db4d5953..3694415d 100644
--- a/explore/src/app/searchPages/dataProviders/journals.module.ts
+++ b/explore/src/app/searchPages/dataProviders/journals.module.ts
@@ -8,9 +8,10 @@ import { JournalsModule} from '../../openaireLibrary/searchPages/dataProviders/j
 import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
 import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
 import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
+import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searchDataProviders.module";
 @NgModule({
   imports: [
-    CommonModule, FormsModule, JournalsRoutingModule, JournalsModule
+    CommonModule, FormsModule, JournalsRoutingModule, JournalsModule, SearchDataProvidersModule
 
   ],
   declarations: [
diff --git a/explore/src/assets/env-properties.json b/explore/src/assets/env-properties.json
index c55544c0..54555463 100644
--- a/explore/src/assets/env-properties.json
+++ b/explore/src/assets/env-properties.json
@@ -8,7 +8,7 @@
   "statisticsAPIURL" : "http://vatopedi.di.uoa.gr:8080/stats/",
   "statisticsFrameAPIURL":"https://beta.openaire.eu/stats/",
   "claimsAPIURL" : "http://scoobydoo.di.uoa.gr:8080/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/",
-  "searchAPIURLLAst"     : "http://beta.services.openaire.eu:8480/shadowSearch/rest/v2/api/",
+  "searchAPIURLLAst"     : "http://beta.services.openaire.eu/search/v2/api/",
   "searchResourcesAPIURL"     : "https://beta.services.openaire.eu/search/v2/api/resources",
   "openCitationsAPIURL" : "https://services.openaire.eu/opencitations/getCitations?id=",
   "csvAPIURL" : "https://beta.services.openaire.eu/search/v2/api/reports",
@@ -48,7 +48,7 @@
 
   "cacheUrl" :"http://scoobydoo.di.uoa.gr:3000/get?url=",
 
-  "adminToolsAPIURL" :"http://mpagasas.di.uoa.gr:8080/uoa-admin-tools/",
+  "adminToolsAPIURL" :"http://duffy.di.uoa.gr:8080/uoa-admin-tools/",
 
   "adminToolsCommunity" :"openaire",
   "datasourcesAPI": "https://beta.services.openaire.eu/openaire/ds/search/",