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 ab371003331088c96339b5245a83beaac5d94333..307e6bb426f8d209509930c3c47a2a9ac78ac722 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
@@ -122,18 +122,20 @@ function AdvancedSearchController(mainController, forceSearch) {
 			
 			var fetchOptions = {};
 			
+			var optionsSearch = null;
 			if(options) {
 				fetchOptions.count = options.pageSize;
 				fetchOptions.from = options.pageIndex * options.pageSize;
 				fetchOptions.minTableInfo = true;
 				fetchOptions.withExperiment = true;
+				optionsSearch = options.search;
 				// TODO : Unused on the UI, should be added for DataSets
 				// fetchOptions.withSample = true;
 			}
 			
-			if(!criteria.cached || (criteria.cachedSearch !== options.search)) {
+			if(!criteria.cached || (criteria.cachedSearch !== optionsSearch)) {
 				fetchOptions.cache = "RELOAD_AND_CACHE";
-				criteria.cachedSearch = options.search;
+				criteria.cachedSearch = optionsSearch;
 				criteria.cached = true;
 			} else {
 				fetchOptions.cache = "CACHE";
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 df0a22b8605b85f845554bd76f2623c38253bbd7..83a08a1badcc379f0fd07eac056acbe99ca66eea 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
@@ -420,14 +420,16 @@ var SampleDataGridUtil = new function() {
 					withChildrenInfo : true
 			};
 			
+			var optionsSearch = null;
 			if(options) {
 				fetchOptions.count = options.pageSize;
 				fetchOptions.from = options.pageIndex * options.pageSize;
+				optionsSearch = options.search;
 			}
 			
-			if(!criteria.cached || (criteria.cachedSearch !== options.search)) {
+			if(!criteria.cached || (criteria.cachedSearch !== optionsSearch)) {
 				fetchOptions.cache = "RELOAD_AND_CACHE";
-				criteria.cachedSearch = options.search;
+				criteria.cachedSearch = optionsSearch;
 				criteria.cached = true;
 			} else {
 				fetchOptions.cache = "CACHE";