diff --git a/landingPages/project/project.component.html b/landingPages/project/project.component.html
index 087181b8..4b0d79f9 100644
--- a/landingPages/project/project.component.html
+++ b/landingPages/project/project.component.html
@@ -571,14 +571,14 @@
             </ng-template>
             <ng-template #dmps_tab>
               <div class="uk-padding">
-                <div class="uk-alert uk-alert-primary uk-margin-top">
-                  <span *ngIf="fetchDmps.searchUtils.totalResults == 0">No Data Management Plans (DMPs) available. </span>
-                  <span>Link existing DMPs with this project or start a new DMP in <a href="https://argos.openaire.eu/splash/" target="_blank">Argos</a>.</span>
-                </div>
                 <search-tab [fetch]="fetchDmps" customTitle="Data Management Plans"
                             [params]="getParamsForSearchLink('publications', 'Data Management Plan')"
                             [searchLinkToAdvancedPage]="properties.searchLinkToAdvancedResults"
                             [properties]="properties">
+                  <div class="uk-alert uk-alert-primary uk-margin-top">
+                    <span *ngIf="fetchDmps.searchUtils.totalResults == 0">No Data Management Plans (DMPs) available. </span>
+                    <span>Link existing DMPs with this project or start a new DMP in <a href="https://argos.openaire.eu/splash/" target="_blank">Argos</a>.</span>
+                  </div>
                 </search-tab>
               </div>
             </ng-template>
diff --git a/landingPages/result/resultLanding.component.html b/landingPages/result/resultLanding.component.html
index 7f7448e9..cb7d6edb 100644
--- a/landingPages/result/resultLanding.component.html
+++ b/landingPages/result/resultLanding.component.html
@@ -431,11 +431,19 @@
                         Enermaps tool <span class="custom-external custom-icon space"></span>
                       </a></p>
                     </div>
+                  </div>
+                  <ul *ngIf="enermapsDetails?.length > 0" class="uk-list">
+                    <ng-container *ngFor="let detail of enermapsDetails">
+                      <li *ngIf="detail[0] && detail[1]">
+                        <span class="uk-text-muted">{{detail[0]}}: </span>
+                        <span>{{detail[1]}}</span>
+                      </li>
+                    </ng-container>
+                  </ul>
                 </div>
-              </div>
 
               </ng-template>
-              <my-tabs>
+              <my-tabs (selectedActiveTab)="onSelectActiveTab($event)">
 <!--                *ngIf="hasPrimaryInfo || hasSecondaryInfo"-->
 <!--                [class]="(activeTab === 'summary')?'uk-active':''"-->
                 <my-tab tabTitle="Summary"
@@ -444,7 +452,7 @@
                 </my-tab>
 <!--                [class]="(activeTab === 'references')?'uk-active':''"-->
                 <my-tab *ngIf="resultLandingInfo.references && resultLandingInfo.references.length > 0"
-                        [tabTitle]="'references'" [tabId]="'references'"
+                        [tabTitle]="'References'" [tabId]="'references'"
                         [tabNumber]="resultLandingInfo.references.length">
                   <ng-container *ngTemplateOutlet="references_tab;"></ng-container>
                 </my-tab>
@@ -473,7 +481,7 @@
                   <ng-container *ngTemplateOutlet="enermaps_tab;"></ng-container>
                 </my-tab>
               </my-tabs>
-              <my-small-tabs>
+              <my-small-tabs (selectedActiveTab)="onSelectActiveTab($event)">
                 <!--                *ngIf="hasPrimaryInfo || hasSecondaryInfo"-->
                 <!--                [class]="(activeTab === 'summary')?'uk-active':''"-->
                 <my-tab tabTitle="Summary"
diff --git a/landingPages/result/resultLanding.component.ts b/landingPages/result/resultLanding.component.ts
index a4aa6585..0d2f9624 100644
--- a/landingPages/result/resultLanding.component.ts
+++ b/landingPages/result/resultLanding.component.ts
@@ -91,6 +91,9 @@ export class ResultLandingComponent {
   
   public routerHelper: RouterHelper = new RouterHelper();
   public activeTab: string = null;
+  private reloadEnermapsDetails: boolean = true;
+  public enermapsDetails: any;
+
   private doi: string;
   subscriptions = [];
   properties: EnvProperties = properties;
@@ -318,6 +321,8 @@ export class ResultLandingComponent {
       this.activeTab = 'related';
     } else if (this.resultLandingInfo.bioentities && this.bioentitiesNum > 0) {
       this.activeTab = 'bioentities';
+    } else if(this.enermapsId && this.properties.enermapsURL && this.properties.enermapsAPIURL) {
+      this.activeTab = "enermaps";
     }
   }
   
