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 7328cf9ee05144c0f1e00353414865dc64131339..78227982906a48567c2f4d0acdb818b6db9d3915 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
@@ -4,18 +4,22 @@ var ELNDictionary = {
 	sample : "object",
 	samples : "objects",
 	ExperimentELN : "Experiment",
-	ExperimentInventory : "Collection",
+	ExperimentCollection : "Collection",
 	ExperimentsELN : "Experiments",
-	ExperimentsInventory : "Collections"
+	ExperimentsCollection : "Collections"
 }
 
 ELNDictionary.getExperimentDualName = function() {
-	return ELNDictionary.ExperimentELN + "/" + ELNDictionary.ExperimentInventory;
+    return ELNDictionary.ExperimentELN + "/" + ELNDictionary.ExperimentCollection;
+}
+
+ELNDictionary.getExperimentsDualName = function() {
+    return ELNDictionary.ExperimentsELN + "/" + ELNDictionary.ExperimentsCollection;
 }
 
 ELNDictionary.getExperimentKindName = function(entityType, isPlural) {
     if (entityType === "COLLECTION") {
-		return (isPlural)?ELNDictionary.ExperimentsInventory:ELNDictionary.ExperimentInventory;
+        return (isPlural) ? ELNDictionary.ExperimentsCollection : ELNDictionary.ExperimentCollection;
 	} else {
 		return (isPlural)?ELNDictionary.ExperimentsELN:ELNDictionary.ExperimentELN;
 	}
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 1b8e95ba4511c061af84e86cd28a8620dd594b38..2ae82749c0ce7f60f68c8817741e591d70b637d2 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
@@ -2293,6 +2293,7 @@ function ServerFacade(openbisServer) {
 		v1Sample["identifier"] = (v3Sample.identifier)?v3Sample.identifier.identifier:null;
 		v1Sample["projectCode"] = (v3Sample.project) ? v3Sample.project.code : null;
 		v1Sample["experimentIdentifierOrNull"] = (v3Sample.experiment)?v3Sample.experiment.identifier.identifier:null;
+        v1Sample["experimentTypeCode"] = v3Sample.experiment && v3Sample.experiment.type ? v3Sample.experiment.type.code : null;
 		v1Sample["sampleTypeCode"] = (v3Sample.type)?v3Sample.type.code:null;
 		v1Sample["properties"] = v3Sample.properties;
 
@@ -2630,7 +2631,7 @@ function ServerFacade(openbisServer) {
             fetchOptions.withRegistrator();
             fetchOptions.withModifier();
             fetchOptions.withProject();
-            fetchOptions.withExperiment();
+            fetchOptions.withExperiment().withType();
             if(fechOptions["withProperties"]) {
             		fetchOptions.withProperties();
             }
diff --git a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentTable/ExperimentTableView.js b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentTable/ExperimentTableView.js
index 4c80fdeeb0c4fecb9b589c46f1c1ab98853d92fe..48099ce6710ab881caab64ec3b1b16d2749864b0 100644
--- a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentTable/ExperimentTableView.js
+++ b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentTable/ExperimentTableView.js
@@ -51,7 +51,7 @@ function ExperimentTableView(experimentTableController, experimentTableModel) {
 	this._showExperimentFromOverviewDropdown = function() {
 		var _this = this;
 		var expDropModel = [];
-		var kindName = ELNDictionary.ExperimentsELN;
+		var kindName = ELNDictionary.getExperimentsDualName();
 		expDropModel = [{value : "OVERVIEW", label : "Show only overview " + kindName, selected : this._experimentTableModel.showInProjectOverview },
 		                {value : "ALL", label : "Show all " + kindName, selected : !this._experimentTableModel.showInProjectOverview }];
 		
diff --git a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ProjectForm/ProjectFormView.js b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ProjectForm/ProjectFormView.js
index 2380bcf0891c88eec3a5f8c87671c7a0132c70b5..62363d5c34ba801a9693995de7d90931f7a66f6d 100644
--- a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ProjectForm/ProjectFormView.js
+++ b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ProjectForm/ProjectFormView.js
@@ -56,7 +56,6 @@ function ProjectFormView(projectFormController, projectFormModel) {
 		var toolbarModel = [];
 		var dropdownOptionsModel = [];
 		if(this._projectFormModel.mode === FormMode.VIEW) {
-			var experimentKindName = ELNDictionary.getExperimentKindName(projectIdentifier);
 			if (_this._allowedToCreateExperiments()) {
 				//Create Experiment
 				var experimentTypes = mainController.profile.getExperimentTypes();
@@ -286,7 +285,7 @@ function ProjectFormView(projectFormController, projectFormModel) {
 	}
 	
 	this._createExperimentsSection = function(projectIdentifier, hideShowOptionsModel) {
-		var entityKindName = ELNDictionary.getExperimentKindName(projectIdentifier, true);
+		var entityKindName = ELNDictionary.getExperimentsDualName();
 		var $experiments = $("<div>", { id : "project-experiments" });
 		var $experimentsContainer = $("<div>");
 		$experiments.append($("<legend>").append(entityKindName));
diff --git a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js
index dd90c6f1a2f27ba740c148d98e328361e5798847..2ee13ab8afb6f6de79865d2c5bed4e377ba53606 100644
--- a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js
+++ b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js
@@ -852,7 +852,7 @@ function SampleFormView(sampleFormController, sampleFormModel) {
 		}
 		$fieldset.append(FormUtil.getFieldForLabelWithText("Type", this._sampleFormModel.sample.sampleTypeCode));
 		if(this._sampleFormModel.sample.experimentIdentifierOrNull) {
-			$fieldset.append(FormUtil.getFieldForLabelWithText(ELNDictionary.getExperimentKindName(this._sampleFormModel.sample.experimentIdentifierOrNull), this._sampleFormModel.sample.experimentIdentifierOrNull));
+            $fieldset.append(FormUtil.getFieldForLabelWithText(ELNDictionary.getExperimentKindName(this._sampleFormModel.sample.experimentTypeCode), this._sampleFormModel.sample.experimentIdentifierOrNull));
 		}
 
 		//
diff --git a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/SampleTableView.js b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/SampleTableView.js
index f84c42eec103e0ca03bbb62de6746934b0cf4828..05c8f3ea1cd960e63ed3ac83b1eb9b46365efdfa 100644
--- a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/SampleTableView.js
+++ b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/SampleTableView.js
@@ -170,7 +170,7 @@ function SampleTableView(sampleTableController, sampleTableModel) {
 		$list.append($batchUpdateOption);
 		
 		if(_this._sampleTableModel.experimentIdentifier) {
-			var expKindName = ELNDictionary.getExperimentKindName(_this._sampleTableModel.experimentIdentifier, false);
+            var expKindName = ELNDictionary.getExperimentKindName(_this._sampleTableModel.experiment.experimentTypeCode, false);
 			var $searchCollectionOption = $("<li>", { 'role' : 'presentation' }).append($("<a>", {'title' : 'Search in ' + expKindName, 'id' : 'search-' + ELNDictionary.Sample.toLowerCase() + '-btn'}).append('Search in ' + expKindName));
 			$searchCollectionOption.click(function() {