diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchController.js
index 7410d14ff9901a0bbd7fd1b9b540bc199a079171..464594861e10a93e303ec67c5dea6aefcb8fabf0 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchController.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchController.js
@@ -104,7 +104,7 @@ function AdvancedSearchController(mainController, forceFreeTextSearch) {
 				
 			var criteriaToSend = $.extend(true, {}, criteria);
 			
-			if(options.search) {
+			if(options && options.search) {
 				var filter = options.search.toLowerCase().split(/[ ,]+/); //Split by regular space or comma
 				for(var fIdx = 0; fIdx < filter.length; fIdx++) {
 					var fKeyword = filter[fIdx];
@@ -112,7 +112,7 @@ function AdvancedSearchController(mainController, forceFreeTextSearch) {
 				}
 			}
 			
-			if(options.sortProperty && options.sortDirection) {
+			if(options && options.sortProperty && options.sortDirection) {
 				fetchOptions.sort = { 
 						type : null,
 						name : null,
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js
index eae4e097ff8ca745b3f53aefa5b01533d44f3e16..67c8bd010c7e294da18e099059ac6144ab0c9d63 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js
@@ -527,6 +527,9 @@ function AdvancedSearchView(advancedSearchController, advancedSearchModel) {
 						}
 					}
 					
+					if(!entity) {
+						continue;
+					}
 					for(var propertyCode in entity.properties) {
 						if(entity.properties[propertyCode]) {
 							foundPropertyCodes[propertyCode] = true;
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js
index 223b91f9851018c19f271e8d314af8863e7b5dd8..f01a8a47ca8b1a7967c0c890f48318a5560bb309 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js
@@ -305,7 +305,7 @@ var SampleDataGridUtil = new function() {
 				
 			var criteriaToSend = $.extend(true, {}, criteria);
 			
-			if(options.search) {
+			if(options && options.search) {
 				var filter = options.search.toLowerCase().split(/[ ,]+/); //Split by regular space or comma
 				for(var fIdx = 0; fIdx < filter.length; fIdx++) {
 					var fKeyword = filter[fIdx];
@@ -313,7 +313,7 @@ var SampleDataGridUtil = new function() {
 				}
 			}
 			
-			if(options.sortProperty && options.sortDirection) {
+			if(options && options.sortProperty && options.sortDirection) {
 				fetchOptions.sort = { 
 						type : null,
 						name : null,
@@ -340,6 +340,11 @@ var SampleDataGridUtil = new function() {
 				}
 			}
 			
+//			Util.blockUI();
+//			mainController.serverFacade.searchForSamplesAdvanced(criteriaToSend, fetchOptions, function(result) {
+//				callbackForSearch(result);
+//				Util.unblockUI();
+//			});
 			mainController.serverFacade.searchForSamplesAdvanced(criteriaToSend, fetchOptions, callbackForSearch);
 		}
 	}