diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeAssignmentForm.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeAssignmentForm.java
index 40dbe75ab0f68b102bb6906e3446c58408a913f4..b9b45284afecf396fdbfc05ca5cb309e6e8d5637 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeAssignmentForm.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeAssignmentForm.java
@@ -284,7 +284,7 @@ public final class PropertyTypeAssignmentForm extends LayoutContainer
                             + propertyType.getSimpleCode());
             Field<?> field =
                     PropertyFieldFactory.createField(propertyType, false, viewContext
-                            .getMessage(Dict.DEFAULT_VALUE), fieldId, null);
+                            .getMessage(Dict.DEFAULT_VALUE), fieldId, null, viewContext);
             field.setToolTip(viewContext.getMessage(Dict.DEFAULT_VALUE_TOOLTIP));
             defaultValueField = field;
             defaultValueField.show();
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/AbstractGenericEntityEditForm.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/AbstractGenericEntityEditForm.java
index 616748c1241fbab629828c8ce19cd457e458692e..0d7e3482add5f0ff027480d9b407bf3504e3b644 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/AbstractGenericEntityEditForm.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/AbstractGenericEntityEditForm.java
@@ -26,6 +26,7 @@ import com.extjs.gxt.ui.client.widget.form.Field;
 import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.ui.Widget;
 
+import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
@@ -64,7 +65,8 @@ abstract public class AbstractGenericEntityEditForm<T extends EntityType, S exte
     abstract protected void updateCheckPageWidgets();
 
     abstract protected PropertiesEditor<T, S, P> createPropertiesEditor(
-            List<S> entityTypesPropertyTypes, List<P> properties, String string);
+            List<S> entityTypesPropertyTypes, List<P> properties, String string,
+            IViewContext<ICommonClientServiceAsync> context);
 
     public AbstractGenericEntityEditForm(final IViewContext<?> viewContext, V entity,
             boolean editMode)
@@ -75,13 +77,14 @@ abstract public class AbstractGenericEntityEditForm<T extends EntityType, S exte
         this.editMode = editMode;
         editor =
                 createPropertiesEditor(entity.getEntityTypePropertyTypes(), entity.getProperties(),
-                        createId(entity.getEntityKind(), entity.getIdentifier()));
+                        createId(entity.getEntityKind(), entity.getIdentifier()), viewContext
+                                .getCommonViewContext());
         grid = new EntityPropertyGrid<T, S, P>(viewContext, entity.getProperties());
+        checkComponents.add(grid.getWidget());
         for (Widget w : getEntitySpecificCheckPageWidgets())
         {
             checkComponents.add(w);
         }
