diff --git a/portal-2/src/app/landingPages/dataProvider/organizationsTab.component.ts b/portal-2/src/app/landingPages/dataProvider/organizationsTab.component.ts
index ba6d605e..48378b5c 100644
--- a/portal-2/src/app/landingPages/dataProvider/organizationsTab.component.ts
+++ b/portal-2/src/app/landingPages/dataProvider/organizationsTab.component.ts
@@ -3,11 +3,11 @@ import {Component, Input} from '@angular/core';
 @Component({
     selector: 'organizationsTab',
     template: `
-        <div *ngIf="organizations.length == 0" class = "uk-alert">
+        <div *ngIf=" !organizations || organizations.length == 0" class = "uk-alert">
             There are no organizations
         </div>
 
-        <div *ngIf="organizations.length > 0">
+        <div *ngIf="  organizations && organizations.length > 0">
             <p>
                 The results below are discovered through our pilot algorithms.
                 <a href="mailto:">Let us know how we are doing!</a>
diff --git a/portal-2/src/app/landingPages/dataProvider/tabs.component.ts b/portal-2/src/app/landingPages/dataProvider/tabs.component.ts
index 5255ed33..e4467376 100644
--- a/portal-2/src/app/landingPages/dataProvider/tabs.component.ts
+++ b/portal-2/src/app/landingPages/dataProvider/tabs.component.ts
@@ -78,7 +78,7 @@ import {OpenaireProperties} from '../../utils/properties/openaireProperties';
                 </datasetsTab>
                 <!--statisticsTab *ngIf="tabs[0].content=='statisticsTab'"
                                [statistics]="statistics" [show]=statsClicked>
-                </statisticsTab-- >
+                </statisticsTab-->
                 <div *ngIf="tabs[0].content=='statisticsTab' && statsClicked">
                   <div *ngIf="searchPublicationsComponent.searchUtils.totalResults == 0 && searchDatasetsComponent.searchUtils.totalResults == 0" class = "uk-alert">
                       There are no statistics
@@ -120,7 +120,7 @@ import {OpenaireProperties} from '../../utils/properties/openaireProperties';
                                 [paramsForSearchLink]="paramsForSearchLink"
                                 [searchDataprovidersComponent]="searchDataprovidersComponent">
                 </datasourcesTab>
-                <organizationsTab *ngIf="tabs[0].content=='organizationsTab'">
+                <organizationsTab *ngIf="tabs[0].content=='organizationsTab'" >
                                   [organizations]="organizations"
                 </organizationsTab>
                 <relatedDatasourcesTab *ngIf="tabs[0].content=='relatedDatasourcesTab'"
diff --git a/portal-2/src/index.html b/portal-2/src/index.html
index 5de35d81..89af223f 100644
--- a/portal-2/src/index.html
+++ b/portal-2/src/index.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <html lang="en-gb" dir="ltr" vocab="http://schema.org/">
    <head>
-      <link href="http://scoobydoo.di.uoa.gr:3000" rel="canonical" />
+      <link href="http://demo.openaire.eu" rel="canonical" />
       <meta charset="utf-8">
       <meta http-equiv="X-UA-Compatible" content="IE=edge">
       <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -49,7 +49,7 @@
            "@context" : "http://schema.org",
            "@type" : "WebSite",
            "name" : "OpenAIRE",
-             "url" : "http://scoobydoo.di.uoa.gr:3000"
+             "url" : "http://demo.openaire.eu"
          }
       </script>
       <!-- End of Google sitename markup-->
@@ -58,10 +58,10 @@
          {
            "@context": "http://schema.org",
            "@type": "WebSite",
-           "url" : "http://scoobydoo.di.uoa.gr:3000",
+           "url" : "http://demo.openaire.eu",
            "potentialAction": {
              "@type": "SearchAction",
-             "target": "http://scoobydoo.di.uoa.gr:3000/search/find/?keyword={search_term_string}",
+             "target": "http://demo.openaire.eu/search/find/?keyword={search_term_string}",
              "query-input": "required name=search_term_string"
            }
          }
