diff --git a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js
index 82a2c567800ad07e346b6540842f01936cb04b44..78302a166cb55771366d6567203cecabd23b87da 100644
--- a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js
+++ b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js
@@ -634,8 +634,11 @@ function MainController(profile) {
 					break;
 				case "showEditExperimentPageFromIdentifier":
 					var _this = this;
-					this.serverFacade.listExperimentsForIdentifiers([arg], function(data) {
-						document.title = "" + ELNDictionary.getExperimentKindName(arg) + " " + arg;
+                    var argsArray = arg ? JSON.parse(decodeURIComponent(arg)) : [null, null];
+                    var identifier = argsArray[0];
+                    var type = argsArray[1];
+                    this.serverFacade.listExperimentsForIdentifiers([identifier], function(data) {
+                        document.title = "" + ELNDictionary.getExperimentKindName(type) + " " + identifier;
 						_this._showExperimentPage(data.result[0], FormMode.EDIT);
 						//window.scrollTo(0,0);
 					});
diff --git a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormController.js b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormController.js
index 29dc16fe90746a0f3000fb97efc76bd3682059c0..2ae7aeeb414f7dfaa660ad90d18d326dbf497dde 100644
--- a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormController.js
+++ b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormController.js
@@ -30,6 +30,7 @@ function ExperimentFormController(mainController, mode, experiment) {
 					var id = new ExperimentPermId(experiment.permId);
 					var fetchOptions = new ExperimentFetchOptions();
 					fetchOptions.withProject().withSpace();
+                    fetchOptions.withType();
                     fetchOptions.withSamples().withProperties();
                     fetchOptions.withDataSets().withType();
                     fetchOptions.withDataSets().withProperties();
diff --git a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormView.js b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormView.js
index e33959cff9f094e2a5089de43c4c8010114cd472..e6cc182b5cb9c1f99b3334b1c604bdbfeabad4f2 100644
--- a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormView.js
+++ b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormView.js
@@ -83,8 +83,10 @@ function ExperimentFormView(experimentFormController, experimentFormModel) {
 			if (_this._allowedToEdit() && toolbarConfig.EDIT) {
 				//Edit
 				var $editBtn = FormUtil.getButtonWithIcon("glyphicon-edit", function () {
-				    Util.blockUI();
-					mainController.changeView("showEditExperimentPageFromIdentifier", _this._experimentFormModel.experiment.identifier);
+                    Util.blockUI();
+                    var exp = _this._experimentFormModel.experiment;
+                    var args = encodeURIComponent('["' + exp.identifier + '","' + exp.experimentTypeCode + '"]');
+                    mainController.changeView("showEditExperimentPageFromIdentifier", args);
 				}, "Edit", null, "edit-btn");
 				toolbarModel.push({ component : $editBtn });
 			}
@@ -103,7 +105,7 @@ function ExperimentFormView(experimentFormController, experimentFormModel) {
                 var maxNumToShow = 10;
                 var $component = $("<div>");
                 var experiment = this._experimentFormModel.v3_experiment;
-                var experimentKindName = ELNDictionary.getExperimentKindName(experiment.identifier.identifier).toLowerCase();
+                var experimentKindName = ELNDictionary.getExperimentKindName(experiment.getType().getCode()).toLowerCase();
                 var samples = experiment.samples;
                 if (samples.length > 0) {
                     var warningText = "The " + experimentKindName + " has " + samples.length + " " 
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 9e395bfdbcd7c4b797bf003211f60fdb335895e4..4c80fdeeb0c4fecb9b589c46f1c1ab98853d92fe 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,12 +51,12 @@ function ExperimentTableView(experimentTableController, experimentTableModel) {
 	this._showExperimentFromOverviewDropdown = function() {
 		var _this = this;
 		var expDropModel = [];
-		var projectIdentifier = IdentifierUtil.getProjectIdentifier(this._experimentTableModel.project.spaceCode, this._experimentTableModel.project.code);
-		expDropModel = [{value : "OVERVIEW", label : "Show only overview " + ELNDictionary.getExperimentKindName(projectIdentifier, true), selected : this._experimentTableModel.showInProjectOverview },
-		                {value : "ALL", label : "Show all " + ELNDictionary.getExperimentKindName(projectIdentifier, true), selected : !this._experimentTableModel.showInProjectOverview }];
+		var kindName = ELNDictionary.ExperimentsELN;
+		expDropModel = [{value : "OVERVIEW", label : "Show only overview " + kindName, selected : this._experimentTableModel.showInProjectOverview },
+		                {value : "ALL", label : "Show all " + kindName, selected : !this._experimentTableModel.showInProjectOverview }];
 		
 		
-		var $experimentDropdown = FormUtil.getDropdown(expDropModel, "Select what " + ELNDictionary.getExperimentKindName(projectIdentifier, true) + " to show");
+		var $experimentDropdown = FormUtil.getDropdown(expDropModel, "Select what " + kindName + " to show");
 		$experimentDropdown.attr("id", "what-experiments-drop-down");
 		
 		$experimentDropdown.change(function() {