diff --git a/src/app/search/searchPages/advanced/searchDataproviders.component.ts b/src/app/search/searchPages/advanced/searchDataproviders.component.ts
index f299597..b34af2f 100644
--- a/src/app/search/searchPages/advanced/searchDataproviders.component.ts
+++ b/src/app/search/searchPages/advanced/searchDataproviders.component.ts
@@ -9,7 +9,7 @@ import {StakeholderService} from "../../../openaireLibrary/monitor/services/stak
     <div id="page_content">
       <search-dataproviders *ngIf="initialized" [simpleView]="false"
                             [customFilter]=customFilter [hasPrefix]="false"
-                            [includeOnlyResultsAndFilter]="false">
+                            [includeOnlyResultsAndFilter]="false" [showSwitchSearchLink]="showSwitchSearchLink">
       </search-dataproviders>
     </div>
   `
@@ -17,7 +17,7 @@ import {StakeholderService} from "../../../openaireLibrary/monitor/services/stak
 export class MonitorAdvancedSearchDataprovidersComponent {
   customFilter: SearchCustomFilter = null;
   initialized: boolean = false;
-  
+  showSwitchSearchLink:boolean = false;
   constructor(private route: ActivatedRoute,
               private router: Router,
               private stakeholderService: StakeholderService) {
@@ -28,18 +28,16 @@ export class MonitorAdvancedSearchDataprovidersComponent {
       if (params['stakeholder']) {
         this.stakeholderService.getStakeholderAsObservable().subscribe(stakeholder => {
           if (stakeholder) {
-            if (stakeholder.type === "funder") {
-              this.navigateToError();
-            } else if (stakeholder.type === "organization") {
-              let value = stakeholder.index_id;
-              this.customFilter = new SearchCustomFilter("Organization", "relorganizationid", value, "");
-              this.customFilter.isHiddenFilter = false;
-            } else if (stakeholder.type === "ri") {
-              this.navigateToError();
+            if (stakeholder.type === "organization") {
+                let value = stakeholder.index_id;
+                this.customFilter = new SearchCustomFilter("Organization", "relorganizationid", value, "");
+                this.customFilter.isHiddenFilter = false;
+                this.customFilter.promptToAddFilter = true;
+                this.showSwitchSearchLink = true;
             }
-            this.initialized = true;
-          }
-        });
+              this.initialized = true;
+            }
+          });
       }
     });
   }
diff --git a/src/app/search/searchPages/advanced/searchOrganizations.component.ts b/src/app/search/searchPages/advanced/searchOrganizations.component.ts
index bb22eb5..fe20ec1 100644
--- a/src/app/search/searchPages/advanced/searchOrganizations.component.ts
+++ b/src/app/search/searchPages/advanced/searchOrganizations.component.ts
@@ -6,7 +6,7 @@ import {StakeholderService} from "../../../openaireLibrary/monitor/services/stak
   selector: 'monitor-advanced-search-organizations',
   template: `
     <div id="page_content">
-      <search-organizations *ngIf="initialized" [simpleView]="false">
+      <search-organizations *ngIf="initialized" [simpleView]="false" [showSwitchSearchLink]="false">
       </search-organizations>
     </div>
   `
diff --git a/src/app/search/searchPages/advanced/searchProjects.component.ts b/src/app/search/searchPages/advanced/searchProjects.component.ts
index 0ef5955..9f7fb7a 100644
--- a/src/app/search/searchPages/advanced/searchProjects.component.ts
+++ b/src/app/search/searchPages/advanced/searchProjects.component.ts
@@ -9,7 +9,7 @@ import {StakeholderService} from "../../../openaireLibrary/monitor/services/stak
     <div id="page_content">
       <search-projects *ngIf="initialized" [simpleView]="false"
                        [customFilter]=customFilter [hasPrefix]="false"
-                       [includeOnlyResultsAndFilter]="false">
+                       [includeOnlyResultsAndFilter]="false" [showSwitchSearchLink]="showSwitchSearchLink">
       </search-projects>
     </div>
   `
