diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserGrid.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserGrid.java
index 73f1272d0d96ca24a6cd529f70165880a2c23969..9c09977591b3b9dd1874f595beac4e07160f4ad4 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserGrid.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserGrid.java
@@ -65,14 +65,11 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.dto.ListSampleDisplayC
 import ch.systemsx.cisd.openbis.generic.client.web.client.dto.SampleGridColumnIDs;
 import ch.systemsx.cisd.openbis.generic.client.web.client.dto.TableExportCriteria;
 import ch.systemsx.cisd.openbis.generic.client.web.client.dto.TypedTableResultSet;
-import ch.systemsx.cisd.openbis.generic.shared.basic.CodeConverter;
 import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.BasicEntityType;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind.ObjectKind;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityKind;
-import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityType;
-import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityTypePropertyType;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Experiment;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ISerializableComparable;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ListSampleCriteria;
@@ -449,23 +446,6 @@ public class SampleBrowserGrid extends AbstractEntityGrid<Sample>
         return definitions;
     }
 
-    protected boolean isPropertyEditable(EntityType entityType,
-            String propertyColumnNameWithoutPrefix)
-    {
-        String propertyTypeCode =
-                CodeConverter.getPropertyTypeCode(propertyColumnNameWithoutPrefix);
-        List<? extends EntityTypePropertyType<?>> assignedPropertyTypes =
-                entityType.getAssignedPropertyTypes();
-        for (EntityTypePropertyType<?> entityTypePropertyType : assignedPropertyTypes)
-        {
-            if (entityTypePropertyType.getPropertyType().getCode().equals(propertyTypeCode))
-            {
-                return entityTypePropertyType.isShownInEditView();
-            }
-        }
-        return false;
-    }
-
     @Override
     protected EntityKind getEntityKindOrNull()
     {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/PropertyTypeAssignmentGridColumnIDs.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/PropertyTypeAssignmentGridColumnIDs.java
index b2586d50b80fb6486425382403745c7f1444c19f..1c357c613c827d24412c6cac956a21ab6477434c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/PropertyTypeAssignmentGridColumnIDs.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/PropertyTypeAssignmentGridColumnIDs.java
@@ -49,5 +49,7 @@ public class PropertyTypeAssignmentGridColumnIDs
 
     public static final String IS_SHOWN_IN_EDITOR_VIEW = "IS_SHOWN_IN_EDITOR_VIEW";
 
+    public static final String SHOW_RAW_VALUE = "SHOW_RAW_VALUE";
+
     public static final String SCRIPT = "SCRIPT";
 }
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/EntityTypePropertyTypeProvider.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/EntityTypePropertyTypeProvider.java
index e09c56d184252cd6bb8a8fa9f00aae6a638eb7ab..63b01c92d1a4c2bd4d1366f16f1ee482ef852ee2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/EntityTypePropertyTypeProvider.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/EntityTypePropertyTypeProvider.java
@@ -28,6 +28,7 @@ import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.PropertyTyp
 import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.PropertyTypeAssignmentGridColumnIDs.PROPERTY_TYPE_CODE;
 import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.PropertyTypeAssignmentGridColumnIDs.SCRIPT;
 import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.PropertyTypeAssignmentGridColumnIDs.SECTION;
+import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.PropertyTypeAssignmentGridColumnIDs.SHOW_RAW_VALUE;
 import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.PropertyTypeAssignmentGridColumnIDs.TYPE_OF;
 
 import java.util.List;
@@ -76,6 +77,7 @@ public class EntityTypePropertyTypeProvider extends
         builder.addColumn(IS_DYNAMIC);
         builder.addColumn(IS_MANAGED);
         builder.addColumn(IS_SHOWN_IN_EDITOR_VIEW);
+        builder.addColumn(SHOW_RAW_VALUE);
         builder.addColumn(SCRIPT);
         for (EntityTypePropertyType<?> etpt : entityTypePropertyTypes)
         {
@@ -94,6 +96,8 @@ public class EntityTypePropertyTypeProvider extends
             builder.column(IS_MANAGED).addString(SimpleYesNoRenderer.render(etpt.isManaged()));
             builder.column(IS_SHOWN_IN_EDITOR_VIEW).addString(
                     SimpleYesNoRenderer.render(etpt.isShownInEditView()));
+            builder.column(SHOW_RAW_VALUE).addString(
+                    SimpleYesNoRenderer.render(etpt.getShowRawValue()));
             Script script = etpt.getScript();
             if (script != null)
             {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/SimpleYesNoRenderer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/SimpleYesNoRenderer.java
index 4a68610896ed04ee473565ef4e3ceafded903743..11106a6bbd9e9a3d6295b1a6bd779a9fd624b6ba 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/SimpleYesNoRenderer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/SimpleYesNoRenderer.java
@@ -21,6 +21,11 @@ package ch.systemsx.cisd.openbis.generic.shared.basic;
  */
 public class SimpleYesNoRenderer
 {
+    public static String render(Boolean value)
+    {
+        return value == null ? "?" : render(value.booleanValue());
+    }
+
     public static String render(boolean value)
     {
         return value ? "yes" : "no";
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/common-dictionary.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/common-dictionary.js
index 27f6aaa8d1ca3d3d2161cdcd20deacd7d24f63dd..2555b754104a4a83cb4c542860ecaab68e69d2fe 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/common-dictionary.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/common-dictionary.js
@@ -382,6 +382,7 @@ var common = {
   is_dynamic: "Dynamic?",
   is_managed: "Managed?",
   is_shown_in_editor_view: "Shown in Editor View?",
+  show_raw_value: "Show Raw Value in Forms?",
   script: "Script",
   scriptable: "Handled by Script",
   unassign_button_label: "Release Assignment",