diff --git a/openbis/etc/web-client.properties b/openbis/etc/web-client.properties
index 38389356ee58c344517d116e8779ff6a8432de64..ea76894a7d16978e96bf62b80cb4212370098e03 100644
--- a/openbis/etc/web-client.properties
+++ b/openbis/etc/web-client.properties
@@ -41,11 +41,11 @@ sample-view.view = generic_sample_viewer
 sample-view.types = CELL_PLATE, CONTROL_LAYOUT
 sample-view.hide-sections = attachment-section, module-section
 
-experiment-view.view = generic_sample_viewer
+experiment-view.view = generic_experiment_viewer
 experiment-view.types = SIRNA_HCS
 experiment-view.hide-sections = attachment-section
 
-data-view.view = generic-dataset-viewer
+data-view.view = generic_dataset_viewer
 data-view.types = HCS_IMAGE
 data-view.hide-smart-view = true
 data-view.hide-file-view = false
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractViewer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractViewer.java
index 79d728afbb458419497a2eb225764ab636ff2209..d31a82e44cd09dbfa4b2c13faf3d1b33404a2de2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractViewer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractViewer.java
@@ -168,15 +168,15 @@ public abstract class AbstractViewer<D extends IEntityInformationHolder> extends
     public static String getTitle(final IMessageProvider messageProvider,
             final String entityKindDictKey, final ICodeHolder codeProvider)
     {
-        return messageProvider.getMessage(Dict.DETAILS_TITLE, messageProvider
-                .getMessage(entityKindDictKey), codeProvider.getCode());
+        return messageProvider.getMessage(Dict.DETAILS_TITLE,
+                messageProvider.getMessage(entityKindDictKey), codeProvider.getCode());
     }
 
     /** Updates data displayed in the browser (needed to open editor view). */
     protected void updateOriginalData(D newData)
     {
         this.originalData = newData;
-        this.displayIdSuffix = newData.getEntityKind() + "_" + newData.getEntityType().getCode();
+        this.displayIdSuffix = newData.getEntityType().getCode();
         updateTitle(getOriginalDataDescription());
         setToolBarButtonsEnabled(true);
     }