diff --git a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/ELNDictionary.js b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/ELNDictionary.js
index 78227982906a48567c2f4d0acdb818b6db9d3915..98bf8f4477c125c433cbf9c2fb6b8f35fc5054f0 100644
--- a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/ELNDictionary.js
+++ b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/ELNDictionary.js
@@ -3,12 +3,17 @@ var ELNDictionary = {
 	Samples : "Objects",
 	sample : "object",
 	samples : "objects",
+	SampleELN : "Sample",
 	ExperimentELN : "Experiment",
 	ExperimentCollection : "Collection",
 	ExperimentsELN : "Experiments",
 	ExperimentsCollection : "Collections"
 }
 
+ELNDictionary.getSampleDualName = function() {
+	return ELNDictionary.SampleELN + "/" + ELNDictionary.Sample;
+}
+
 ELNDictionary.getExperimentDualName = function() {
     return ELNDictionary.ExperimentELN + "/" + ELNDictionary.ExperimentCollection;
 }
diff --git a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js
index 4725035616a02aa8eb11f6b500a6e53f8708af12..b8b0a29f41825502addf3a1fb972d4ce54d051a8 100644
--- a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js
+++ b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js
@@ -2074,6 +2074,13 @@ function ServerFacade(openbisServer) {
                                                 break;
                                     }
                                     break;
+																case "SAMPLE_CODE":
+																	  switch (comparisonOperator) {
+																		    case 'thatContains':
+																			      criteria.withSample().withCode().thatContains(attributeValue)
+																				    break
+																	  }
+																	  break
                                 case "EXPERIMENT_IDENTIFIER":
                                     if(!comparisonOperator) {
                                         comparisonOperator = "thatEquals";
diff --git a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchController.js b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchController.js
index 54e5d69ce19e699770ac452705bea5c946fe727a..3c97b387f6b05273a9d91382a1bdaa1247067c68 100644
--- a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchController.js
+++ b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchController.js
@@ -19,7 +19,6 @@ function AdvancedSearchController(mainController, forceSearch) {
 	this._advancedSearchModel = new AdvancedSearchModel(forceSearch);
 	this._advancedSearchView = new AdvancedSearchView(this, this._advancedSearchModel);
 	this.additionalRules = [];
-	this.fetchWithSample = false;
 	this.enrichResultsFunction = function(results, callback) {
 		callback(results);
 	}
@@ -192,7 +191,7 @@ function AdvancedSearchController(mainController, forceSearch) {
 				fetchOptions.withExperiment = true;
 				fetchOptions.withParents = false;
 				fetchOptions.withChildren = false;
-				fetchOptions.withSample = _this.fetchWithSample;
+				fetchOptions.withSample = true;
                 optionsSearch = JSON.stringify({
                     searchMode: options.searchMode,
                     searchMap: options.searchMap,
@@ -246,6 +245,8 @@ function AdvancedSearchController(mainController, forceSearch) {
                             gridSubcriteria.rules[Util.guid()] = { type : "Attribute", name : "ENTITY_TYPE", value : search, operator: "thatContains" };
                         }else if(field === "experiment"){
                             gridSubcriteria.rules[Util.guid()] = { type : "Attribute", name : "EXPERIMENT_CODE", value : search, operator: "thatContains" };
+												}else if(field === "sample"){
+													gridSubcriteria.rules[Util.guid()] = { type : "Attribute", name : "SAMPLE_CODE", value : search, operator: "thatContains" };
                         }else if(field === "code"){
                             gridSubcriteria.rules[Util.guid()] = { type : "Attribute", name : "CODE", value : search, operator: "thatContains" };
                         }else if(field === "identifier"){
diff --git a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js
index cee65ded8e403185541182fb752aed47e955a812..e067afb67cfea30376ad4b3ff5e016a8f3715073 100644
--- a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js
+++ b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js
@@ -1072,6 +1072,12 @@ function AdvancedSearchView(advancedSearchController, advancedSearchModel) {
 				exportableProperty: DataGridExportOptions.EXPORTABLE_FIELD.EXPERIMENT,
 				filterable: !isGlobalSearch,
 				sortable : false
+			}, {
+				label : ELNDictionary.getSampleDualName(),
+				property : 'sample',
+				exportableProperty: DataGridExportOptions.EXPORTABLE_FIELD.SAMPLE,
+				filterable: !isGlobalSearch,
+				sortable : false
 			}]);
 
 			if (criteria.entityKind === "DATASET") {
diff --git a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ArchivingHelper/ArchivingHelperView.js b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ArchivingHelper/ArchivingHelperView.js
index bf666d86389693cff7bddc7c8e29d6974a68b846..b8b22005f3da983623f44c8e3399ddbe60e1ccda 100644
--- a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ArchivingHelper/ArchivingHelperView.js
+++ b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ArchivingHelper/ArchivingHelperView.js
@@ -48,7 +48,6 @@ function ArchivingHelperView(archivingHelperController, archivingHelperModel) {
         searchView.configKeyPrefix += "ARCHIVING_HELPER_";
 //        searchView.suppressedColumns = ['entityKind', 'identifier'];
         searchView.hideByDefaultColumns = ['$NAME', 'registrator', 'modificationDate', 'modifier'];
-        searchController.fetchWithSample = true;
         searchView.firstColumns = [{
             label : "Should be archived",
             property : "archive",
diff --git a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/UnarchivingHelper/UnarchivingHelperView.js b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/UnarchivingHelper/UnarchivingHelperView.js
index a01333db0c901e57c5b23eca78fe5dd81dfd5688..78e50b1f27a02111856fad356211a0575789fe05 100644
--- a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/UnarchivingHelper/UnarchivingHelperView.js
+++ b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/UnarchivingHelper/UnarchivingHelperView.js
@@ -85,7 +85,6 @@ function UnarchivingHelperView(unarchivingHelperController, unarchivingHelperMod
 		searchView.configKeyPrefix += "UNARCHIVING_HELPER_";
 		searchView.suppressedColumns = ['entityKind', 'identifier'];
 		searchView.hideByDefaultColumns = ['$NAME', 'bundle', 'registrator', 'modificationDate', 'modifier'];
-		searchController.fetchWithSample = true;
 		searchView.firstColumns = [{
 			label : "Should be unarchived",
 			property : "unarchive",