diff --git a/landingPages/result/resultLanding.component.html b/landingPages/result/resultLanding.component.html
index db41463f..d73324ac 100644
--- a/landingPages/result/resultLanding.component.html
+++ b/landingPages/result/resultLanding.component.html
@@ -437,12 +437,13 @@
               <ng-template #enermaps_tab>
                 <div class="uk-padding">
                   <div   class=" uk-inline uk-width-expand  uk-text-center ">
-                    <img  class="uk-width-auto" [src]="properties.enermapsURL +'/images/' + enermapsId + '.png'"
+                    <img  class="uk-width-auto" [src]="properties.enermapsURL +'/images/datasets/' + enermapsId +
+                    '.png'"
                           alt="Enermaps tool preview" loading="lazy">
                     <div class="uk-overlay uk-overlay-default uk-position-bottom">
                       <p>Visit <a
                         class=" uk-margin-right uk-margin-small-top"
-                        [href]="properties.enermapsURL" target="_blank" >
+                        [href]="properties.enermapsURL + '/?shared_id=' + enermapsId" target="_blank" >
                         Enermaps tool <span class="custom-external custom-icon space"></span>
                       </a></p>
                     </div>
diff --git a/landingPages/result/resultLanding.service.ts b/landingPages/result/resultLanding.service.ts
index 6d0a2ee8..11d4bd18 100644
--- a/landingPages/result/resultLanding.service.ts
+++ b/landingPages/result/resultLanding.service.ts
@@ -489,8 +489,7 @@ export class ResultLandingService {
   }
 
   getEnermapsDetails(id: string) {
-    // let url = properties.enermapsURL+"/api/datasets_full?shared_id=eq."+id;
-    let url = properties.enermapsURL+"/api/metadata?shared_id=eq."+id;
+    let url = properties.enermapsURL+"/api/db/metadata?shared_id=eq."+id;
     return this.http.get((properties.useLongCache)? (properties.cacheUrl+encodeURIComponent(url)): url)
     // return this.http.get(url)
       .pipe(map(res => this.parseEnermapsDetails(res)));
diff --git a/utils/result-preview/result-preview.component.html b/utils/result-preview/result-preview.component.html
index 445f2721..95a0d35a 100644
--- a/utils/result-preview/result-preview.component.html
+++ b/utils/result-preview/result-preview.component.html
@@ -2,12 +2,12 @@
   <!-- Before title -->
   <div class="uk-grid uk-flex uk-flex-middle">
     <div   *ngIf="properties.enermapsURL && showEnermaps && result.enermapsId"  class=" uk-inline uk-width-auto  uk-text-center uk-visible-toggle">
-      <img  class="uk-width-medium" [src]="properties.enermapsURL +'/images/' + result.enermapsId + '.png'"
+      <img  class="uk-width-medium" [src]="properties.enermapsURL +'/images/datasets/' + result.enermapsId + '.png'"
             alt="Enermaps tool preview" loading="lazy">
       <div class="uk-overlay uk-margin-medium-left uk-overlay-default uk-position-bottom uk-hidden-hover uk-padding-small">
         <p>Visit <a
           class=" uk-margin-right uk-margin-small-top"
-          [href]="properties.enermapsURL" target="_blank" >
+          [href]="properties.enermapsURL + '/?shared_id=' + result.enermapsId" target="_blank" >
           Enermaps tool <span class="custom-external custom-icon space"></span>
         </a></p>
       </div>