-        checkComponents.add(grid.getWidget());
         checkComponents.add(new Button(viewContext.getMessage(Dict.BUTTON_EDIT),
                 new SelectionListener<ComponentEvent>()
                     {
@@ -109,14 +112,14 @@ abstract public class AbstractGenericEntityEditForm<T extends EntityType, S exte
 
     private final void addFormFields()
     {
-        for (final Field<?> specificField : getEntitySpecificFormFields())
-        {
-            formPanel.add(specificField);
-        }
         for (final Field<?> propertyField : editor.getPropertyFields())
         {
             formPanel.add(propertyField);
         }
+        for (final Field<?> specificField : getEntitySpecificFormFields())
+        {
+            formPanel.add(specificField);
+        }
     }
 
     protected List<P> extractProperties()
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/AbstractGenericEntityRegistrationForm.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/AbstractGenericEntityRegistrationForm.java
index ba7809c0b522a37ba702381e7feaa62bc4fdad2b..6a66ffc8b4d7534980a2f367dce5031cf6c7d415 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/AbstractGenericEntityRegistrationForm.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/AbstractGenericEntityRegistrationForm.java
@@ -22,6 +22,7 @@ import com.extjs.gxt.ui.client.widget.form.Field;
 import com.extjs.gxt.ui.client.widget.form.TextField;
 import com.google.gwt.user.client.Element;
 
+import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
@@ -57,7 +58,9 @@ abstract public class AbstractGenericEntityRegistrationForm<T extends EntityType
     {
         super(viewContext, createId(entityKind));
         this.viewContext = viewContext;
-        propertiesEditor = createPropertiesEditor(entityTypesPropertyTypes, createId(entityKind));
+        propertiesEditor =
+                createPropertiesEditor(entityTypesPropertyTypes, createId(entityKind), viewContext
+                        .getCommonViewContext());
     }
 
     abstract protected List<Field<?>> getEntitySpecificFields();
@@ -65,7 +68,8 @@ abstract public class AbstractGenericEntityRegistrationForm<T extends EntityType
     abstract protected void createEntitySpecificFields();
 
     abstract protected PropertiesEditor<T, S, P> createPropertiesEditor(
-            List<S> entityTypesPropertyTypes, String string);
+            List<S> entityTypesPropertyTypes, String string,
+            IViewContext<ICommonClientServiceAsync> context);
 
     protected static String createId(EntityKind entityKind)
     {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ExperimentPropertyEditor.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ExperimentPropertyEditor.java
index aed7743cc325736bf267bcb090f4c64257876a10..0b98cab55c99bb2f57a91f3abf97f75e1b00c54c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ExperimentPropertyEditor.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ExperimentPropertyEditor.java
@@ -18,6 +18,8 @@ package ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.ex
 
 import java.util.List;
 
+import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExperimentProperty;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExperimentType;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExperimentTypePropertyType;
@@ -27,15 +29,16 @@ public class ExperimentPropertyEditor extends
 {
 
     public ExperimentPropertyEditor(List<ExperimentTypePropertyType> entityTypesPropertyTypes,
-            List<ExperimentProperty> properties, String id)
+            List<ExperimentProperty> properties, String id,
+            IViewContext<ICommonClientServiceAsync> viewContext)
     {
-        super(id, entityTypesPropertyTypes, properties);
+        super(id, entityTypesPropertyTypes, properties, viewContext);
     }
 
     public ExperimentPropertyEditor(List<ExperimentTypePropertyType> entityTypesPropertyTypes,
-            String id)
+            String id, IViewContext<ICommonClientServiceAsync>  viewContext)
     {
-        super(id, entityTypesPropertyTypes);
+        super(id, entityTypesPropertyTypes, viewContext);
     }
 
     @Override
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentEditForm.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentEditForm.java
index 2b34211871fa20f1ad1fa949d8851d975adbb176..45d09cd9f93a2d3d2a45199203f6456c507cf6e9 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentEditForm.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentEditForm.java
@@ -28,6 +28,7 @@ import com.extjs.gxt.ui.client.widget.form.Field;
 import com.extjs.gxt.ui.client.widget.form.FileUploadField;
 import com.google.gwt.user.client.ui.Widget;
 
+import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.AbstractAsyncCallback;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.InfoBoxCallbackListener;
@@ -147,9 +148,10 @@ public final class GenericExperimentEditForm
     @Override
     protected PropertiesEditor<ExperimentType, ExperimentTypePropertyType, ExperimentProperty> createPropertiesEditor(
             List<ExperimentTypePropertyType> entityTypesPropertyTypes,
-            List<ExperimentProperty> properties, String id)
+            List<ExperimentProperty> properties, String id,
+            IViewContext<ICommonClientServiceAsync>  context)
     {
-        return new ExperimentPropertyEditor(entityTypesPropertyTypes, properties, id);
+        return new ExperimentPropertyEditor(entityTypesPropertyTypes, properties, id, context);
     }
 
     @Override
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentRegistrationForm.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentRegistrationForm.java
index 837afdd0490956b95de7141a592b1bef59cf35c9..aafe5a264ea814c60bdbd6ccd8fbf82a35d194d5 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentRegistrationForm.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentRegistrationForm.java
@@ -26,6 +26,7 @@ import com.extjs.gxt.ui.client.widget.form.Field;
 import com.extjs.gxt.ui.client.widget.form.FileUploadField;
 import com.extjs.gxt.ui.client.widget.form.TextArea;
 
+import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.AbstractAsyncCallback;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
@@ -140,7 +141,7 @@ public final class GenericExperimentRegistrationForm
     protected void createEntitySpecificFields()
     {
 
-        projectSelectionWidget = new ProjectSelectionWidget(viewContext, null, getId());
+        projectSelectionWidget = new ProjectSelectionWidget(viewContext, getId());
         FieldUtil.markAsMandatory(projectSelectionWidget);
         projectSelectionWidget.setFieldLabel(viewContext.getMessage(Dict.PROJECT));
 
@@ -226,9 +227,10 @@ public final class GenericExperimentRegistrationForm
 
     @Override
     protected PropertiesEditor<ExperimentType, ExperimentTypePropertyType, ExperimentProperty> createPropertiesEditor(
-            List<ExperimentTypePropertyType> etpt, String id)
+            List<ExperimentTypePropertyType> etpt, String id,
+            IViewContext<ICommonClientServiceAsync> context)
     {
-        return new ExperimentPropertyEditor(etpt, id);
+        return new ExperimentPropertyEditor(etpt, id, context);
     }
 
 }
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/PropertiesEditor.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/PropertiesEditor.java
index 3eaa53e446cbeaf1ae673a7ec368378ccabd2df4..1e0081e22fd6f10d43e961471a89e0f6a365d68d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/PropertiesEditor.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/PropertiesEditor.java
@@ -23,6 +23,8 @@ import java.util.Map;
 
 import com.extjs.gxt.ui.client.widget.form.Field;
 
