diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/VocabularyTermModel.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/VocabularyTermModel.java
index a43f2d289b6481e0db229469e104f778ef7cd45d..95d4a0ad2caa9792c614cef3e35c944b2fa28416 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/VocabularyTermModel.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/VocabularyTermModel.java
@@ -49,12 +49,12 @@ public class VocabularyTermModel extends SimplifiedBaseModel implements
         set(ORDINAL, term.getOrdinal());
         set(IS_OFFICIAL, term.isOfficial());
         set(ModelDataPropertyNames.CODE_WITH_LABEL, term.getCodeOrLabel());
-        set(DISPLAY_FIELD, generateDisplatField(term));
+        set(DISPLAY_FIELD, generateDisplayField(term));
         set(ModelDataPropertyNames.TOOLTIP, VocabularyPropertyColRenderer.renderAsTooltip(term));
         set(ModelDataPropertyNames.OBJECT, term);
     }
 
-    public String generateDisplatField(VocabularyTerm term)
+    public String generateDisplayField(VocabularyTerm term)
     {
         final Element span = DOM.createSpan();
         if (false == term.isOfficial())
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/VocabularyTermSelectionWidget.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/VocabularyTermSelectionWidget.java
index 85d63c1a7316c576fb21f32d089fc373fb11a7e0..b3f83432057c1346c67e285934b5d822c5311c04 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/VocabularyTermSelectionWidget.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/VocabularyTermSelectionWidget.java
@@ -92,6 +92,7 @@ public class VocabularyTermSelectionWidget extends
         {
             long result = 0l;
 
+            // WORKAROUND for some strange reason getStore().getModels() returns empty list
             for (VocabularyTermModel term : VocabularyTermSelectionWidget.this.store.getModels())
             {
                 if (term.getTerm().getOrdinal() > result)
@@ -232,7 +233,7 @@ public class VocabularyTermSelectionWidget extends
         final List<VocabularyTermModel> models = new ArrayList<VocabularyTermModel>();
         models.addAll(convertItems(terms));
         updateStore(models);
-        getPropertyEditor().setList(store.getModels());
+        getPropertyEditor().setList(store.getModels()); // see workaround description above
         selectInitialValue();
     }
 
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/WebClientConfigurationProvider.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/WebClientConfigurationProvider.java
index b9c69af4c09179d2104dbc9a35acbd9e488565d8..82112d7ecf9dea6c24e95ee352c5f63d846d2c0d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/WebClientConfigurationProvider.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/WebClientConfigurationProvider.java
@@ -217,7 +217,8 @@ public class WebClientConfigurationProvider
 
     private boolean extractAllowAddingUnofficialTerms(Properties properties)
     {
-        return PropertyUtils.getBoolean(properties, ALLOW_ADDING_UNOFFICIAL_TERMS, false);
+        return PropertyUtils.getBoolean(properties, ALLOW_ADDING_UNOFFICIAL_TERMS,
+                DEFAULT_ALLOW_ADDING_UNOFFICIAL_TERMS);
     }
 
     public WebClientConfiguration getWebClientConfiguration()