@@ -689,4 +694,27 @@ export class ResultLandingComponent {
   private isKeyword(value:string, words:string[]){
     return value?words.filter( word => { return value.toLowerCase() == word}).length > 0:0;
   }
+
+  public onSelectActiveTab(activeTabId) {
+    if (this.activeTab != activeTabId) {   // tab really changed
+      this.activeTab = activeTabId;
+      if (activeTabId == 'enermaps' && this.properties.enermapsAPIURL) {
+        this.getEnermapsDetails(this.enermapsId);
+      }
+    }
+  }
+
+  private getEnermapsDetails(id: string) {
+    if (this.reloadEnermapsDetails) {
+      this.subscriptions.push(this._resultLandingService.getEnermapsDetails(id).subscribe(
+        data => {
+          this.enermapsDetails = data;
+          this.reloadEnermapsDetails = false;
+        },
+        error => {
+          console.error("Error in fetching enermaps details ",error);
+        }
+      ))
+    }
+  }
 }
diff --git a/landingPages/result/resultLanding.service.ts b/landingPages/result/resultLanding.service.ts
index a428142a..c1b16b14 100644
--- a/landingPages/result/resultLanding.service.ts
+++ b/landingPages/result/resultLanding.service.ts
@@ -482,4 +482,25 @@ export class ResultLandingService {
     }
     return citations;
   }
+
+  getEnermapsDetails(id: string) {
+    let url = properties.enermapsAPIURL+id;
+    return this.http.get((properties.useLongCache)? (properties.cacheUrl+encodeURIComponent(url)): url)
+    // return this.http.get(url)
+      .pipe(map(res => this.parseEnermapsDetails(res)));
+  }
+
+  parseEnermapsDetails(response: any) {
+    let details = Array.isArray(response) ? response[0] : response;
+    let metadata = (details && details.metadata) ? details.metadata : null;
+
+    let entries = [];
+    let keys = metadata ? Object.keys(metadata) : null;
+    for(let key of keys) {
+      if(key != "shared_id" && key && metadata[key]) {
+        entries.push([key, metadata[key]]);
+      }
+    }
+    return entries;
+  }
 }
diff --git a/orcid/orcid-work.component.ts b/orcid/orcid-work.component.ts
index 142106af..d41b87ef 100644
--- a/orcid/orcid-work.component.ts
+++ b/orcid/orcid-work.component.ts
@@ -373,7 +373,7 @@ export class OrcidWorkComponent {
   }
 
   ngOnInit() {
-    if(!this.givenPutCode) {
+    if(!this.givenPutCode && this.isLoggedIn) {
       this.getPutCode();
     }
   }
diff --git a/utils/properties/env-properties.ts b/utils/properties/env-properties.ts
index 9ac9bca1..53768d58 100644
--- a/utils/properties/env-properties.ts
+++ b/utils/properties/env-properties.ts
@@ -24,6 +24,7 @@ export interface EnvProperties {
   statisticsAPIURL?: string;
   impactFactorsAPIURL?: string;
   enermapsURL?: string;
+  enermapsAPIURL?: string;
   claimsAPIURL?: string;
   searchAPIURLLAst?: string;
   searchResourcesAPIURL?: string;
diff --git a/utils/tabs/contents/search-tab.component.ts b/utils/tabs/contents/search-tab.component.ts
index efa89ef2..6ab6520e 100644
--- a/utils/tabs/contents/search-tab.component.ts
+++ b/utils/tabs/contents/search-tab.component.ts
@@ -23,6 +23,8 @@ import {ErrorCodes} from "../../properties/errorCodes";
           </a>
         </div>
 
+        <ng-content></ng-content>
+        
         <search-result [properties]="properties"
                        [results]="fetch.results"
                        [status]="fetch.searchUtils.status"