diff --git a/explore/src/app/app-routing.module.ts b/explore/src/app/app-routing.module.ts
index d3c30a25..a771bf27 100644
--- a/explore/src/app/app-routing.module.ts
+++ b/explore/src/app/app-routing.module.ts
@@ -35,25 +35,19 @@ const routes: Routes = [
     path: 'project-report',
     loadChildren: () => import('./landingPages/htmlProjectReport/libHtmlProjectReport.module').then(m => m.LibHtmlProjectReportModule)
   },
+
   // Search Pages
-  {path: 'search/find', loadChildren: () => import('./searchPages/find/libSearch.module').then(m => m.LibMainSearchModule)},
   {
-    path: 'search/find/research-outcomes',
-    loadChildren: () => import('./searchPages/simple/searchResearchResults.module').then(m => m.OpenaireSearchResearchResultsModule)
+    path: 'search/find', loadChildren: () => import('./searchPages/find/libSearch.module').then(m => m.LibMainSearchModule)
+  },
+  {
+    path: 'search/find/:entity', loadChildren: () => import('./searchPages/find/libSearch.module').then(m => m.LibMainSearchModule)
   },
   {path: 'search/find/publications', component: PageURLResolverComponent},
   {path: 'search/find/datasets', component: PageURLResolverComponent},
   {path: 'search/find/software', component: PageURLResolverComponent},
   {path: 'search/find/other', component: PageURLResolverComponent},
-  {path: 'search/find/projects', loadChildren: () => import('./searchPages/simple/searchProjects.module').then(m => m.LibSearchProjectsModule)},
-  {
-    path: 'search/find/dataproviders',
-    loadChildren: () => import('./searchPages/simple/searchDataProviders.module').then(m => m.LibSearchDataProvidersModule)
-  },
-  {
-    path: 'search/find/organizations',
-    loadChildren: () => import('./searchPages/simple/searchOrganizations.module').then(m => m.LibSearchOrganizationsModule)
-  },
+
   // Advanced Search Pages
   {
     path: 'search/advanced/research-outcomes',
diff --git a/explore/src/app/app.component.ts b/explore/src/app/app.component.ts
index 8ab6dbac..97c796c7 100644
--- a/explore/src/app/app.component.ts
+++ b/explore/src/app/app.component.ts
@@ -168,7 +168,7 @@ export class AppComponent {
       new MenuItem("", OpenaireEntities.OTHER, "", "/search/find/research-outcomes", false, [], ["/search/find/research-outcomes"], {type: '"' + encodeURIComponent("other") + '"'})];
     //TODO add check for research results route
     this.menuItems = [
-      new MenuItem("search", "Search", "", "/search/find", false, [], ["/search/find"], {qf: true},
+      new MenuItem("search", "Search", "", "/search/find/research-outcomes", false, [], ["/search/find/research-outcomes"], {resultbestaccessright: '"' + encodeURIComponent("Open Access") + '"'},
         null, null, null, null, "_blank", "internal", false,
         [
           researchOutcomesMenu,
diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary
index ef742be1..619dd3c9 160000
--- a/explore/src/app/openaireLibrary
+++ b/explore/src/app/openaireLibrary
@@ -1 +1 @@
-Subproject commit ef742be1b236e84d7fc7819acbbf5679f9726db5
+Subproject commit 619dd3c9fa7bcdd6ca8ab2d67e4166e04b0f9fda