Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/sitemap.xml
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/sitemap.xml	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/sitemap.xml	(nonexistent)
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">
-    <url>
-        <loc><![CDATA[https://connect.openaire.eu]]></loc>
-    </url>
-    <url>
-        <loc><![CDATA[https://connect.openaire.eu/about/learn-how]]></loc>
-    </url>
-    <url>
-        <loc><![CDATA[https://connect.openaire.eu/about/learn-in-depth]]></loc>
-    </url>
-    <url>
-        <loc><![CDATA[https://connect.openaire.eu/about/faq]]></loc>
-    </url>
-    <url>
-        <loc><![CDATA[https://connect.openaire.eu/search/find/communities]]></loc>
-    </url>
-    <url>
-        <loc><![CDATA[https://connect.openaire.eu]]></loc>
-    </url>
-    <url>
-        <loc><![CDATA[https://connect.openaire.eu]]></loc>
-    </url>
-</urlset>
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts	(nonexistent)
@@ -1,19 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-
-import{OpenaireAdvancedSearchDatasetsComponent} from './advancedSearchDatasets.component';
-
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
-import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
-
-@NgModule({
-  imports: [
-    RouterModule.forChild([
-     	{ path: '', component: OpenaireAdvancedSearchDatasetsComponent, canActivate: [FreeGuard], data: {
-          redirect: '/error' 
-        }, canDeactivate: [PreviousRouteRecorder] }
-
-    ])
-  ]
-})
-export class AdvancedSearchDatasetsRoutingModule { }
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchOrps.component.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchOrps.component.ts	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchOrps.component.ts	(nonexistent)
@@ -1,47 +0,0 @@
-import {Component, Input} from '@angular/core';
-import {ActivatedRoute} from '@angular/router';
-import {PiwikHelper} from '../../utils/piwikHelper';
-import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
-import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class";
-
-
-@Component({
-    selector: 'openaire-advanced-search-orps',
-    template: `
-      <advanced-search-research-results
-        [customFilter]=customFilter [piwikSiteId]="piwikSiteId" [hasPrefix]="false" resultType="other">
-      </advanced-search-research-results>
-    `
- })
-
-export class OpenaireAdvancedSearchOrpsComponent {
-  connectCommunityId:string;
-  piwikSiteId = null;
-  customFilter: SearchCustomFilter = null;
-  constructor ( private  route: ActivatedRoute) {
-  }
-
-  ngOnInit() {
-    this.route.data
-        .subscribe((data: { envSpecific: any }) => {
-
-          var communityId =  ConnectHelper.getCommunityFromDomain(data.envSpecific.domain);
-
-          this.piwikSiteId = PiwikHelper.getSiteId(communityId,data.envSpecific.environment);
-
-          if(communityId){
-                  this.connectCommunityId = communityId;
-                  this.customFilter = new SearchCustomFilter("Community", "communityId", this.connectCommunityId, "");
-                }else{
-                  this.route.queryParams.subscribe(params => {
-
-                    if(params['communityId'] && params['communityId']!=""){
-                      this.connectCommunityId = params['communityId'];
-                      this.piwikSiteId = PiwikHelper.getSiteId(this.connectCommunityId, data.envSpecific.environment);
-                      this.customFilter = new SearchCustomFilter("Community", "communityId", this.connectCommunityId, "");
-                    }
-                  });
-         }
-    });
-  }
-}
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchPublications.module.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchPublications.module.ts	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchPublications.module.ts	(nonexistent)
@@ -1,25 +0,0 @@
-import { NgModule}            from '@angular/core';
-import { CommonModule }        from '@angular/common';
-import { FormsModule }         from '@angular/forms';
-
-import {AdvancedSearchPublicationsRoutingModule} from './advancedSearchPublications-routing.module';
-import {OpenaireAdvancedSearchPublicationsComponent} from './advancedSearchPublications.component';
-
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
-import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchPages/advanced/advancedSearchResearchResults.module";
-
-@NgModule({
-  imports: [
-    CommonModule, FormsModule,
-    AdvancedSearchPublicationsRoutingModule, AdvancedSearchResearchResultsModule
-
-  ],
-  declarations: [
-    OpenaireAdvancedSearchPublicationsComponent
-   ],
-  providers:[FreeGuard],
-  exports: [
-    OpenaireAdvancedSearchPublicationsComponent
-     ]
-})
-export class LibAdvancedSearchPublicationsModule { }
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchDatasets.module.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchDatasets.module.ts	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchDatasets.module.ts	(nonexistent)
@@ -1,25 +0,0 @@
-import { NgModule}            from '@angular/core';
-import { CommonModule }        from '@angular/common';
-import { FormsModule }         from '@angular/forms';
-
-import { AdvancedSearchDatasetsRoutingModule} from './advancedSearchDatasets-routing.module';
-import {OpenaireAdvancedSearchDatasetsComponent} from './advancedSearchDatasets.component';
-
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
-import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchPages/advanced/advancedSearchResearchResults.module";
-
-@NgModule({
-  imports: [
-    CommonModule, FormsModule,
-    AdvancedSearchDatasetsRoutingModule, AdvancedSearchResearchResultsModule
-
-  ],
-  declarations: [
-    OpenaireAdvancedSearchDatasetsComponent
-   ],
-  providers:[FreeGuard],
-  exports: [
-    OpenaireAdvancedSearchDatasetsComponent
-     ]
-})
-export class LibAdvancedSearchDatasetsModule { }
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchOrps-routing.module.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchOrps-routing.module.ts	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchOrps-routing.module.ts	(nonexistent)
@@ -1,18 +0,0 @@
-import {NgModule} from '@angular/core';
-import {RouterModule} from '@angular/router';
-
-import {OpenaireAdvancedSearchOrpsComponent} from './advancedSearchOrps.component';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
-import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
-
-@NgModule({
-  imports: [
-    RouterModule.forChild([
-     	{ path: '', component: OpenaireAdvancedSearchOrpsComponent, canActivate: [FreeGuard], data: {
-          redirect: '/error'
-        }, canDeactivate: [PreviousRouteRecorder] }
-
-    ])
-  ]
-})
-export class AdvancedSearchOrpsRoutingModule { }
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchSoftware.component.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchSoftware.component.ts	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchSoftware.component.ts	(nonexistent)
@@ -1,45 +0,0 @@
-import {Component, Input} from '@angular/core';
-import {ActivatedRoute} from '@angular/router';
-import {PiwikHelper} from '../../utils/piwikHelper';
-import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
-import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class";
-
-@Component({
-    selector: 'openaire-advanced-search-software',
-    template: `      
-      <advanced-search-research-results
-       [customFilter]=customFilter [piwikSiteId]="piwikSiteId" [hasPrefix]="false" resultType="software">
-      </advanced-search-research-results>
-    `
- })
-
-export class OpenaireAdvancedSearchSoftwareComponent {
-  connectCommunityId:string;
-  piwikSiteId = null;
-  customFilter: SearchCustomFilter = null;
-  constructor ( private  route: ActivatedRoute) {
-  }
-  ngOnInit() {
-    this.route.data
-        .subscribe((data: { envSpecific: any }) => {
-
-          var communityId =  ConnectHelper.getCommunityFromDomain(data.envSpecific.domain);
-
-          this.piwikSiteId = PiwikHelper.getSiteId(communityId, data.envSpecific.environment);
-
-          if(communityId){
-            this.connectCommunityId = communityId;
-            this.customFilter = new SearchCustomFilter("Community", "communityId", this.connectCommunityId, "");
-          } else{
-            this.route.queryParams.subscribe(params => {
-
-              if(params['communityId'] && params['communityId']!=""){
-                this.connectCommunityId = params['communityId'];
-                this.piwikSiteId = PiwikHelper.getSiteId(this.connectCommunityId, data.envSpecific.environment);
-                this.customFilter = new SearchCustomFilter("Community", "communityId", this.connectCommunityId, "");
-              }
-            });
-          }
-    });
-  }
-}
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchOrps.module.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchOrps.module.ts	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchOrps.module.ts	(nonexistent)
@@ -1,26 +0,0 @@
-import {NgModule}                            from '@angular/core';
-import {CommonModule}                        from '@angular/common';
-import {FormsModule}                         from '@angular/forms';
-
-import {AdvancedSearchOrpsRoutingModule}     from './advancedSearchOrps-routing.module';
-import {OpenaireAdvancedSearchOrpsComponent} from './advancedSearchOrps.component';
-
-import {FreeGuard}                           from '../../openaireLibrary/login/freeGuard.guard';
-import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchPages/advanced/advancedSearchResearchResults.module";
-
-@NgModule({
-  imports: [
-    CommonModule, FormsModule,
-    AdvancedSearchOrpsRoutingModule, AdvancedSearchResearchResultsModule
-  ],
-  declarations: [
-    OpenaireAdvancedSearchOrpsComponent
-  ],
-  providers: [
-    FreeGuard
-  ],
-  exports: [
-    OpenaireAdvancedSearchOrpsComponent
-  ]
-})
-export class LibAdvancedSearchOrpsModule { }
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchSoftware-routing.module.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchSoftware-routing.module.ts	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchSoftware-routing.module.ts	(nonexistent)
@@ -1,16 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-
-import{OpenaireAdvancedSearchSoftwareComponent} from './advancedSearchSoftware.component';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
-import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
-
-@NgModule({
-  imports: [
-    RouterModule.forChild([
-     	{ path: '', component: OpenaireAdvancedSearchSoftwareComponent, canActivate: [FreeGuard],canDeactivate: [PreviousRouteRecorder] }
-
-    ])
-  ]
-})
-export class AdvancedSearchSoftwareRoutingModule { }
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchPublications.component.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchPublications.component.ts	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchPublications.component.ts	(nonexistent)
@@ -1,45 +0,0 @@
-import {Component, Input} from '@angular/core';
-import {ActivatedRoute} from '@angular/router';
-import {PiwikHelper} from '../../utils/piwikHelper';
-import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
-import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class";
-
-
-@Component({
-    selector: 'openaire-advanced-search-publications',
-    template: `      
-      <advanced-search-research-results
-        [customFilter]=customFilter [piwikSiteId]="piwikSiteId" [hasPrefix]="false" resultType="publication">
-      </advanced-search-research-results>
-    `
- })
-
-export class OpenaireAdvancedSearchPublicationsComponent {
-  connectCommunityId:string;
-  piwikSiteId = null;
-  customFilter: SearchCustomFilter = null;
-  constructor ( private  route: ActivatedRoute) {
-  }
-  ngOnInit() {
-    this.route.data
-        .subscribe((data: { envSpecific: any }) => {
-          var communityId =  ConnectHelper.getCommunityFromDomain(data.envSpecific.domain);
-
-          this.piwikSiteId = PiwikHelper.getSiteId(communityId, data.envSpecific.environment);
-
-          if(communityId){
-            this.connectCommunityId = communityId;
-            this.customFilter = new SearchCustomFilter("Community", "communityId", this.connectCommunityId, "");
-          }else{
-            this.route.queryParams.subscribe(params => {
-
-              if(params['communityId'] && params['communityId']!=""){
-                this.connectCommunityId = params['communityId'];
-                this.piwikSiteId = PiwikHelper.getSiteId(this.connectCommunityId, data.envSpecific.environment);
-                this.customFilter = new SearchCustomFilter("Community", "communityId", this.connectCommunityId, "");
-              }
-            });
-         }
-    });
-  }
-}
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchDatasets.component.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchDatasets.component.ts	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchDatasets.component.ts	(nonexistent)
@@ -1,46 +0,0 @@
-import {Component, Input} from '@angular/core';
-import {ActivatedRoute} from '@angular/router';
-import {PiwikHelper} from '../../utils/piwikHelper';
-import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
-import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class";
-
-
-@Component({
-    selector: 'openaire-advanced-search-datasets',
-    template: `      
-    <advanced-search-research-results 
-      [customFilter]=customFilter [piwikSiteId]="piwikSiteId" [hasPrefix]="false" resultType="dataset">
-    </advanced-search-research-results>
-    `
- })
-
-export class OpenaireAdvancedSearchDatasetsComponent {
-
-  connectCommunityId:string;
-  piwikSiteId = null;
-  customFilter: SearchCustomFilter = null;
-  constructor ( private  route: ActivatedRoute) {
-  }
-  ngOnInit() {
-    this.route.data
-        .subscribe((data: { envSpecific: any }) => {
-
-                var communityId =  ConnectHelper.getCommunityFromDomain(data.envSpecific.domain);
-
-                this.piwikSiteId = PiwikHelper.getSiteId(communityId,data.envSpecific.environment);
-                if(communityId){
-                  this.connectCommunityId = communityId;
-                  this.customFilter = new SearchCustomFilter("Community", "communityId", this.connectCommunityId, "");
-                }else{
-                  this.route.queryParams.subscribe(params => {
-
-                    if(params['communityId'] && params['communityId']!=""){
-                      this.connectCommunityId = params['communityId'];
-                      this.piwikSiteId = PiwikHelper.getSiteId(this.connectCommunityId,data.envSpecific.environment);
-                      this.customFilter = new SearchCustomFilter("Community", "communityId", this.connectCommunityId, "");
-                    }
-                  });
-         }
-    });
-  }
-}
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchSoftware.module.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchSoftware.module.ts	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchSoftware.module.ts	(nonexistent)
@@ -1,25 +0,0 @@
-import { NgModule}            from '@angular/core';
-import { CommonModule }        from '@angular/common';
-import { FormsModule }         from '@angular/forms';
-
-import {AdvancedSearchSoftwareRoutingModule} from './advancedSearchSoftware-routing.module';
-import {OpenaireAdvancedSearchSoftwareComponent} from './advancedSearchSoftware.component';
-
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
-import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchPages/advanced/advancedSearchResearchResults.module";
-
-@NgModule({
-  imports: [
-    CommonModule, FormsModule,
-    AdvancedSearchSoftwareRoutingModule, AdvancedSearchResearchResultsModule
-
-  ],
-  declarations: [
-    OpenaireAdvancedSearchSoftwareComponent
-   ],
-  providers:[FreeGuard],
-  exports: [
-    OpenaireAdvancedSearchSoftwareComponent
-     ]
-})
-export class LibAdvancedSearchSoftwareModule { }
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts	(nonexistent)
@@ -1,18 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-
-import{OpenaireAdvancedSearchPublicationsComponent} from './advancedSearchPublications.component';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
-import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
-
-@NgModule({
-  imports: [
-    RouterModule.forChild([
-     	{ path: '', component: OpenaireAdvancedSearchPublicationsComponent, canActivate: [FreeGuard], data: {
-          redirect: '/error' 
-        }, canDeactivate: [PreviousRouteRecorder] }
-
-    ])
-  ]
-})
-export class AdvancedSearchPublicationsRoutingModule { }
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/angular.json
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/angular.json	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/angular.json	(revision 59305)
@@ -18,8 +18,7 @@
             "polyfills": "src/polyfills.ts",
             "assets": [
               "src/assets",
-              "src/robots.txt",
-              "src/sitemap.xml"
+              "src/robots.txt"
             ],
             "styles": [
               "src/styles.css",
@@ -136,8 +135,7 @@
             ],
             "assets": [
               "src/assets",
-              "src/robots.txt",
-              "src/sitemap.xml"
+              "src/robots.txt"
             ]
           }
         },
@@ -166,6 +164,14 @@
                 {
                   "replace": "src/environments/environment.ts",
                   "with": "src/environments/environment.prod.ts"
+                },
+                {
+                  "replace": "src/index.html",
+                  "with": "src/index.prod.html"
+                },
+                {
+                  "replace": "src/robots.txt",
+                  "with": "src/robots.prod.txt"
                 }
               ]
             },
@@ -174,6 +180,14 @@
                 {
                   "replace": "src/environments/environment.ts",
                   "with": "src/environments/environment.beta.ts"
+                },
+                {
+                  "replace": "src/index.html",
+                  "with": "src/index.beta.html"
+                },
+                {
+                  "replace": "src/robots.txt",
+                  "with": "src/robots.beta.txt"
                 }
               ]
             },
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/contact/contact.component.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/contact/contact.component.ts	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/contact/contact.component.ts	(revision 59305)
@@ -57,7 +57,7 @@
             this.seoService.createLinkForCanonicalURL(this.url);
             this.updateUrl(this.url);
             this.updateTitle(this.pageTitle);
-            this.updateDescription("OpenAIRE - Connect, Community Gateway, research community");
+            this.updateDescription("Contact us to learn more about OpenAIRE Connect Research Gateways");
             this.reset();
             //this.getDivContents();
             this.getPageContents();
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/utils/subscribe/invite/inviteBasic.module.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/utils/subscribe/invite/inviteBasic.module.ts	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/utils/subscribe/invite/inviteBasic.module.ts	(revision 59305)
@@ -2,7 +2,7 @@
 import {CommonModule}               from '@angular/common';
 import {FormsModule}                from '@angular/forms';
 import {RouterModule}               from '@angular/router';
-import {CKEditorModule}             from 'ng2-ckeditor';
+import {CKEditorModule}             from 'ckeditor4-angular';
 
 import {InviteComponent}            from './invite.component';
 
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/package.json
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/package.json	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/package.json	(revision 59305)
@@ -29,7 +29,7 @@
     "webpack:server": "webpack --config webpack.server.config.js --progress --colors",
     "serve:prerender": "cd dist/browser && http-server",
     "serve:ssr": "node dist/server",
-    "after-build-clean":  "rm -rf src node_modules  .idea/ installOpenaireLib.sh deploy dist/browser/assets/common-assets/.svn/ dist/browser/stats.json ; "
+    "after-build-clean": "rm -rf src node_modules  .idea/ installOpenaireLib.sh deploy dist/browser/assets/common-assets/.svn/ dist/browser/stats.json ; "
   },
   "private": true,
   "dependencies": {
@@ -62,7 +62,7 @@
     "wikidata-sdk": "^5.2.9",
     "zone.js": "^0.8.26",
     "ng-recaptcha": "^3.0.5",
-    "ng2-ckeditor": "1.1.9"
+    "ckeditor4-angular": "^1.2.2"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "~0.13.0",
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/subjects/subjects.module.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/subjects/subjects.module.ts	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/subjects/subjects.module.ts	(revision 59305)
@@ -21,7 +21,6 @@
   declarations: [
     SubjectsComponent
   ],
-  providers: [],
   exports: [
     SubjectsComponent
   ]
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/app.component.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/app.component.ts	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/app.component.ts	(revision 59305)
@@ -32,6 +32,16 @@
               [showHomeMenuItem]="false"></navbar>
       <customization *ngIf="properties  && communityId && communityId.length > 0" [properties]="properties"
                      [communityId]="communityId"></customization>
+      <schema2jsonld *ngIf="properties && showMenu && !community"  [URL]="properties.baseLink"
+                     [logoURL]="properties.baseLink+'/assets/common-assets/logo-small-connect.png'" type="home"
+                     [searchActionRoute]="properties.searchLinkToCommunities" [searchAction]="true"
+                     name="OpenAIRE Connect"
+                     description="Build a Gateway for your Community: Turn Open Science into Practice. It takes your open and linked research outcomes.">
+      </schema2jsonld>
+      <schema2jsonld  *ngIf="properties  && showMenu && communityId && communityId.length > 0" [URL]="properties.domain"
+                     [logoURL]="community.logoUrl" type="home" [searchActionRoute]="properties.searchLinkToResults"
+                     [name]="community.name" [description]="community.description" >
+      </schema2jsonld>
       <div class="custom-main-content">
         <main>
           <router-outlet></router-outlet>
@@ -158,18 +168,16 @@
             break;
           }
           if (this.user && com['status'] != "hidden") {
-            if (Session.isCommunityCurator(this.user) || Session.isPortalAdministrator(this.user)) {
+            if (Session.isCommunityCurator(this.user) || Session.isPortalAdministrator(this.user) || Session.isManager('community', this.communityId, this.user)) {
               this.managerOfCommunities = true;
             } else if (com.managers.indexOf(this.user.email) != -1) {
               this.managerOfCommunities = true;
             }
           }
-
-
           if (communityId && communityId != "" && com.communityId == communityId) {
             community = com;
             let isCommunityManager: boolean = false;
-            if (Session.isCommunityCurator(this.user) || Session.isPortalAdministrator(this.user)) {
+            if (Session.isCommunityCurator(this.user) || Session.isPortalAdministrator(this.user) || Session.isManager('community', this.communityId, this.user)) {
               isCommunityManager = true;
             } else if (this.user && com.managers.indexOf(this.user.email) != -1) {
               isCommunityManager = true;
@@ -177,7 +185,8 @@
             this.community = {
               id: community.communityId,
               name: (community.shortTitle) ? community.shortTitle : community.title,
-              logoUrl: community.logoUrl
+              logoUrl: community.logoUrl,
+              description:community.description
             };
             this.menuItems = [];
 
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/htmlPages/htmlPage.component.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/htmlPages/htmlPage.component.ts	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/htmlPages/htmlPage.component.ts	(revision 59305)
@@ -11,7 +11,7 @@
 @Component({
   selector: 'html-page',
   template: `
-    <schema2jsonld *ngIf="url" [URL]="url" [name]="pageTitle" type="other"></schema2jsonld>
+    <schema2jsonld *ngIf="url" [URL]="url" [name]="pageTitle" type="other" [description]="description"></schema2jsonld>
     <helper *ngIf="pageContents && pageContents['top'] && pageContents['top'].length > 0" [texts]="pageContents['top']"></helper>
 `
 })
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/community/community.component.html
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/community/community.component.html	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/community/community.component.html	(revision 59305)
@@ -1,8 +1,3 @@
-<schema2jsonld *ngIf="community" [URL]="url"
-               [logoURL]="community.logoUrl" type="home"
-               [name]="community.title">
-</schema2jsonld>
-
 <div class="">
 <div id="stickhere">
 </div>
@@ -231,7 +226,7 @@
                      class="uk-button portal-button uk-text-bold  uk-padding uk-padding-remove-vertical uk-margin-small-left">
               Search
             </button>
-            <div class="uk-margin-small-top  uk-margin-left"> <a *ngIf="selectedEntity!= 'all'" (click)="goTo(false)"
+            <div class="uk-margin-small-top  uk-margin-left"> <a *ngIf="selectedEntity== 'result'" (click)="goTo(false)"
                                                                  class="portal-link">Advanced Search</a></div>
           </div>
         </div>
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/community/community.module.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/community/community.module.ts	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/community/community.module.ts	(revision 59305)
@@ -22,7 +22,6 @@
 import {SearchResultsModule} from "../openaireLibrary/searchPages/searchUtils/searchResults.module";
 import {CuratorsModule} from "../curators/curators.module";
 import {AffiliationsModule} from "../affiliations/affiliations.module";
-import {Schema2jsonldModule} from "../openaireLibrary/sharedComponents/schema2jsonld/schema2jsonld.module";
 import {SEOServiceModule} from "../openaireLibrary/sharedComponents/SEO/SEOService.module";
 import {MatSelectModule} from "@angular/material";
 import {EntitiesSelectionModule} from "../openaireLibrary/searchPages/searchUtils/entitiesSelection.module";
@@ -36,7 +35,7 @@
     SubscribeModule, StatisticsModule, ManageModule, InviteModule,
     SearchZenodoCommunitiesServiceModule, ZenodoCommunitiesServiceModule, SearchFormModule, SearchDataprovidersServiceModule, SearchProjectsServiceModule,
     SearchResearchResultsServiceModule, SearchResultsModule, CuratorsModule, AffiliationsModule,
-    Schema2jsonldModule, SEOServiceModule, MatSelectModule, EntitiesSelectionModule,
+    SEOServiceModule, MatSelectModule, EntitiesSelectionModule,
     TabsModule, SearchTabModule, ErrorMessagesModule
   ],
   declarations: [
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/assets/sitemap.xml
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/assets/sitemap.xml	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/assets/sitemap.xml	(nonexistent)
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">
-   <url>
-      <loc><![CDATA[https://demo.openaire.eu]]></loc>
-      <changefreq>weekly</changefreq>
-      <priority>0.5</priority>
-   </url>
-   <url>
-      <loc><![CDATA[https://demo.openaire.eu/participate/deposit-publications-data]]></loc>
-      <changefreq>weekly</changefreq>
-      <priority>0.5</priority>
-   </url>
-   <url>
-      <loc><![CDATA[https://demo.openaire.eu/participate/claim]]></loc>
-      <changefreq>weekly</changefreq>
-      <priority>0.5</priority>
-   </url>
-   <url>
-      <loc><![CDATA[https://demo.openaire.eu/search/find]]></loc>
-      <changefreq>weekly</changefreq>
-      <priority>0.5</priority>
-   </url>
-   <url>
-      <loc><![CDATA[https://demo.openaire.eu/search/find/publications]]></loc>
-      <changefreq>weekly</changefreq>
-      <priority>0.5</priority>
-   </url>
-   <url>
-      <loc><![CDATA[https://demo.openaire.eu/search/find/other]]></loc>
-      <changefreq>weekly</changefreq>
-      <priority>0.5</priority>
-   </url>
-   <url>
-      <loc><![CDATA[https://demo.openaire.eu/search/find/datasets]]></loc>
-      <changefreq>weekly</changefreq>
-      <priority>0.5</priority>
-   </url>
-   <url>
-      <loc><![CDATA[https://demo.openaire.eu/search/find/projects]]></loc>
-      <changefreq>weekly</changefreq>
-      <priority>0.5</priority>
-   </url>
-   <url>
-      <loc><![CDATA[https://demo.openaire.eu/search/find/people]]></loc>
-      <changefreq>weekly</changefreq>
-      <priority>0.5</priority>
-   </url>
-   <url>
-      <loc><![CDATA[https://demo.openaire.eu/search/find/organizations]]></loc>
-      <changefreq>weekly</changefreq>
-      <priority>0.5</priority>
-   </url>
-   <url>
-      <loc><![CDATA[https://demo.openaire.eu/search/find/dataproviders]]></loc>
-      <changefreq>weekly</changefreq>
-      <priority>0.5</priority>
-   </url>
-   <url>
-      <loc><![CDATA[https://demo.openaire.eu/search/advanced/publications]]></loc>
-      <changefreq>weekly</changefreq>
-      <priority>0.5</priority>
-   </url>
-   <url>
-      <loc><![CDATA[https://demo.openaire.eu/search/advanced/other]]></loc>
-      <changefreq>weekly</changefreq>
-      <priority>0.5</priority>
-   </url>
-   <url>
-      <loc><![CDATA[https://demo.openaire.eu/search/advanced/datasets]]></loc>
-      <changefreq>weekly</changefreq>
-      <priority>0.5</priority>
-   </url>
-   <url>
-      <loc><![CDATA[https://demo.openaire.eu/search/advanced/projects]]></loc>
-      <changefreq>weekly</changefreq>
-      <priority>0.5</priority>
-   </url>
-   <url>
-      <loc><![CDATA[https://demo.openaire.eu/search/advanced/people]]></loc>
-      <changefreq>weekly</changefreq>
-      <priority>0.5</priority>
-   </url>
-   <url>
-      <loc><![CDATA[https://demo.openaire.eu/search/advanced/organizations]]></loc>
-      <changefreq>weekly</changefreq>
-      <priority>0.5</priority>
-   </url>
-   <url>
-      <loc><![CDATA[https://demo.openaire.eu/search/advanced/dataproviders]]></loc>
-      <changefreq>weekly</changefreq>
-      <priority>0.5</priority>
-   </url>
-   <url>
-      <loc><![CDATA[https://demo.openaire.eu/search/content-providers]]></loc>
-      <changefreq>weekly</changefreq>
-      <priority>0.5</priority>
-   </url>
-   <url>
-      <loc><![CDATA[https://demo.openaire.eu/search/entity-registries]]></loc>
-      <changefreq>weekly</changefreq>
-      <priority>0.5</priority>
-   </url>
-   <url>
-      <loc>![CDATA[https://demo.openaire.eu/participate/deposit-publications]</loc>
-      <changefreq>weekly</changefreq>
-      <priority>0.5</priority>
-   </url>
-   <url>
-      <loc>![CDATA[https://demo.openaire.eu/participate/deposit-datasets]</loc>
-      <changefreq>weekly</changefreq>
-      <priority>0.5</priority>
-   </url>
-</urlset>
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/communities/communities.component.html
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/communities/communities.component.html	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/communities/communities.component.html	(revision 59305)
@@ -1,7 +1,3 @@
-<schema2jsonld [URL]="properties.baseLink"
-               [logoURL]="properties.baseLink+'/assets/common-assets/logo-small-connect.png'" type="home"
-               name="OpenAIRE Connect">
-</schema2jsonld>
 <div>
   <div class="image-front-topbar"
        uk-scrollspy="{&quot;target&quot;:&quot;[uk-scrollspy-class]&quot;,&quot;cls&quot;:&quot;uk-animation-fade&quot;,&quot;delay&quot;:false}"
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/learn-how/learn-how.component.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/learn-how/learn-how.component.ts	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/learn-how/learn-how.component.ts	(revision 59305)
@@ -1,10 +1,4 @@
 import {Component} from '@angular/core';
-import {ActivatedRoute, Router} from '@angular/router';
-import {Meta, Title} from '@angular/platform-browser';
-import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service';
-import {EnvProperties} from '../openaireLibrary/utils/properties/env-properties';
-import {HelperService} from "../openaireLibrary/utils/helper/helper.service";
-import {SEOService} from "../openaireLibrary/sharedComponents/SEO/SEO.service";
 import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.component";
 
 @Component({
@@ -24,6 +18,6 @@
 })
 export class LearnHowComponent {
   public pageTitle: string = "OpenAIRE - Connect | Learn How";
-  public pageDescription: string = "OpenAIRE - Connect, Community Gateway, research community";
+  public pageDescription: string = "Learn the process: Build a Gateway to your community's open and linked research outcomes. Customized to your needs.";
   public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'about'}];
 }
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/learn-how/learnInDepth/learn-in-depth.component.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/learn-how/learnInDepth/learn-in-depth.component.ts	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/learn-how/learnInDepth/learn-in-depth.component.ts	(revision 59305)
@@ -18,6 +18,6 @@
 })
 export class LearnInDepthComponent {
   public pageTitle: string = "OpenAIRE - Connect | Learn In Depth";
-  public pageDescription: string = "OpenAIRE - Connect, Community Gateway, research community";
+  public pageDescription: string = "Work in 4 collaborative steps to identify your needs, putting in practice our expertise on open science so you get the most out of OpenAIRE’s operational services.";
   public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'about', route: '/about'}, {name: 'learn in-depth'}];
 }
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/utils/subscribe/invite/invite.component.html
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/utils/subscribe/invite/invite.component.html	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/utils/subscribe/invite/invite.component.html	(revision 59305)
@@ -2,7 +2,8 @@
 
 <div *ngIf="longView == true" class="">
   <div class="uk-section uk-padding-remove-top tm-middle" id="tm-main">
-    <breadcrumbs addClass="uk-margin-large-left uk-margin-remove-bottom uk-margin-small-top" [breadcrumbs]="breadcrumbs"></breadcrumbs>
+    <breadcrumbs addClass="uk-margin-large-left uk-margin-remove-bottom uk-margin-small-top"
+                 [breadcrumbs]="breadcrumbs"></breadcrumbs>
 
     <div class="uk-container  uk-margin-bottom">
       <helper *ngIf="pageContents && pageContents['top'] && pageContents['top'].length > 0"
@@ -30,7 +31,7 @@
             </tr> -->
             <tr>
               <td for="from" class="uk-text-bold uk-width-1-4 uk-text-right">From <span
-                class="uk-text-danger uk-text-bold">*</span> :
+                  class="uk-text-danger uk-text-bold">*</span> :
               </td>
               <td class="uk-text-left uk-width-expand">
                 <input placeholder="Type your name" type="text" (click)="resetMessages()"
@@ -42,7 +43,7 @@
             </tr>
             <tr>
               <td for="recipients" class="uk-text-bold uk-text-right">To <span
-                class="uk-text-danger uk-text-bold">*</span> :
+                  class="uk-text-danger uk-text-bold">*</span> :
               </td>
               <td class="uk-text-left">
                 <input placeholder="email" type="text" (click)="resetMessages(); areValid=true"
@@ -63,25 +64,11 @@
             </tbody>
           </table>
           <div class="boundary-align uk-panel uk-placeholder">
-
             <table class="uk-table uk-align-center">
               <tbody>
-              <!-- <tr>
-                 <td class="uk-text-bold uk-width-1-4@xl uk-width-1-4@m uk-width-1-4@s uk-text-right"></td>
-                 <td class="uk-text-left">
-                      <{{body.salutation}}<br>-->
-              <!-- <span *ngIf="body.fromName == ''" class="uk-text-muted">
-                      <i>{{body.fromMessage}}...</i>
-              </span>
-              <span *ngIf="body.fromName !=''">
-                      {{body.fromMessage}}
-                      <b>{{body.fromName}}</b>
-              </span>
-         </td>
-      </tr> -->
               <tr>
-                <td for="email.body" class="uk-text-bold uk-text-right">Message:</td>
-                <td *ngIf="allowEdit()" class="uk-text-left">
+                <td for="email.body" class="uk-text-bold uk-width-1-4 uk-text-right">Message:</td>
+                <td *ngIf="allowEdit()" class="uk-width-expand uk-text-left">
                   <ckeditor (click)="resetMessages()"
                             class="form-control" [(ngModel)]="body.paragraphs" id="message"
                             debounce="400"
@@ -132,7 +119,7 @@
               <td class="uk-text-right"></td>
               <td>
                 <div
-                  class="uk-grid-margin uk-first-column uk-align-center uk-text-left uk-padding uk-padding-remove-top uk-padding-remove-bottom">
+                    class="uk-grid-margin uk-first-column uk-align-center uk-text-left uk-padding uk-padding-remove-top uk-padding-remove-bottom">
                   <button class="uk-button portal-button" (click)="invite()">Invite</button>
                 </div>
               </td>
@@ -155,11 +142,13 @@
   </div>
 </div>
 <div *ngIf="!longView" class="uk-margin-small-top">
-  <button [class]=" ((buttonSizeSmall)?'uk-button-small':'') + ' uk-button  portal-button uk-button-small uk-width-1-1'">
+  <button
+      [class]=" ((buttonSizeSmall)?'uk-button-small':'') + ' uk-button  portal-button uk-button-small uk-width-1-1'">
     <span class="uk-icon uk-flex uk-flex-middle">
       <svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24">
         <path d="M0 0h24v24H0z" fill="none"></path>
-        <path d="M8 10H5V7H3v3H0v2h3v3h2v-3h3v-2zm10 1c1.66 0 2.99-1.34 2.99-3S19.66 5 18 5c-.32 0-.63.05-.91.14.57.81.9 1.79.9 2.86s-.34 2.04-.9 2.86c.28.09.59.14.91.14zm-5 0c1.66 0 2.99-1.34 2.99-3S14.66 5 13 5c-1.66 0-3 1.34-3 3s1.34 3 3 3zm6.62 2.16c.83.73 1.38 1.66 1.38 2.84v2h3v-2c0-1.54-2.37-2.49-4.38-2.84zM13 13c-2 0-6 1-6 3v2h12v-2c0-2-4-3-6-3z"></path>
+        <path
+            d="M8 10H5V7H3v3H0v2h3v3h2v-3h3v-2zm10 1c1.66 0 2.99-1.34 2.99-3S19.66 5 18 5c-.32 0-.63.05-.91.14.57.81.9 1.79.9 2.86s-.34 2.04-.9 2.86c.28.09.59.14.91.14zm-5 0c1.66 0 2.99-1.34 2.99-3S14.66 5 13 5c-1.66 0-3 1.34-3 3s1.34 3 3 3zm6.62 2.16c.83.73 1.38 1.66 1.38 2.84v2h3v-2c0-1.54-2.37-2.49-4.38-2.84zM13 13c-2 0-6 1-6 3v2h12v-2c0-2-4-3-6-3z"></path>
       </svg>
       <span class="space">Invite users</span>
     </span>
@@ -188,15 +177,19 @@
            required>
     <div class="uk-width-medium uk-text-muted uk-text-small">separate with commas</div>
     <div class="uk-margin-small-top uk-text-center ">
-      <button class=" uk-button portal-button ignoreCommunityPanelBackground uk-button-small " (click)="invite()">Invite</button>
+      <button class=" uk-button portal-button ignoreCommunityPanelBackground uk-button-small " (click)="invite()">
+        Invite
+      </button>
       {{" "}}
-      <a class=" uk-button uk-button-default uk-button-small ignoreCommunityPanelBackground " [queryParams]="communityIdParam"
+      <a class=" uk-button uk-button-default uk-button-small ignoreCommunityPanelBackground "
+         [queryParams]="communityIdParam"
          routerLinkActive="router-link-active" routerLink="/invite">
                         <span class="uk-margin-xsmall-left uk-icon">
-                            <svg width="16" height="16" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="cog"
+                            <svg width="16" height="16" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"
+                                 icon="cog"
                                  ratio="0.8"><circle fill="none" stroke="#000" cx="9.997" cy="10" r="3.31"></circle><path
-                              fill="none" stroke="#000"
-                              d="M18.488,12.285 L16.205,16.237 C15.322,15.496 14.185,15.281 13.303,15.791 C12.428,16.289 12.047,17.373 12.246,18.5 L7.735,18.5 C7.938,17.374 7.553,16.299 6.684,15.791 C5.801,15.27 4.655,15.492 3.773,16.237 L1.5,12.285 C2.573,11.871 3.317,10.999 3.317,9.991 C3.305,8.98 2.573,8.121 1.5,7.716 L3.765,3.784 C4.645,4.516 5.794,4.738 6.687,4.232 C7.555,3.722 7.939,2.637 7.735,1.5 L12.263,1.5 C12.072,2.637 12.441,3.71 13.314,4.22 C14.206,4.73 15.343,4.516 16.225,3.794 L18.487,7.714 C17.404,8.117 16.661,8.988 16.67,10.009 C16.672,11.018 17.415,11.88 18.488,12.285 L18.488,12.285 Z"></path></svg>
+                                fill="none" stroke="#000"
+                                d="M18.488,12.285 L16.205,16.237 C15.322,15.496 14.185,15.281 13.303,15.791 C12.428,16.289 12.047,17.373 12.246,18.5 L7.735,18.5 C7.938,17.374 7.553,16.299 6.684,15.791 C5.801,15.27 4.655,15.492 3.773,16.237 L1.5,12.285 C2.573,11.871 3.317,10.999 3.317,9.991 C3.305,8.98 2.573,8.121 1.5,7.716 L3.765,3.784 C4.645,4.516 5.794,4.738 6.687,4.232 C7.555,3.722 7.939,2.637 7.735,1.5 L12.263,1.5 C12.072,2.637 12.441,3.71 13.314,4.22 C14.206,4.73 15.343,4.516 16.225,3.794 L18.487,7.714 C17.404,8.117 16.661,8.988 16.67,10.009 C16.672,11.018 17.415,11.88 18.488,12.285 L18.488,12.285 Z"></path></svg>
 
                           </span>
         Customize
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/curators/curators.component.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/curators/curators.component.ts	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/curators/curators.component.ts	(revision 59305)
@@ -1,5 +1,5 @@
 import {Component, Input} from '@angular/core';
-import {EnvProperties}    from '../openaireLibrary/utils/properties/env-properties';
+import {EnvProperties} from '../openaireLibrary/utils/properties/env-properties';
 import {CuratorService} from "../openaireLibrary/connect/curators/curator.service";
 import {Curator} from "../openaireLibrary/utils/entities/CuratorInfo";
 import {ActivatedRoute, Router} from "@angular/router";
@@ -15,11 +15,12 @@
 import {StringUtils} from "../openaireLibrary/utils/string-utils.class";
 import {Subscription} from "rxjs";
 import {properties} from "../../environments/environment";
+import {UserRegistryService} from "../openaireLibrary/services/user-registry.service";
 
 @Component({
   selector: 'curators',
   templateUrl: './curators.component.html'
-
+  
 })
 
 export class CuratorsComponent {
@@ -28,56 +29,59 @@
   @Input() longView = true;
   public downloadUrl = null;
   public showLoading = true;
-
+  
   public curators: Curator[];
-
+  
   public curatorsLimit: number = 5;
   public numberOfCurators: number = 5;
-
+  
   public showMore = [];
   public maxCharacters = 500;
-
+  
   public properties: EnvProperties;
   public pageContents = null;
   public divContents = null;
-
+  
   public url: string = null;
   public pageTitle: string = "Curators";
-
+  
   public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'About - curators'}];
-
+  
   subs: Subscription[] = [];
-
-  constructor (private route: ActivatedRoute,
-               private curatorsService: CuratorService,
-               private communityService: CommunityService,
-               private _router: Router,
-               private helper: HelperService,
-               private _meta: Meta,
-               private _title: Title,
-               private seoService: SEOService,
-               private _piwikService: PiwikService) {}
-
+  
+  constructor(private route: ActivatedRoute,
+              private curatorsService: CuratorService,
+              private communityService: CommunityService,
+              private userRegistryService: UserRegistryService,
+              private _router: Router,
+              private helper: HelperService,
+              private _meta: Meta,
+              private _title: Title,
+              private seoService: SEOService,
+              private _piwikService: PiwikService) {
+  }
+  
   ngOnInit() {
-      this.showLoading = true;
-      this.properties = properties;
-      if(this.longView) {
-        if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {
-          this.subs.push(this._piwikService.trackView(this.properties, this.pageTitle, PiwikHelper.getSiteId(this.communityId, this.properties.environment)).subscribe());
-        }
-        this.url = this.properties.baseLink + this._router.url;
-        this.seoService.createLinkForCanonicalURL(this.url);
-        this.updateUrl(this.url);
-        this.updateTitle(this.pageTitle);
-        this.updateDescription("OpenAIRE - Connect, Community Gateway, research community");
+    this.showLoading = true;
+    this.properties = properties;
+    if (this.longView) {
+      if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {
+        this.subs.push(this._piwikService.trackView(this.properties, this.pageTitle, PiwikHelper.getSiteId(this.communityId, this.properties.environment)).subscribe());
       }
-      this.downloadUrl = this.properties.utilsService + '/download/';
-      if(!this.longView) {
+      this.url = this.properties.baseLink + this._router.url;
+      this.seoService.createLinkForCanonicalURL(this.url);
+      this.updateUrl(this.url);
+      this.updateTitle(this.pageTitle);
+      this.updateDescription("OpenAIRE - Connect, Community Gateway, research community");
+    }
+    this.downloadUrl = this.properties.utilsService + '/download/';
+    if (properties.environment !== 'development') {
+      if (!this.longView) {
         let emails = this.managers.join();
         this.subs.push(this.curatorsService.getCurators(this.properties, emails).subscribe(curators => {
           this.curators = curators;
-          for(let i = 0; i < this.curators.length; i++) {
-            this.showMore[i]= false;
+          for (let i = 0; i < this.curators.length; i++) {
+            this.showMore[i] = false;
           }
           this.showLoading = false;
           HelperFunctions.scroll();
@@ -84,8 +88,8 @@
         }));
       } else {
         this.subs.push(this.route.queryParams.subscribe(data => {
-          this.communityId  = ConnectHelper.getCommunityFromDomain(this.properties.domain);
-          if(!this.communityId) {
+          this.communityId = ConnectHelper.getCommunityFromDomain(this.properties.domain);
+          if (!this.communityId) {
             this.communityId = data['communityId'];
           }
           //this.getDivContents();
@@ -92,66 +96,89 @@
           this.getPageContents();
           this.subs.push(this.communityService.getCommunityByState(this.properties,
             this.properties.communityAPI + this.communityId).subscribe(community => {
-              this.managers = community.managers;
-              let emails = this.managers.join();
-              this.subs.push(this.curatorsService.getCurators(this.properties, emails).subscribe(curators => {
-                this.curators = curators;
-                for(let i = 0; i < this.curators.length; i++) {
-                  this.showMore[i]= false;
-                }
-                this.showLoading = false;
-                HelperFunctions.scroll();
-              }));
+            this.managers = community.managers;
+            let emails = this.managers.join();
+            this.subs.push(this.curatorsService.getCurators(this.properties, emails).subscribe(curators => {
+              this.curators = curators;
+              for (let i = 0; i < this.curators.length; i++) {
+                this.showMore[i] = false;
+              }
+              this.showLoading = false;
+              HelperFunctions.scroll();
+            }));
           }));
         }));
       }
+    } else {
+      this.subs.push(this.route.queryParams.subscribe(data => {
+        this.communityId = ConnectHelper.getCommunityFromDomain(this.properties.domain);
+        if (!this.communityId) {
+          this.communityId = data['communityId'];
+        }
+        if(this.longView) {
+          //this.getDivContents();
+          this.getPageContents();
+        }
+        this.subs.push(this.userRegistryService.getManagersEmail('community', this.communityId).subscribe(managers => {
+          let emails = managers.map(manager => manager.email).join();
+          this.subs.push(this.curatorsService.getCurators(this.properties, emails).subscribe(curators => {
+            this.curators = curators;
+            for (let i = 0; i < this.curators.length; i++) {
+              this.showMore[i] = false;
+            }
+            this.showLoading = false;
+            HelperFunctions.scroll();
+          }));
+        }));
+      }));
+    }
   }
-
+  
   ngOnDestroy() {
     for (let sub of this.subs) {
       sub.unsubscribe();
     }
   }
-
+  
   private getPageContents() {
     this.subs.push(this.helper.getPageHelpContents(this.properties, this.communityId, this._router.url).subscribe(contents => {
       this.pageContents = contents;
     }));
   }
-
+  
   private getDivContents() {
     this.subs.push(this.helper.getDivHelpContents(this.properties, this.communityId, this._router.url).subscribe(contents => {
       this.divContents = contents;
     }));
   }
-
+  
   public toggle(index: number) {
     this.showMore[index] = !this.showMore[index];
   }
-
-  _format(name: string){
-    if(name) {
+  
+  _format(name: string) {
+    if (name) {
       return (((name).length > this.maxCharacters) ? (name.substring(0, (this.maxCharacters - ('...').length)) + '...') : name);
     } else {
       return null;
     }
   }
-
+  
   public urlPrefix(url: string): string {
     return StringUtils.urlPrefix(url);
   }
-
+  
   private updateDescription(description: string) {
     this._meta.updateTag({content: description}, "name='description'");
     this._meta.updateTag({content: description}, "property='og:description'");
   }
-
+  
   private updateTitle(title: string) {
     var _title = ((title.length > 50) ? title.substring(0, 50) : title);
     this._title.setTitle(_title);
     this._meta.updateTag({content: _title}, "property='og:title'");
   }
-
+  
   private updateUrl(url: string) {
     this._meta.updateTag({content: url}, "property='og:url'");
   }
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/affiliations/affiliations.component.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/affiliations/affiliations.component.ts	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/affiliations/affiliations.component.ts	(revision 59305)
@@ -62,7 +62,7 @@
             }
             if(this.getAffiliationsFromAPI) {
               this.showLoading = true;
-              this.affiliationService.initAffiliations(this.properties, this.properties.communityAPI + this.communityId + "/organizations");
+              this.affiliationService.initAffiliations(this.communityId);
               this.affiliationService.affiliations.subscribe(
                 affiliations => {
                   this.affiliations = affiliations;
@@ -69,7 +69,7 @@
                   this.showLoading = false;
                 },
                 error => {
-                  console.error("Affiliations Component: Error getting affiliations for community with id: "+this.communityId, error);
+                  console.error("Affiliations Component: Error getting affiliations for community with id: " + this.communityId, error);
                   this.showLoading = false;
                 }
               );
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/environments/environment.prod.prod.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/environments/environment.prod.prod.ts	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/environments/environment.prod.prod.ts	(revision 59305)
@@ -52,7 +52,7 @@
   loginUrl: "https://services.openaire.eu/connect-user-management/openid_connect_login",
   
   userInfoUrl: " https://services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=",
-  
+  registryUrl: 'https://services.openaire.eu/uoa-user-management/api/registry/',
   logoutUrl: "https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",
   
   cookieDomain: ".openaire.eu",
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/environments/environment.prod.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/environments/environment.prod.ts	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/environments/environment.prod.ts	(revision 59305)
@@ -52,7 +52,7 @@
   loginUrl: "https://services.openaire.eu/connect-user-management/openid_connect_login",
 
   userInfoUrl: " https://services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=",
-  
+  registryUrl: 'https://services.openaire.eu/uoa-user-management/api/registry/',
   logoutUrl: "https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",
 
   cookieDomain: ".openaire.eu",
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/app-routing.module.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/app-routing.module.ts	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/app-routing.module.ts	(revision 59305)
@@ -5,7 +5,6 @@
 import { EnvironmentSpecificService} from './openaireLibrary/utils/properties/environment-specific.service';
 
 import { OpenaireErrorPageComponent } from './error/errorPage.component';
-import {ThemeComponent} from "./openaireLibrary/utils/theme/theme.component";
 import {PageURLResolverComponent} from "./openaireLibrary/utils/pageURLResolver.component";
 
 const routes: Routes = [
@@ -18,6 +17,7 @@
   { path: 'about/faq', loadChildren: './learn-how/faqs/faqs.module#FaqsModule', resolve: { envSpecific:  EnvironmentSpecificResolver }},
   { path: 'contact-us', loadChildren: './contact/contact.module#ContactModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
   { path: 'invite', loadChildren: './utils/subscribe/invite/invite.module#InviteModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'verify/:id', loadChildren: './verification-manager/verification-manager.module#VerificationManagerModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
   { path: 'content', loadChildren: './content/contentPage.module#ContentPageModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
   { path: 'organizations', loadChildren: './htmlPages/organizations/organizationsPage.module#OrganizationsPageModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
   { path: 'publications', loadChildren: './htmlPages/publications/publications-page.module#PublicationsPageModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
@@ -61,6 +61,9 @@
   { path: 'search/advanced/datasets', component: PageURLResolverComponent},
   { path: 'search/advanced/software', component: PageURLResolverComponent},
   { path: 'search/advanced/other', component: PageURLResolverComponent},
+  { path: 'search/advanced/organizations', loadChildren: './searchPages/advanced/advancedSearchOrganizations.module#LibAdvancedSearchOrganizationsModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'search/advanced/dataproviders', loadChildren: './searchPages/advanced/advancedSearchDataProviders.module#LibAdvancedSearchDataProvidersModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'search/advanced/projects', loadChildren: './searchPages/advanced/advancedSearchProjects.module#LibAdvancedSearchProjectsModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
 
   // Deposit Pages
   { path: 'participate/deposit-datasets',  redirectTo: 'participate/deposit/learn-how', pathMatch: 'full'},
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/environments/environment.beta.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/environments/environment.beta.ts	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/environments/environment.beta.ts	(revision 59305)
@@ -52,7 +52,7 @@
   loginUrl: "https://beta.services.openaire.eu/connect-user-management/openid_connect_login",
   
   userInfoUrl: "https://beta.services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=",
-  
+  registryUrl: 'https://beta.services.openaire.eu/uoa-user-management/api/registry/',
   logoutUrl: "https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",
   
   cookieDomain: ".openaire.eu",
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/find/mainSearch-routing.module.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/find/mainSearch-routing.module.ts	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/find/mainSearch-routing.module.ts	(revision 59305)
@@ -1,7 +1,7 @@
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
+import {NgModule} from '@angular/core';
+import {RouterModule} from '@angular/router';
 
-import{OpenaireSearchComponent} from './search.component';
+import {OpenaireSearchComponent} from './search.component';
 import {FreeGuard} from "../../openaireLibrary/login/freeGuard.guard";
 import {PreviousRouteRecorder} from "../../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
 
@@ -8,10 +8,9 @@
 @NgModule({
   imports: [
     RouterModule.forChild([
-     // { path: '', component: OpenaireSearchComponent }
-      	{ path: '', component: OpenaireSearchComponent, canActivate: [FreeGuard], canDeactivate: [PreviousRouteRecorder] }
-
+      {path: '', component: OpenaireSearchComponent, canActivate: [FreeGuard], canDeactivate: [PreviousRouteRecorder]}
     ])
   ]
 })
-export class MainSearchRoutingModule { }
+export class MainSearchRoutingModule {
+}
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts	(nonexistent)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts	(revision 59305)
@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+import{OpenaireAdvancedSearchDataProvidersComponent} from './advancedSearchDataProviders.component';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+
+
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+     	{ path: '', component: OpenaireAdvancedSearchDataProvidersComponent, canActivate: [FreeGuard], data: {
+          redirect: '/error',  community : 'openaire'
+        }, canDeactivate: [PreviousRouteRecorder] }
+
+    ])
+  ]
+})
+export class AdvancedSearchDataProvidersRoutingModule { }
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts	(nonexistent)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts	(revision 59305)
@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import{OpenaireAdvancedSearchOrganizationsComponent} from './advancedSearchOrganizations.component';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+     	{ path: '', component: OpenaireAdvancedSearchOrganizationsComponent , canActivate: [FreeGuard], data: {
+          redirect: '/error',  community : 'openaire'
+        },canDeactivate: [PreviousRouteRecorder]}
+
+    ])
+  ]
+})
+export class AdvancedSearchOrganizationsRoutingModule { }
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/robots.prod.txt
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/robots.prod.txt	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/robots.prod.txt	(revision 59305)
@@ -1,3 +1,13 @@
 User-Agent: *
+Disallow: /participate/direct-claim
+Disallow: /participate/direct-claim?*
+Disallow: /participate/claim
+Disallow: /myclaims
+Disallow: /myclaims?*
+Disallow: /claims
+Disallow: /claims?*
+Disallow: /search/advanced/organizations?*
+Disallow: /search/advanced/dataproviders?*
+Disallow: /search/advanced/projects?*
 
-Sitemap: https://connect.openaire.eu/sitemap.xml
+Sitemap: /sitemap.xml
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/server.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/server.ts	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/server.ts	(revision 59305)
@@ -79,6 +79,26 @@
   }
   next();
 });
+ // - Serve sitemap based on the host -
+  app.get('/sitemap.xml', (req, res) => {
+    console.log(req.get("host"));
+    let host = req.get("host").split(":")[0];
+    let connectLinks= ["/","/about/learn-how","/about/learn-in-depth", "/about/faq","/search/find/communities"];
+    let communityLinks= ["/","/search/find/research-outcomes","/search/advanced/research-outcomes","/participate/deposit/learn-how","/organizations", "/content"];
+    let sitemap = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+      "<urlset xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd\">";
+    let urlPre = "<url>\n" +
+      "    <loc><![CDATA[";
+    let urlSuf = "]]></loc>\n" +
+      "    </url>";
+    for(let link of (host.indexOf("connect.openaire.eu") == -1 ?communityLinks:connectLinks)){
+      sitemap += urlPre + "https://" + host + link + urlSuf;
+     }
+    sitemap += "\n</urlset>";
+    console.log(req.secure);
+    res.setHeader('content-type', 'application/xml');
+    res.send( sitemap);
+  });
 
 /* - Example Express Rest API endpoints -
   app.get('/api/**', (req, res) => { });
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts	(nonexistent)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts	(revision 59305)
@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import{OpenaireAdvancedSearchProjectsComponent} from './advancedSearchProjects.component';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+     	{ path: '', component: OpenaireAdvancedSearchProjectsComponent, canActivate: [FreeGuard], data: {
+          redirect: '/error',  community : 'openaire'
+        }, canDeactivate: [PreviousRouteRecorder] }
+
+    ])
+  ]
+})
+export class AdvancedSearchProjectsRoutingModule { }
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts	(nonexistent)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts	(revision 59305)
@@ -0,0 +1,51 @@
+import {Component, Input, ViewChild} from '@angular/core';
+import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class";
+import {ActivatedRoute} from "@angular/router";
+import {ConnectHelper} from "../../openaireLibrary/connect/connectHelper";
+import {PiwikHelper} from "../../utils/piwikHelper";
+
+
+@Component({
+    selector: 'openaire-advanced-search-organizations',
+    template: `
+    <search-organizations [simpleView]="false"   [customFilter]=customFilter [piwikSiteId]="piwikSiteId" [hasPrefix]="false" [showBreadcrumb]="true" [showSwitchSearchLink]="false">
+    </search-organizations>
+
+    `
+ })
+
+export class OpenaireAdvancedSearchOrganizationsComponent {
+  connectCommunityId:string;
+  piwikSiteId = null;
+  customFilter: SearchCustomFilter = null;
+  constructor ( private  route: ActivatedRoute) {
+  }
+  ngOnInit() {
+    this.route.data
+      .subscribe((data: { envSpecific: any }) => {
+
+        var communityId =  ConnectHelper.getCommunityFromDomain(data.envSpecific.domain);
+
+        this.piwikSiteId = PiwikHelper.getSiteId(communityId, data.envSpecific.environment);
+
+        if(communityId){
+          this.connectCommunityId = communityId;
+          this.customFilter = new SearchCustomFilter("Community", "communityId", this.connectCommunityId, "");
+          this.customFilter.isHiddenFilter = false;
+
+        } else{
+          this.route.queryParams.subscribe(params => {
+
+            if(params['communityId'] && params['communityId']!=""){
+              this.connectCommunityId = params['communityId'];
+              this.piwikSiteId = PiwikHelper.getSiteId(this.connectCommunityId, data.envSpecific.environment);
+              this.customFilter = new SearchCustomFilter("Community", "communityId", this.connectCommunityId, "");
+              this.customFilter.isHiddenFilter = false;
+
+            }
+          });
+        }
+      });
+  }
+
+}
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts	(nonexistent)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts	(revision 59305)
@@ -0,0 +1,48 @@
+import {Component, Input, ViewChild} from '@angular/core';
+import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class";
+import {ActivatedRoute} from "@angular/router";
+import {ConnectHelper} from "../../openaireLibrary/connect/connectHelper";
+import {PiwikHelper} from "../../utils/piwikHelper";
+
+
+@Component({
+    selector: 'openaire-advanced-search-dataprovider',
+    template: `
+    <search-dataproviders  [simpleView]="false"   [customFilter]=customFilter [piwikSiteId]="piwikSiteId" [hasPrefix]="false" [showBreadcrumb]="true" [showSwitchSearchLink]="false">
+    </search-dataproviders>
+
+    `
+ })
+
+export class OpenaireAdvancedSearchDataProvidersComponent {
+  connectCommunityId:string;
+  piwikSiteId = null;
+  customFilter: SearchCustomFilter = null;
+  constructor ( private  route: ActivatedRoute) {
+  }
+  ngOnInit() {
+    this.route.data
+      .subscribe((data: { envSpecific: any }) => {
+
+        var communityId =  ConnectHelper.getCommunityFromDomain(data.envSpecific.domain);
+
+        this.piwikSiteId = PiwikHelper.getSiteId(communityId, data.envSpecific.environment);
+
+        if(communityId){
+          this.connectCommunityId = communityId;
+          this.customFilter = new SearchCustomFilter("Community", "communityId", this.connectCommunityId, "");
+          this.customFilter.isHiddenFilter = false;
+        } else{
+          this.route.queryParams.subscribe(params => {
+
+            if(params['communityId'] && params['communityId']!=""){
+              this.connectCommunityId = params['communityId'];
+              this.piwikSiteId = PiwikHelper.getSiteId(this.connectCommunityId, data.envSpecific.environment);
+              this.customFilter = new SearchCustomFilter("Community", "communityId", this.connectCommunityId, "");
+              this.customFilter.isHiddenFilter = false;
+            }
+          });
+        }
+      });
+  }
+}
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/searchResearchResults.component.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/searchResearchResults.component.ts	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/searchResearchResults.component.ts	(revision 59305)
@@ -9,7 +9,6 @@
     template: `
       <search-research-results resultType="result" [simpleView]="false" [customFilter]=customFilter [piwikSiteId]="piwikSiteId" [hasPrefix]="false" [showBreadcrumb]="true"></search-research-results>
     `
-
 })
 export class OpenaireSearchResearchResultsComponent {
     connectCommunityId:string;
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchProjects.component.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchProjects.component.ts	(nonexistent)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchProjects.component.ts	(revision 59305)
@@ -0,0 +1,46 @@
+import {Component} from '@angular/core';
+import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class";
+import {ActivatedRoute} from "@angular/router";
+import {ConnectHelper} from "../../openaireLibrary/connect/connectHelper";
+import {PiwikHelper} from "../../utils/piwikHelper";
+@Component({
+    selector: 'openaire-advanced-search-projects',
+    template: `
+      <search-projects [simpleView]="false"  [customFilter]=customFilter [piwikSiteId]="piwikSiteId" [hasPrefix]="false" [showBreadcrumb]="true" [showSwitchSearchLink]="false">
+      </search-projects>
+
+    `
+ })
+
+export class OpenaireAdvancedSearchProjectsComponent {
+  connectCommunityId:string;
+  piwikSiteId = null;
+  customFilter: SearchCustomFilter = null;
+  constructor ( private  route: ActivatedRoute) {
+  }
+  ngOnInit() {
+    this.route.data
+      .subscribe((data: { envSpecific: any }) => {
+
+        var communityId =  ConnectHelper.getCommunityFromDomain(data.envSpecific.domain);
+
+        this.piwikSiteId = PiwikHelper.getSiteId(communityId, data.envSpecific.environment);
+
+        if(communityId){
+          this.connectCommunityId = communityId;
+          this.customFilter = new SearchCustomFilter("Community", "communityId", this.connectCommunityId, "");
+          this.customFilter.isHiddenFilter = false;
+        } else{
+          this.route.queryParams.subscribe(params => {
+
+            if(params['communityId'] && params['communityId']!=""){
+              this.connectCommunityId = params['communityId'];
+              this.piwikSiteId = PiwikHelper.getSiteId(this.connectCommunityId, data.envSpecific.environment);
+              this.customFilter = new SearchCustomFilter("Community", "communityId", this.connectCommunityId, "");
+              this.customFilter.isHiddenFilter = false;
+            }
+          });
+        }
+      });
+  }
+}
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchDataProviders.module.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchDataProviders.module.ts	(nonexistent)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchDataProviders.module.ts	(revision 59305)
@@ -0,0 +1,26 @@
+import {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {FormsModule} from '@angular/forms';
+
+import {AdvancedSearchDataProvidersRoutingModule} from './advancedSearchDataProviders-routing.module';
+import {OpenaireAdvancedSearchDataProvidersComponent} from './advancedSearchDataProviders.component';
+
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searchDataProviders.module";
+
+@NgModule({
+  imports: [
+    CommonModule, FormsModule,
+    AdvancedSearchDataProvidersRoutingModule,
+    SearchDataProvidersModule
+
+  ],
+  declarations: [
+    OpenaireAdvancedSearchDataProvidersComponent
+   ],
+  providers:[FreeGuard],
+  exports: [
+    OpenaireAdvancedSearchDataProvidersComponent
+     ]
+})
+export class LibAdvancedSearchDataProvidersModule { }
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts	(nonexistent)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts	(revision 59305)
@@ -0,0 +1,26 @@
+import {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {FormsModule} from '@angular/forms';
+
+import {AdvancedSearchOrganizationsRoutingModule} from './advancedSearchOrganizations-routing.module';
+import {OpenaireAdvancedSearchOrganizationsComponent} from './advancedSearchOrganizations.component';
+
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {SearchOrganizationsModule} from "../../openaireLibrary/searchPages/searchOrganizations.module";
+
+@NgModule({
+  imports: [
+    CommonModule, FormsModule,
+    SearchOrganizationsModule,
+   AdvancedSearchOrganizationsRoutingModule
+
+  ],
+  declarations: [
+    OpenaireAdvancedSearchOrganizationsComponent
+   ],
+  providers:[FreeGuard],
+  exports: [
+    OpenaireAdvancedSearchOrganizationsComponent
+     ]
+})
+export class LibAdvancedSearchOrganizationsModule { }
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchProjects.module.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchProjects.module.ts	(nonexistent)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/advanced/advancedSearchProjects.module.ts	(revision 59305)
@@ -0,0 +1,26 @@
+import {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {FormsModule} from '@angular/forms';
+
+import {AdvancedSearchProjectsRoutingModule} from './advancedSearchProjects-routing.module';
+import {OpenaireAdvancedSearchProjectsComponent} from './advancedSearchProjects.component';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {SearchProjectsModule} from "../../openaireLibrary/searchPages/searchProjects.module";
+
+@NgModule({
+  imports: [
+    CommonModule, FormsModule,
+    SearchProjectsModule,
+    AdvancedSearchProjectsRoutingModule
+
+  ],
+  declarations: [
+    OpenaireAdvancedSearchProjectsComponent
+  ],
+  providers: [FreeGuard],
+  exports: [
+    OpenaireAdvancedSearchProjectsComponent
+  ]
+})
+export class LibAdvancedSearchProjectsModule {
+}
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/simple/searchResearchResults.component.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/simple/searchResearchResults.component.ts	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/searchPages/simple/searchResearchResults.component.ts	(revision 59305)
@@ -8,9 +8,9 @@
 @Component({
     selector: 'openaire-search-results',
     template: `
-      <search-research-results resultType="result" openaireLink="https://beta.explore.openaire.eu/search/find/publications"
+      <search-research-results resultType="result" openaireLink="https://beta.explore.openaire.eu/search/find/research-outcomes"
                                [customFilter]=customFilter [piwikSiteId]="piwikSiteId" [hasPrefix]="false" 
-                               [includeOnlyResultsAndFilter]="false" [showBreadcrumb]="true" [showAdvancedSearchLink]="true"></search-research-results>
+                               [includeOnlyResultsAndFilter]="false" [showBreadcrumb]="true" [showSwitchSearchLink]="true"></search-research-results>
     `
 
 })
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/app.module.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/app.module.ts	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/app.module.ts	(revision 59305)
@@ -27,6 +27,7 @@
 import {InviteBasicModule} from "./utils/subscribe/invite/inviteBasic.module";
 import {SubscribeService} from "./openaireLibrary/utils/subscribe/subscribe.service";
 import {PageURLResolverModule} from "./openaireLibrary/utils/pageURLResolver.module";
+import {Schema2jsonldModule} from "./openaireLibrary/sharedComponents/schema2jsonld/schema2jsonld.module";
 
 @NgModule({
 
@@ -45,7 +46,7 @@
     AppRoutingModule,
     BrowserTransferStateModule,
     BrowserAnimationsModule,
-    PageURLResolverModule
+    PageURLResolverModule, Schema2jsonldModule
   ],
   declarations: [ AppComponent, OpenaireErrorPageComponent],
   exports: [ AppComponent ],
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/statistics/statistics.component.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/statistics/statistics.component.ts	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/statistics/statistics.component.ts	(revision 59305)
@@ -107,8 +107,8 @@
               HelperFunctions.scroll();
             }
             this.communityName = community.shortTitle;
+            this.createChartUrlMap();
             this.createStatisticsObjects();
-            this.createChartUrlMap();
           }));
         // console.log(" Stats! "+ this.properties.statisticsAPIURL);
 
@@ -180,12 +180,13 @@
             }
         }
         console.log(this.entitiesList);*/
+        this.initializeDisplayedCharts()
       },
       error => {
         //console.log(error)
         this.handleError("Error getting community with id: " + this.communityId, error);
-      },
-      () => this.initializeDisplayedCharts()
+        this.initializeDisplayedCharts();
+      }
     ));
   }
 
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/statistics/statistics-routing.module.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/statistics/statistics-routing.module.ts	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/statistics/statistics-routing.module.ts	(revision 59305)
@@ -1,10 +1,9 @@
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
+import {NgModule} from '@angular/core';
+import {RouterModule} from '@angular/router';
 
-import{StatisticsComponent} from './statistics.component';
+import {StatisticsComponent} from './statistics.component';
 import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard';
 import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
-// import {IsRouteEnabled} from '../openaireLibrary/error/isRouteEnabled.guard'
 
 @NgModule({
   imports: [
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/verification-manager/verification-manager.component.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/verification-manager/verification-manager.component.ts	(nonexistent)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/verification-manager/verification-manager.component.ts	(revision 59305)
@@ -0,0 +1,59 @@
+import {Component, OnDestroy, OnInit} from "@angular/core";
+import {UserRegistryService} from "../openaireLibrary/services/user-registry.service";
+import {ActivatedRoute} from "@angular/router";
+import {Subscription} from "rxjs";
+import {CommunityService} from "../openaireLibrary/connect/community/community.service";
+import {properties} from "../../environments/environment";
+
+@Component({
+  selector: 'verification-manager',
+  template: `
+    <div class="uk-section uk-container">
+      <div class="uk-card uk-card-default uk-card-body">
+        <div *ngIf="loading" class="loading-gif"></div>
+        <div *ngIf="!loading && invitation">
+          <verification [name]="name" [invitation]="invitation"></verification>
+        </div>
+      </div>
+    </div>
+  `
+})
+export class VerificationManagerComponent implements OnInit, OnDestroy {
+  
+  private subscriptions: any[] = [];
+  public loading = true;
+  public invitation;
+  public name;
+  
+  constructor(private userRegistryService: UserRegistryService,
+              private communityService: CommunityService,
+              private route: ActivatedRoute) {
+  }
+  
+  ngOnInit() {
+    this.subscriptions.push(this.route.params.subscribe(params => {
+      if (params && params['id']) {
+        this.subscriptions.push(this.userRegistryService.getInvitation(params['id']).subscribe(invitation => {
+          this.invitation = invitation;
+          this.subscriptions.push(this.communityService.
+            getCommunityByState(properties, properties.communityAPI + invitation.entity).subscribe(community => {
+            this.name = community.title;
+            this.loading = false;
+          }));
+        }, error => {
+          this.loading = false;
+          console.error(error);
+        }));
+      }
+    }));
+  }
+  
+  ngOnDestroy() {
+    this.subscriptions.forEach(sub => {
+      if (sub instanceof Subscription) {
+        sub.unsubscribe();
+      }
+    });
+  }
+  
+}
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/verification-manager/verification-manager-routing.module.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/verification-manager/verification-manager-routing.module.ts	(nonexistent)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/verification-manager/verification-manager-routing.module.ts	(revision 59305)
@@ -0,0 +1,15 @@
+import {NgModule} from '@angular/core';
+import {RouterModule} from '@angular/router';
+import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
+import {VerificationGuard} from "../openaireLibrary/login/verification.guard";
+import {VerificationManagerComponent} from "./verification-manager.component";
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      { path: '', component: VerificationManagerComponent, canActivate: [VerificationGuard], canDeactivate: [PreviousRouteRecorder]}
+    ])
+  ]
+})
+export class VerificationManagerRoutingModule {
+}
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/verification-manager/verification-manager.module.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/verification-manager/verification-manager.module.ts	(nonexistent)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/verification-manager/verification-manager.module.ts	(revision 59305)
@@ -0,0 +1,14 @@
+import {NgModule} from "@angular/core";
+import {CommonModule} from "@angular/common";
+import {VerificationManagerComponent} from "./verification-manager.component";
+import {VerificationModule} from "../openaireLibrary/verification/verification.module";
+import {VerificationGuard} from "../openaireLibrary/login/verification.guard";
+import {VerificationManagerRoutingModule} from "./verification-manager-routing.module";
+
+@NgModule({
+  imports: [CommonModule, VerificationModule, VerificationManagerRoutingModule],
+  declarations: [VerificationManagerComponent],
+  exports: [VerificationManagerComponent],
+  providers: [VerificationGuard]
+})
+export class VerificationManagerModule {}
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/contact/contact.component.html
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/contact/contact.component.html	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/contact/contact.component.html	(revision 59305)
@@ -1,4 +1,5 @@
-<schema2jsonld *ngIf="url" [URL]="url" [name]="pageTitle" type="other"></schema2jsonld>
+<schema2jsonld *ngIf="url" [URL]="url" [name]="pageTitle" type="other"
+               description="Contact us to learn more about OpenAIRE Connect Research Gateways"></schema2jsonld>
 <ng-template #info>
   <helper *ngIf="pageContents && pageContents['right'] && pageContents['right'].length > 0"
           [texts]="pageContents['right']"></helper>
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/contact/contact-routing.module.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/contact/contact-routing.module.ts	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/contact/contact-routing.module.ts	(revision 59305)
@@ -2,11 +2,12 @@
 import {RouterModule} from '@angular/router';
 import {ContactComponent} from './contact.component';
 import {IsRouteEnabled} from "../openaireLibrary/error/isRouteEnabled.guard";
+import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
 
 @NgModule({
     imports: [
         RouterModule.forChild([
-            { path: '', component: ContactComponent, canActivate: [IsRouteEnabled]}
+            { path: '', component: ContactComponent, canActivate: [IsRouteEnabled], canDeactivate: [PreviousRouteRecorder]}
         ])
     ]
 })
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/communities/communities.module.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/communities/communities.module.ts	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/communities/communities.module.ts	(revision 59305)
@@ -17,7 +17,6 @@
 import {HelperModule} from "../openaireLibrary/utils/helper/helper.module";
 import {GifSliderModule} from "../openaireLibrary/utils/gif-slider/gif-slider.module";
 import {OtherPortalsModule} from "../openaireLibrary/sharedComponents/other-portals/other-portals.module";
-import {Schema2jsonldModule} from "../openaireLibrary/sharedComponents/schema2jsonld/schema2jsonld.module";
 import {SEOServiceModule} from "../openaireLibrary/sharedComponents/SEO/SEOService.module";
 
 @NgModule({
@@ -25,7 +24,7 @@
     CommonModule, FormsModule, RouterModule,
     ManageModule, ErrorMessagesModule,
     SearchFormModule, BrowseCommunityModule, GifSliderModule, OtherPortalsModule,
-    HelperModule, Schema2jsonldModule, SEOServiceModule
+    HelperModule, SEOServiceModule
   ],
   declarations: [
     CommunitiesComponent
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/learn-how/faqs/faqs.component.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/learn-how/faqs/faqs.component.ts	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/learn-how/faqs/faqs.component.ts	(revision 59305)
@@ -18,6 +18,6 @@
 })
 export class FaqsComponent {
   public pageTitle: string = "OpenAIRE - Connect | FAQs";
-  public pageDescription: string = "OpenAIRE - Connect, Community Gateway, research community";
+  public pageDescription: string = "Frequently asked questions about OpenAIRE Connect research gateway";
   public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'about', route: '/about'}, {name: 'FAQs'}];
 }
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/utils/subscribe/subscribe.component.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/utils/subscribe/subscribe.component.ts	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/utils/subscribe/subscribe.component.ts	(revision 59305)
@@ -14,6 +14,7 @@
 import {UserManagementService} from "../../openaireLibrary/services/user-management.service";
 import {Subscription} from "rxjs";
 import {properties} from "../../../environments/environment";
+import {UserRegistryService} from "../../openaireLibrary/services/user-registry.service";
 
 declare var UIkit: any;
 
@@ -26,22 +27,26 @@
       <a class="uk-alert-close" uk-close></a>
       <p>Please login first to subscribe</p>
       </div>
-      <button *ngIf="!subscribed" [class]="'uk-button portal-button uk-button-small uk-width-1-1 ' + (loading ? ' uk-disabled' : '')"
+      <button *ngIf="!subscribed"
+              [class]="'uk-button portal-button uk-button-small uk-width-1-1 ' + (loading ? ' uk-disabled' : '')"
               (click)="subscribe()">
         <span class="uk-icon uk-flex uk-flex-middle">
           <svg height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
             <path d="M0 0h24v24H0z" fill="none"></path>
-            <path d="M16 11c1.66 0 2.99-1.34 2.99-3S17.66 5 16 5c-1.66 0-3 1.34-3 3s1.34 3 3 3zm-8 0c1.66 0 2.99-1.34 2.99-3S9.66 5 8 5C6.34 5 5 6.34 5 8s1.34 3 3 3zm0 2c-2.33 0-7 1.17-7 3.5V19h14v-2.5c0-2.33-4.67-3.5-7-3.5zm8 0c-.29 0-.62.02-.97.05 1.16.84 1.97 1.97 1.97 3.45V19h6v-2.5c0-2.33-4.67-3.5-7-3.5z"></path>
+            <path
+                d="M16 11c1.66 0 2.99-1.34 2.99-3S17.66 5 16 5c-1.66 0-3 1.34-3 3s1.34 3 3 3zm-8 0c1.66 0 2.99-1.34 2.99-3S9.66 5 8 5C6.34 5 5 6.34 5 8s1.34 3 3 3zm0 2c-2.33 0-7 1.17-7 3.5V19h14v-2.5c0-2.33-4.67-3.5-7-3.5zm8 0c-.29 0-.62.02-.97.05 1.16.84 1.97 1.97 1.97 3.45V19h6v-2.5c0-2.33-4.67-3.5-7-3.5z"></path>
           </svg>
           <span class="space">Subscribe</span> 
         </span>
       </button>
-      <button *ngIf="subscribed" [class]="'subscribed-button uk-button uk-button-small uk-width-1-1 ' + (loading ? ' uk-disabled' : '')"
+      <button *ngIf="subscribed"
+              [class]="'subscribed-button uk-button uk-button-small uk-width-1-1 ' + (loading ? ' uk-disabled' : '')"
               (click)="confirmOpen()">
         <span class="uk-icon uk-flex uk-flex-middle">
           <svg height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
             <path d="M0 0h24v24H0z" fill="none"></path>
-            <path d="M16 11c1.66 0 2.99-1.34 2.99-3S17.66 5 16 5c-1.66 0-3 1.34-3 3s1.34 3 3 3zm-8 0c1.66 0 2.99-1.34 2.99-3S9.66 5 8 5C6.34 5 5 6.34 5 8s1.34 3 3 3zm0 2c-2.33 0-7 1.17-7 3.5V19h14v-2.5c0-2.33-4.67-3.5-7-3.5zm8 0c-.29 0-.62.02-.97.05 1.16.84 1.97 1.97 1.97 3.45V19h6v-2.5c0-2.33-4.67-3.5-7-3.5z"></path>
+            <path
+                d="M16 11c1.66 0 2.99-1.34 2.99-3S17.66 5 16 5c-1.66 0-3 1.34-3 3s1.34 3 3 3zm-8 0c1.66 0 2.99-1.34 2.99-3S9.66 5 8 5C6.34 5 5 6.34 5 8s1.34 3 3 3zm0 2c-2.33 0-7 1.17-7 3.5V19h14v-2.5c0-2.33-4.67-3.5-7-3.5zm8 0c-.29 0-.62.02-.97.05 1.16.84 1.97 1.97 1.97 3.45V19h6v-2.5c0-2.33-4.67-3.5-7-3.5z"></path>
           </svg>
           <span class="space">Subscribed</span> 
         </span>
@@ -62,10 +67,10 @@
   @Input() communityId: string;
   @Input() showTemplate: boolean = true;
   @Output() subscribeEvent = new EventEmitter();
-
+  
   public community = null;
   public emailToInformManagers: Email;
-
+  
   loading: boolean = false;
   subscribed: boolean = null;
   @Input() properties: EnvProperties;
@@ -74,30 +79,28 @@
   showLoginAlert: Boolean = false;
   @ViewChild(AlertModal) alert;
   private user: User;
-
+  
   subs: Subscription[] = [];
-
+  
   constructor(private route: ActivatedRoute,
               private _subscribeService: SubscribeService,
               private _emailService: EmailService,
               private _communityService: CommunityService,
               private router: Router,
-              private userManagementService: UserManagementService
-  ) {}
-
+              private userManagementService: UserManagementService,
+              private userRegistryService: UserRegistryService
+  ) {
+  }
+  
   public ngOnInit() {
-    if(!this.properties) {
+    if (!this.properties) {
       this.properties = properties;
     }
-    if(!this.showNumbers) {
+    if (!this.showNumbers) {
       this.subs.push(this.userManagementService.getUserInfo().subscribe(
         user => {
           this.user = user;
           this.init();
-        },
-        error => {},
-        () => {
-          this.init();
         }
       ));
     } else {
@@ -105,26 +108,35 @@
     }
     //this.init();
   }
-
+  
   public ngOnDestroy() {
     for (let sub of this.subs) {
       sub.unsubscribe();
     }
   }
-
+  
   private isSubscribed() {
-    this.subs.push(this._subscribeService.isSubscribed.subscribe(
-      res => {
-        this.subscribed = res;
-        if (this.subscribed) {
-          this.subscribeEvent.emit({
-            value: "ok"
-          });
+    this.subscribed = Session.isSubscribedTo('community', this.communityId, this.user);
+    if (!this.subscribed) {
+      this.subs.push(this._subscribeService.isSubscribed.subscribe(
+        res => {
+          this.subscribed = res;
+          if (this.subscribed) {
+            this.subscribeEvent.emit({
+              value: "ok"
+            });
+          }
         }
+      ));
+    } else {
+      if (this.subscribed) {
+        this.subscribeEvent.emit({
+          value: "ok"
+        });
       }
-    ));
+    }
   }
-
+  
   private init() {
     if (!this.showNumbers) {
       let email = (this.user) ? this.user.email : null;
@@ -132,19 +144,6 @@
         this.subscribed = false;
       } else {
         if (this.communityId) {
-          // this._subscribeService.isSubscribedToCommunity(this.properties, this.communityId).subscribe(
-          //   res => {
-          //     this.subscribed = res;
-          //     if (this.subscribed) {
-          //       this.subscribeEvent.emit({
-          //         value: "ok"
-          //       });
-          //     }
-          //   },
-          //   error => {
-          //     this.handleError("Error getting response if email: " + email + " is subscribed to community with id: " + this.communityId, error);
-          //   });
-
           this._subscribeService.initIsSubscribedToCommunity(this.properties, this.communityId);
           this.isSubscribed();
         }
@@ -151,21 +150,33 @@
       }
     } else {
       if (this.communityId) {
-        this.subs.push(this._subscribeService.getNumberOfCommunitySubscribers(this.properties, this.communityId).subscribe(
-          res => {
-            this.subscribers = (res && res.value) ? res.value : 0;//(res && res.subscribers && res.subscribers.length) ? res.subscribers.length : 0;
-            this.countSubscribersEvent.emit({
-              value: this.subscribers
-            });
-          },
-          error => {
-            this.handleError("Error getting community subscribers for community with id: " + this.communityId, error);
-          }));
+        if (properties.environment !== 'development') {
+          this.subs.push(this._subscribeService.getNumberOfCommunitySubscribers(this.properties, this.communityId).subscribe(
+            res => {
+              this.subscribers = (res && res.value) ? res.value : 0;//(res && res.subscribers && res.subscribers.length) ? res.subscribers.length : 0;
+              this.countSubscribersEvent.emit({
+                value: this.subscribers
+              });
+            },
+            error => {
+              this.handleError("Error getting community subscribers for community with id: " + this.communityId, error);
+            }));
+        } else {
+          this.subs.push(this.userRegistryService.getSubscribersCount('community', this.communityId).subscribe(res => {
+              this.subscribers = (res && res.response) ? res.response : 0;
+              this.countSubscribersEvent.emit({
+                value: this.subscribers
+              });
+            },
+            error => {
+              this.handleError("Error getting community subscribers for community with id: " + this.communityId, error);
+            }));
+        }
       }
     }
     if (this.communityId) {
       this.emailToInformManagers = {body: "", subject: "", recipients: []};
-
+      
       this.subs.push(this._communityService.getCommunityByState(this.properties, this.properties.communityAPI + this.communityId).subscribe(
         community => {
           this.community = community;
@@ -177,7 +188,26 @@
       ));
     }
   }
-
+  
+  private successfulSubscribe(email) {
+    if (!this.subscribed) {
+      this.subscribed = true;
+      this.subscribeEvent.emit({
+        value: "ok"
+      });
+      this.subs.push(this._emailService.notifyForNewManagers(this.properties, this.communityId, Composer.composeEmailToInformManagers(this.community.title, this.communityId, this.community.managers,
+        email, this.properties.adminPortalURL)).subscribe(
+        res => {
+          //console.log("The email has been sent successfully!")
+        },
+        error => {
+          //console.log(error)
+          this.handleError("Error notifying managers about new subscribers for community with id: " + this.communityId, error);
+        }
+      ));
+    }
+  }
+  
   subscribe() {
     var email = (this.user) ? this.user.email : null;
     if (email == null) {
@@ -192,6 +222,23 @@
     } else {
       this.loading = true;
       this.showLoginAlert = false;
+      if(properties.environment === 'development') {
+        this.subs.push(this.userRegistryService.subscribeTo('community', this.communityId).subscribe(res => {
+          this.userManagementService.updateUserInfo();
+          this.loading = false;
+          this.successfulSubscribe(email);
+        },error => {
+          this.loading = false;
+          UIkit.notification({
+            message: '<strong>An error occurred. Please try again!<strong>',
+            status: 'warning',
+            timeout: 3000,
+            pos: 'top-center'
+          });
+          //console.log(error)
+          this.handleError("Error subscribing email: " + email + " from community with id: " + this.communityId, error);
+        }));
+      }
       this.subs.push(this._subscribeService.subscribeToCommunity(this.properties, this.communityId).subscribe(
         res => {
           this.loading = false;
@@ -200,28 +247,13 @@
               value: "error"
             });
             UIkit.notification({
-              message: '<strong>An error occured. Please try again!<strong>',
+              message: '<strong>An error occurred. Please try again!<strong>',
               status: 'warning',
               timeout: 3000,
               pos: 'top-center'
             });
           } else {
-            if (!this.subscribed) {
-              this.subscribed = true;
-              this.subscribeEvent.emit({
-                value: "ok"
-              });
-              this.subs.push(this._emailService.notifyForNewManagers(this.properties, this.communityId, Composer.composeEmailToInformManagers(this.community.title, this.communityId, this.community.managers,
-                    email, this.properties.adminPortalURL)).subscribe(
-                res => {
-                  //console.log("The email has been sent successfully!")
-                },
-                error => {
-                  //console.log(error)
-                  this.handleError("Error notifying managers about new subscribers for community with id: " + this.communityId, error);
-                }
-              ));
-            }
+            this.successfulSubscribe(email);
           }
         },
         error => {
@@ -230,7 +262,7 @@
             value: "error"
           });
           UIkit.notification({
-            message: '<strong>An error occured. Please try again!<strong>',
+            message: '<strong>An error occurred. Please try again!<strong>',
             status: 'warning',
             timeout: 3000,
             pos: 'top-center'
@@ -240,7 +272,7 @@
         }));
     }
   }
-
+  
   unsubscribe() {
     var email = (this.user) ? this.user.email : null;
     if (email == null) {
@@ -247,13 +279,29 @@
       this.subscribed = false;
     } else {
       this.loading = true;
-      //this.properties.adminToolsAPIURL
+      if(properties.environment === 'development') {
+        this.subs.push(this.userRegistryService.unsubscribeFrom('community', this.communityId).subscribe(res => {
+          this.userManagementService.updateUserInfo();
+          this.loading = false;
+          this.subscribed = false;
+        },error => {
+            this.loading = false;
+            UIkit.notification({
+              message: '<strong>An error occurred. Please try again!<strong>',
+              status: 'warning',
+              timeout: 3000,
+              pos: 'top-center'
+            });
+            //console.log(error)
+            this.handleError("Error unsubscribing email: " + email + " from community with id: " + this.communityId, error);
+          }));
+      }
       this.subs.push(this._subscribeService.unSubscribeToCommunity(this.properties, this.communityId).subscribe(
         res => {
           this.loading = false;
           if (res.status && res.status != 200) {
             UIkit.notification({
-              message: '<strong>An error occured. Please try again!<strong>',
+              message: '<strong>An error occurred. Please try again!<strong>',
               status: 'warning',
               timeout: 3000,
               pos: 'top-center'
@@ -268,7 +316,7 @@
         error => {
           this.loading = false;
           UIkit.notification({
-            message: '<strong>An error occured. Please try again!<strong>',
+            message: '<strong>An error occurred. Please try again!<strong>',
             status: 'warning',
             timeout: 3000,
             pos: 'top-center'
@@ -278,9 +326,9 @@
         }));
     }
   }
-
+  
   confirmOpen() {
-
+    
     this.alert.cancelButton = true;
     this.alert.okButton = true;
     //this.alert.alertTitle = "Unsubscribe community ";
@@ -290,11 +338,11 @@
     this.alert.cancelButtonText = "CANCEL";
     this.alert.open();
   }
-
+  
   confirmClose(data) {
     this.unsubscribe();
   }
-
+  
   private handleError(message: string, error) {
     console.error("Subscribe (component): " + message, error);
   }
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/utils/piwikHelper.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/utils/piwikHelper.ts	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/utils/piwikHelper.ts	(revision 59305)
@@ -19,8 +19,8 @@
     "risis":219,
     "science-innovation-policy":253,
     "covid-19":267,
-    "rural-digital-europe":null,
-    "enermaps":null
+    "rural-digital-europe":319,
+    "enermaps":318
   };
   public static siteIDsProduction={
     "connect": 112,
@@ -42,8 +42,8 @@
     "risis":null,
     "science-innovation-policy":null,
     "covid-19":null,
-    "rural-digital-europe":319,
-    "enermaps":318
+    "rural-digital-europe":null,
+    "enermaps":null
   };
   public static getSiteId(communityId:string, environment:string){
     // if(environment == 'production'){
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/claims/linking/linking-routing.module.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/claims/linking/linking-routing.module.ts	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/app/claims/linking/linking-routing.module.ts	(revision 59305)
@@ -1,11 +1,10 @@
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-import { OpenaireLinkingComponent } from './linkingGeneric.component';
-
-import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard';
+import {NgModule} from '@angular/core';
+import {RouterModule} from '@angular/router';
+import {OpenaireLinkingComponent} from './linkingGeneric.component';
 import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
 import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
 import {ConnectSubscriberGuard} from '../../openaireLibrary/connect/communityGuard/connectSubscriber.guard';
+
 //LoginGuard
 @NgModule({
   imports: [
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/index.beta.html
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/index.beta.html	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/index.beta.html	(revision 59305)
@@ -7,7 +7,6 @@
       <base href="/" />
       <meta http-equiv="content-type" content="text/html; charset=utf-8" />
       <meta name="description" content="OpenAIRE Connect, Connect,Community Dashboard, communities, open access, research, projects "/>
-      <meta name="google-site-verification" content="rZ-58gIX8IqzBte6Qv4J5yY9aSiDP15Dfc1Yr9yezqE" />
 
       <meta property="og:description" content="OpenAIRE Connect, Connect,Community Dashboard, communities, open access, research, projects"/>
       <meta property="og:title" content="OpenAIRE - Connect "/>
Index: modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/environments/environment.ts
===================================================================
--- modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/environments/environment.ts	(revision 59304)
+++ modules/uoa-connect-portal/branches/use-UoaAdminToolsLibrary/src/environments/environment.ts	(revision 59305)
@@ -52,9 +52,10 @@
   vocabulariesAPI: 'https://dev-openaire.d4science.org/provision/mvc/vocabularies/',
   piwikBaseUrl: 'https://analytics.openaire.eu/piwik.php?idsite=',
   piwikSiteId: '80',
-  loginUrl: 'http://dl170.madgik.di.uoa.gr:8180/dnet-openaire-users-1.0.0-SNAPSHOT/openid_connect_login',
-  userInfoUrl: 'http://dl170.madgik.di.uoa.gr:8180/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=',
-  logoutUrl: 'https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=',
+  loginUrl: 'http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/openid_connect_login',
+  userInfoUrl: 'http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=',
+  registryUrl: 'http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/registry/',
+  logoutUrl: 'https://openaire-dev.aai-dev.grnet.gr/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=',
   cookieDomain: '.di.uoa.gr',
   feedbackmail: 'openaire.test@gmail.com',
   cacheUrl: 'http://dl170.madgik.di.uoa.gr:3000/get?url=',
