diff --git a/src/app/search/landingPages/dataProvider/libDataProvider.module.ts b/src/app/search/landingPages/dataProvider/libDataProvider.module.ts
index ebc773b..f8e98cb 100644
--- a/src/app/search/landingPages/dataProvider/libDataProvider.module.ts
+++ b/src/app/search/landingPages/dataProvider/libDataProvider.module.ts
@@ -4,6 +4,7 @@ import { MonitorDataProviderComponent } from './dataProvider.component';
 import {DataProviderRoutingModule} from './dataProvider-routing.module';
 import {FreeGuard} from '../../../openaireLibrary/login/freeGuard.guard';
 import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {CommonModule} from "@angular/common";
 
 @NgModule({
   imports: [DataProviderModule, DataProviderRoutingModule, CommonModule],
diff --git a/src/app/search/landingPages/dataset/libDataset.module.ts b/src/app/search/landingPages/dataset/libDataset.module.ts
index 9863987..36d375b 100644
--- a/src/app/search/landingPages/dataset/libDataset.module.ts
+++ b/src/app/search/landingPages/dataset/libDataset.module.ts
@@ -1,14 +1,15 @@
-import { NgModule}            from '@angular/core';
-import { MonitorDatasetComponent } from './dataset.component';
+import {NgModule} from '@angular/core';
+import {MonitorDatasetComponent} from './dataset.component';
 import {FreeGuard} from '../../../openaireLibrary/login/freeGuard.guard';
 import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
 import {DatasetRoutingModule} from './dataset-routing.module';
 import {ResultLandingModule} from "../../../openaireLibrary/landingPages/result/resultLanding.module";
 import {CommonModule} from "@angular/common";
- @NgModule({
-   imports: [DatasetRoutingModule, ResultLandingModule, CommonModule],
+
+@NgModule({
+  imports: [DatasetRoutingModule, ResultLandingModule, CommonModule],
   declarations:[MonitorDatasetComponent],
-  providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled],
+  providers:[FreeGuard, PreviousRouteRecorder],
   exports:[MonitorDatasetComponent]
 })
 export class LibDatasetModule { }
diff --git a/src/app/search/landingPages/software/libSoftware.module.ts b/src/app/search/landingPages/software/libSoftware.module.ts
index 0d7af46..6e662d6 100644
--- a/src/app/search/landingPages/software/libSoftware.module.ts
+++ b/src/app/search/landingPages/software/libSoftware.module.ts
@@ -4,8 +4,9 @@ import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previo
 import { MonitorSoftwareComponent } from './software.component';
 import {SoftwareRoutingModule} from './software-routing.module';
 import {ResultLandingModule} from "../../../openaireLibrary/landingPages/result/resultLanding.module";
+import {CommonModule} from "@angular/common";
 @NgModule({
-  imports: [SoftwareRoutingModule, ResultLandingModule],
+  imports: [SoftwareRoutingModule, ResultLandingModule, CommonModule],
   declarations:[MonitorSoftwareComponent],
   providers:[FreeGuard, PreviousRouteRecorder],
   exports:[MonitorSoftwareComponent]
diff --git a/src/app/search/landingPages/software/software.component.ts b/src/app/search/landingPages/software/software.component.ts
index fdb003c..b5fa8d9 100644
--- a/src/app/search/landingPages/software/software.component.ts
+++ b/src/app/search/landingPages/software/software.component.ts
@@ -1,12 +1,32 @@
 import {Component} from '@angular/core';
+import {ActivatedRoute, Router} from "@angular/router";
+import {StakeholderService} from "../../../openaireLibrary/monitor/services/stakeholder.service";
 
 @Component({
   selector: 'monitor-software',
   template: `
     <div id="page_content">
-      <result-landing type="software"></result-landing>
+      <result-landing *ngIf="initialized" type="software"></result-landing>
     </div>
   `,
 })
 export class MonitorSoftwareComponent {
+  initialized: boolean = false;
+  
+  constructor(private route: ActivatedRoute,
+              private router: Router,
+              private stakeholderService: StakeholderService) {
+  }
+  
+  ngOnInit() {
+    this.route.params.subscribe(params => {
+      if (params['stakeholder']) {
+        this.stakeholderService.getStakeholderAsObservable().subscribe(stakeholder => {
+          if (stakeholder) {
+            this.initialized = true;
+          }
+        });
+      }
+    });
+  }
 }