diff --git a/src/app/dataset/dataset.component.ts b/src/app/dataset/dataset.component.ts
index 25d7252d5adeaf283d235609654dc709bc2a3438..9df52dda9fc0b4cd3ad9b55dd90d442f53ca21e0 100644
--- a/src/app/dataset/dataset.component.ts
+++ b/src/app/dataset/dataset.component.ts
@@ -101,18 +101,18 @@ export class DatasetComponent implements OnInit {
     const concepts = new DataConcept();
     concepts.url = this.dataset.url;
     concepts.iris = [];
-    if (this.dataset.keywords && this.dataset.keywords.size > 0) {
-      for (const [key, value] of this.dataset.keywords) {
+    if (this.dataset.keywords ) {
+      Object.values(this.dataset.keywords).forEach(value =>  {
         if ((null !== value && value.results.filter(e => e.checked).length > 0)) {
           if (value) {
             value.results.forEach((result: Result) => {
               if (result.checked) {
-                concepts.iris.push({iri: result.source.document.iri, label: result.source.document.label, originalKeyword: key});
+                concepts.iris.push({iri: result.source.document.iri, label: result.source.document.label, originalKeyword: value.search1});
               }
             });
           }
         }
-      }
+      });
     }
 
     if (this.autocompleteResults && this.autocompleteResults.length > 0) {
diff --git a/src/app/semantic-enrichment/semantic-enrichment.component.ts b/src/app/semantic-enrichment/semantic-enrichment.component.ts
index be5bd6aad3cb5ff98a4498b793033cfcfbdb2fa0..e22204177f62d21130bbcbbe4e45937df93774a0 100644
--- a/src/app/semantic-enrichment/semantic-enrichment.component.ts
+++ b/src/app/semantic-enrichment/semantic-enrichment.component.ts
@@ -128,20 +128,19 @@ export class SemanticEnrichmentComponent implements OnInit {
       const concepts = new DataConcept();
       concepts.id = data.id;
       concepts.iris = [];
-      if (data.keywords && data.keywords.size > 0) {
+      if (data.keywords) {
 
-
-        for (const [key, value] of data.keywords) {
+        Object.values(data.keywords).forEach(value =>  {
 
           if (value && value.results) {
             value.results.forEach((result: Result) => {
               if (result.checked) {
-                concepts.iris.push({iri: result.source.document.iri, label: result.source.document.label, originalKeyword: key});
+                concepts.iris.push({iri: result.source.document.iri, label: result.source.document.label, originalKeyword: value.search1});
               }
             });
           }
 
-        }
+        });
       }
       if (this.autocompleteMap.get(data.id) && this.autocompleteMap.get(data.id).length > 0) {
         this.autocompleteMap.get(data.id).forEach(