diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js
index 22b8b30b3dd2118a3d439fc49fbfdecfeebc8e28..5b77aafdf23d679dd48e8a4a868bdd9646a76385 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js
@@ -772,6 +772,7 @@ function ServerFacade(openbisServer) {
 			
 			//TO-DO Setting the fetchOptions given standard settings
 			var fetchOptions = new SampleFetchOptions();
+			fetchOptions.withTags();
 			fetchOptions.withType();
 			fetchOptions.withSpace();
 			fetchOptions.withExperiment();
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js
index 185729a6795155647b142db680f8b899fe65152c..7390f4358cebffbcf353a40e477c59f0c1a7ea25 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js
@@ -397,8 +397,8 @@ function AdvancedSearchView(advancedSearchController, advancedSearchModel) {
 			};
 			
 			var rowClick = function(e) {
-				switch(e.data["@type"]) {
-					case "as.dto.sample.Sample":
+				switch(e.data.entityKind) {
+					case "Sample":
 						mainController.changeView('showViewSamplePageFromPermId', e.data.permId);
 						break;
 				}