@@ -18,7 +18,7 @@ import {StakeholderService} from "../../../openaireLibrary/monitor/services/stak
 export class MonitorAdvancedSearchProjectsComponent {
   customFilter: SearchCustomFilter = null;
   initialized: boolean = false;
-  
+  showSwitchSearchLink:boolean = false;
   constructor(private route: ActivatedRoute,
               private router: Router,
               private stakeholderService: StakeholderService) {
@@ -33,12 +33,14 @@ export class MonitorAdvancedSearchProjectsComponent {
               let value = stakeholder.index_id+"||"+stakeholder.index_name+"||"+stakeholder.index_shortName;
               this.customFilter = new SearchCustomFilter("Funder", "funder", value, "");
               this.customFilter.isHiddenFilter = false;
+              this.customFilter.promptToAddFilter = true;
+              this.showSwitchSearchLink = true;
             } else if (stakeholder.type === "organization") {
               let value = stakeholder.index_id;
               this.customFilter = new SearchCustomFilter("Organization", "relorganizationid", value, "");
               this.customFilter.isHiddenFilter = false;
-            } else if (stakeholder.type === "ri") {
-              this.navigateToError();
+              this.customFilter.promptToAddFilter = true;
+              this.showSwitchSearchLink = true;
             }
             this.initialized = true;
           }
diff --git a/src/app/search/searchPages/advanced/searchResearchResults.component.ts b/src/app/search/searchPages/advanced/searchResearchResults.component.ts
index 49283f8..bfb1cb0 100644
--- a/src/app/search/searchPages/advanced/searchResearchResults.component.ts
+++ b/src/app/search/searchPages/advanced/searchResearchResults.component.ts
@@ -10,7 +10,7 @@ import {StakeholderService} from "../../../openaireLibrary/monitor/services/stak
       <search-research-results *ngIf="initialized" resultType="result" [simpleView]="false"
                                [customFilter]=customFilter [hasPrefix]="false"
                                [includeOnlyResultsAndFilter]="false"
-                               [showAdvancedSearchLink]="true"></search-research-results>
+                               [showSwitchSearchLink]="true"></search-research-results>
     </div>
   `
 })
@@ -32,14 +32,17 @@ export class MonitorAdvancedSearchResearchResultsComponent {
               let value = stakeholder.index_id+"||"+stakeholder.index_name+"||"+stakeholder.index_shortName;
               this.customFilter = new SearchCustomFilter("Funder", "relfunder", value,  stakeholder.name);
               this.customFilter.isHiddenFilter = false;
+              this.customFilter.promptToAddFilter = true;
             } else if (stakeholder.type === "organization") {
               let value = stakeholder.index_id;
               this.customFilter = new SearchCustomFilter("Organization", "relorganizationid", value, stakeholder.name);
               this.customFilter.isHiddenFilter = false;
+              this.customFilter.promptToAddFilter = true;
             } else if (stakeholder.type === "ri") {
               let value =  stakeholder.index_id+"||"+stakeholder.index_name;
               this.customFilter = new SearchCustomFilter("Community", "community", value,  stakeholder.name);
               this.customFilter.isHiddenFilter = false;
+              this.customFilter.promptToAddFilter = true;
             }
             this.initialized = true;
           }
diff --git a/src/app/search/searchPages/simple/searchDataproviders.component.ts b/src/app/search/searchPages/simple/searchDataproviders.component.ts
index 16c7a88..a3204f9 100644
--- a/src/app/search/searchPages/simple/searchDataproviders.component.ts
+++ b/src/app/search/searchPages/simple/searchDataproviders.component.ts
@@ -9,7 +9,7 @@ import {StakeholderService} from "../../../openaireLibrary/monitor/services/stak
     <div id="page_content">
       <search-dataproviders *ngIf="initialized"
                             [customFilter]=customFilter [hasPrefix]="false"
-                            [includeOnlyResultsAndFilter]="false">
+                            [includeOnlyResultsAndFilter]="false" [showSwitchSearchLink]="showSwitchSearchLink">
       </search-dataproviders>
     </div>
   `
@@ -17,7 +17,7 @@ import {StakeholderService} from "../../../openaireLibrary/monitor/services/stak
 export class MonitorSearchDataprovidersComponent {
   customFilter: SearchCustomFilter = null;
   initialized: boolean = false;
-  
+  showSwitchSearchLink:boolean = false;
   constructor(private route: ActivatedRoute,
               private router: Router,
               private stakeholderService: StakeholderService) {
@@ -34,6 +34,7 @@ export class MonitorSearchDataprovidersComponent {
               let value = stakeholder.index_id;
               this.customFilter = new SearchCustomFilter("Organization", "relorganizationid", value, "");
               this.customFilter.isHiddenFilter = false;
+              this.showSwitchSearchLink = true;
             } else if (stakeholder.type === "ri") {
               this.navigateToError();
             }
diff --git a/src/app/search/searchPages/simple/searchProjects.component.ts b/src/app/search/searchPages/simple/searchProjects.component.ts
index ffd60af..2bf45f3 100644
--- a/src/app/search/searchPages/simple/searchProjects.component.ts
+++ b/src/app/search/searchPages/simple/searchProjects.component.ts
@@ -9,7 +9,7 @@ import {StakeholderService} from "../../../openaireLibrary/monitor/services/stak
     <div id="page_content">
       <search-projects *ngIf="initialized"
                        [customFilter]=customFilter [hasPrefix]="false"
-                       [includeOnlyResultsAndFilter]="false">
+                       [includeOnlyResultsAndFilter]="false" >
       </search-projects>
     </div>
   `
@@ -18,7 +18,7 @@ import {StakeholderService} from "../../../openaireLibrary/monitor/services/stak
 export class MonitorSearchProjectsComponent {
   customFilter: SearchCustomFilter = null;
   initialized: boolean = false;
-  
+
   constructor(private route: ActivatedRoute,
               private router: Router,
               private stakeholderService: StakeholderService) {
@@ -33,10 +33,12 @@ export class MonitorSearchProjectsComponent {
               let value = stakeholder.index_id+"||"+stakeholder.index_name+"||"+stakeholder.index_shortName;
               this.customFilter = new SearchCustomFilter("Funder", "funder", value, "");
               this.customFilter.isHiddenFilter = false;
+              this.customFilter.promptToAddFilter = true;
             } else if (stakeholder.type === "organization") {
               let value = stakeholder.index_id;
               this.customFilter = new SearchCustomFilter("Organization", "relorganizationid", value, "");
               this.customFilter.isHiddenFilter = false;
+              this.customFilter.promptToAddFilter = true;
             } else if (stakeholder.type === "ri") {
               this.navigateToError();
             }
diff --git a/src/app/search/searchPages/simple/searchResearchResults.component.ts b/src/app/search/searchPages/simple/searchResearchResults.component.ts
index b1ee46f..81dd009 100644
--- a/src/app/search/searchPages/simple/searchResearchResults.component.ts
+++ b/src/app/search/searchPages/simple/searchResearchResults.component.ts
@@ -10,7 +10,7 @@ import {StakeholderService} from "../../../openaireLibrary/monitor/services/stak
       <search-research-results *ngIf="initialized" resultType="result"
                                [customFilter]=customFilter [hasPrefix]="false"
                                [includeOnlyResultsAndFilter]="false"
-                               [showAdvancedSearchLink]="true"></search-research-results>
+                               [showSwitchSearchLink]="true"></search-research-results>
     </div>
   `,
 })
@@ -32,14 +32,17 @@ export class MonitorSearchResearchResultsComponent {
               let value = stakeholder.index_id+"||"+stakeholder.index_name+"||"+stakeholder.index_shortName;
               this.customFilter = new SearchCustomFilter("Funder", "relfunder", value, stakeholder.name);
               this.customFilter.isHiddenFilter = false;
+              this.customFilter.promptToAddFilter = true;
             } else if (stakeholder.type === "organization") {
               let value = stakeholder.index_id;
               this.customFilter = new SearchCustomFilter("Organization", "relorganizationid", value,  stakeholder.name);
               this.customFilter.isHiddenFilter = false;
+              this.customFilter.promptToAddFilter = true;
             } else if (stakeholder.type === "ri") {
               let value =  stakeholder.index_id+"||"+stakeholder.index_name;
               this.customFilter = new SearchCustomFilter("Community", "community", value,  stakeholder.name);
               this.customFilter.isHiddenFilter = false;
+              this.customFilter.promptToAddFilter = true;
             }
             this.initialized = true;
           }