+import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.field.PropertyFieldFactory;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityProperty;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityType;
@@ -50,22 +52,22 @@ abstract public class PropertiesEditor<T extends EntityType, S extends EntityTyp
      * Requires initial values of properties.
      */
     protected PropertiesEditor(String id, final List<S> entityTypesPropertyTypes,
-            final List<P> properties)
+            final List<P> properties, IViewContext<ICommonClientServiceAsync> viewContext)
     {
         assert properties != null : "Undefined properties.";
         this.id = id;
         this.entityTypesPropertyTypes = entityTypesPropertyTypes;
         this.initialProperties = createInitialProperties(properties);
-        this.propertyFields = createPropertyFields();
+        this.propertyFields = createPropertyFields(viewContext);
     }
 
-    private List<Field<?>> createPropertyFields()
+    private List<Field<?>> createPropertyFields(IViewContext<ICommonClientServiceAsync> viewContext)
     {
         List<Field<?>> result = new ArrayList<Field<?>>();
         for (final S stpt : entityTypesPropertyTypes)
         {
             result.add(createPropertyField(stpt, initialProperties.get(stpt.getPropertyType()
-                    .getCode())));
+                    .getCode()), viewContext));
         }
         return result;
     }
@@ -83,12 +85,14 @@ abstract public class PropertiesEditor<T extends EntityType, S extends EntityTyp
     /**
      * Does not require initial values of properties.
      */
-    public PropertiesEditor(String id, final List<S> entityTypesPropertyTypes)
+    public PropertiesEditor(String id, final List<S> entityTypesPropertyTypes,
+            IViewContext<ICommonClientServiceAsync> viewContext)
     {
-        this(id, entityTypesPropertyTypes, new ArrayList<P>());
+        this(id, entityTypesPropertyTypes, new ArrayList<P>(), viewContext);
     }
 
-    private final Field<?> createPropertyField(final S etpt, String value)
+    private final Field<?> createPropertyField(final S etpt, String value,
+            IViewContext<ICommonClientServiceAsync> viewContext)
     {
         final Field<?> field;
         final boolean isMandatory = etpt.isMandatory();
@@ -96,7 +100,7 @@ abstract public class PropertiesEditor<T extends EntityType, S extends EntityTyp
         final String propertyTypeCode = etpt.getPropertyType().getCode();
         field =
                 PropertyFieldFactory.createField(etpt.getPropertyType(), isMandatory, label,
-                        createFormFieldId(getId(), propertyTypeCode), value, null);
+                        createFormFieldId(getId(), propertyTypeCode), value, viewContext);
         field.setData(ETPT, etpt);
         field.setTitle(propertyTypeCode);
         return field;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/material/GenericMaterialEditForm.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/material/GenericMaterialEditForm.java
index 942383a1a1bedb4d21d9b7236fa340988c97e10b..c04b24b4bfa03ea58ceeda5904e45ffc3c8ee234 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/material/GenericMaterialEditForm.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/material/GenericMaterialEditForm.java
@@ -22,6 +22,7 @@ import java.util.List;
 import com.extjs.gxt.ui.client.widget.form.Field;
 import com.google.gwt.user.client.ui.Widget;
 
+import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.AbstractAsyncCallback;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.InfoBoxCallbackListener;
@@ -87,9 +88,10 @@ public final class GenericMaterialEditForm
     @Override
     protected PropertiesEditor<MaterialType, MaterialTypePropertyType, MaterialProperty> createPropertiesEditor(
             List<MaterialTypePropertyType> entityTypesPropertyTypes,
-            List<MaterialProperty> properties, String id)
+            List<MaterialProperty> properties, String id,
+            IViewContext<ICommonClientServiceAsync> context)
     {
-        return new MaterialPropertyEditor(entityTypesPropertyTypes, properties, id);
+        return new MaterialPropertyEditor(entityTypesPropertyTypes, properties, id, context);
     }
 
     @Override
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/material/MaterialPropertyEditor.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/material/MaterialPropertyEditor.java
index bdf2c71494c894cd2339354beef07712f984e443..ca658215876926d3de10e1c840c086a997a7e4b6 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/material/MaterialPropertyEditor.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/material/MaterialPropertyEditor.java
@@ -18,6 +18,8 @@ package ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.ma
 
 import java.util.List;
 
