diff --git a/src/app/search/search.component.html b/src/app/search/search.component.html
index 770a7d876cca8621b3a0cd087f80f9032c5191e2..15acabe325e87f329d218e47dcbc35346fed1fd5 100644
--- a/src/app/search/search.component.html
+++ b/src/app/search/search.component.html
@@ -31,9 +31,10 @@
       </thead>    
       <tbody >
         <tr *ngFor="let result of results">
-          <td><a href="{{result.uri.value}}" target="blank">{{result.uri.value}}</a></td>   
+          <td><a href="{{result.dataset.value}}" target="blank">{{result.dataset.value}}</a></td>   
           <td>{{result.title.value}}</td>    
-          <td>{{result.description.value.substr(0,250)}}</td>    
+          <td>{{result.description.value.substr(0,250)}}</td>  
+          <td>{{result.keyword.value}}</td>  
         </tr>    
     </tbody>
     </table>    
diff --git a/src/app/search/search.component.ts b/src/app/search/search.component.ts
index 41639e47da817627c2d8b38b2eab7e11989da016..564ca61ccc73769fee0d9f051ef3591f3992d654 100644
--- a/src/app/search/search.component.ts
+++ b/src/app/search/search.component.ts
@@ -46,14 +46,14 @@ export class SearchComponent implements OnInit {
     this.searchedTerm = term;
     let query='query=PREFIX dcat: <http://www.w3.org/ns/dcat#>\n\
               PREFIX dcterms: <http://purl.org/dc/terms/>\n\
-              SELECT  ?title ?description ?uri \n\
+              SELECT  ?title ?description ?keyword ?uri ?dataset \n\
               where {\n\?dataset a dcat:Dataset ;\n\
                         dcterms:title ?title ;\n\
                         dcterms:description ?description; \n\
                         dcterms:isPartOf* <'+ environment.fdpUrl +'>;\n\
-                        dcat:keyword ?uri ; \n\
+                        dcat:keyword ?keyword ; \n\
                         FILTER (contains( ?description, "' + 
-                        term +'") || contains( ?title, "'+ term +'"))\n\.\n\
+                        term +'") || contains( ?title, "'+ term +'") || contains( ?keyword, "'+ term +'"))\n\.\n\
               }'
     
     this.parserService.getXmlResult(query).subscribe(