+import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.MaterialProperty;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.MaterialType;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.MaterialTypePropertyType;
@@ -28,14 +30,16 @@ public class MaterialPropertyEditor extends
 {
 
     public MaterialPropertyEditor(List<MaterialTypePropertyType> entityTypesPropertyTypes,
-            List<MaterialProperty> properties, String id)
+            List<MaterialProperty> properties, String id,
+            IViewContext<ICommonClientServiceAsync> viewContext)
     {
-        super(id, entityTypesPropertyTypes, properties);
+        super(id, entityTypesPropertyTypes, properties, viewContext);
     }
 
-    public MaterialPropertyEditor(List<MaterialTypePropertyType> entityTypesPropertyTypes, String id)
+    public MaterialPropertyEditor(List<MaterialTypePropertyType> entityTypesPropertyTypes,
+            String id, IViewContext<ICommonClientServiceAsync>  viewContext)
     {
-        super(id, entityTypesPropertyTypes);
+        super(id, entityTypesPropertyTypes, viewContext);
     }
 
     @Override
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleEditForm.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleEditForm.java
index d961792ea015f2cd0b70eadc7b9eeba338b23b88..acc964006ecb0cf5ba14a921cd479615865dc80e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleEditForm.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleEditForm.java
@@ -22,6 +22,7 @@ import java.util.List;
 import com.extjs.gxt.ui.client.widget.form.Field;
 import com.google.gwt.user.client.ui.Widget;
 
+import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.AbstractAsyncCallback;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.InfoBoxCallbackListener;
@@ -87,9 +88,9 @@ public final class GenericSampleEditForm
     @Override
     protected PropertiesEditor<SampleType, SampleTypePropertyType, SampleProperty> createPropertiesEditor(
             List<SampleTypePropertyType> entityTypesPropertyTypes, List<SampleProperty> properties,
-            String id)
+            String id, IViewContext<ICommonClientServiceAsync>  context)
     {
-        return new SamplePropertyEditor(entityTypesPropertyTypes, properties, id);
+        return new SamplePropertyEditor(entityTypesPropertyTypes, properties, id, context);
     }
 
     @Override
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleRegistrationForm.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleRegistrationForm.java
index 7221ed67cd9c71285e1d8d6ab362626018bc46e9..7fd4c349082de67343922e1afc18dfa75677860a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleRegistrationForm.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleRegistrationForm.java
@@ -22,6 +22,7 @@ import java.util.List;
 import com.extjs.gxt.ui.client.widget.form.Field;
 import com.extjs.gxt.ui.client.widget.form.TextField;
 
+import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.AbstractAsyncCallback;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
@@ -155,8 +156,9 @@ public final class GenericSampleRegistrationForm extends
 
     @Override
     protected PropertiesEditor<SampleType, SampleTypePropertyType, SampleProperty> createPropertiesEditor(
-            List<SampleTypePropertyType> entityTypesPropertyTypes, String string)
+            List<SampleTypePropertyType> entityTypesPropertyTypes, String string,
+            IViewContext<ICommonClientServiceAsync> context)
     {
-        return new SamplePropertyEditor(entityTypesPropertyTypes, string);
+        return new SamplePropertyEditor(entityTypesPropertyTypes, string, context);
     }
 }
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/SamplePropertyEditor.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/SamplePropertyEditor.java
index e4c1f66a7c139a1c3949b90ad93bee7e1f939996..7f42a1e3cb439c8f312ac9001c99ce95a287f8df 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/SamplePropertyEditor.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/SamplePropertyEditor.java
@@ -18,6 +18,8 @@ package ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.sa
 
 import java.util.List;
 
+import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.SampleProperty;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.SampleType;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.SampleTypePropertyType;
@@ -28,14 +30,16 @@ public class SamplePropertyEditor extends
 {
 
     public SamplePropertyEditor(List<SampleTypePropertyType> entityTypesPropertyTypes,
-            List<SampleProperty> properties, String id)
+            List<SampleProperty> properties, String id,
+            IViewContext<ICommonClientServiceAsync> viewContext)
     {
-        super(id, entityTypesPropertyTypes, properties);
+        super(id, entityTypesPropertyTypes, properties, viewContext);
     }
 
-    public SamplePropertyEditor(List<SampleTypePropertyType> entityTypesPropertyTypes, String id)
+    public SamplePropertyEditor(List<SampleTypePropertyType> entityTypesPropertyTypes, String id,
+            IViewContext<ICommonClientServiceAsync>  viewContext)
     {
-        super(id, entityTypesPropertyTypes);
+        super(id, entityTypesPropertyTypes, viewContext);
     }
 
     @Override