diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/renderer/VocabularyPropertyColRenderer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/renderer/VocabularyPropertyColRenderer.java
index 2ed94de9d090f7004f9354aa1b8cdc9595805409..38ad9ab99bd8a8643381a5fd68be1dfb96927bef 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/renderer/VocabularyPropertyColRenderer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/renderer/VocabularyPropertyColRenderer.java
@@ -73,6 +73,12 @@ public class VocabularyPropertyColRenderer<T extends IEntityPropertiesHolder> ex
     {
         final String code = term.getCode();
         final String label = term.getLabel();
-        return (label != null ? label + " " : "") + "[" + code + "]";
+        if (label == null)
+        {
+            return code;
+        } else
+        {
+            return label + " [" + code + "]";
+        }
     }
 }
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTerm.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTerm.java
index d3e2a114f35aed87e4f1dd1f2a9bde307a308698..638b88db94af6dd43ad59d99c7ab3ade81b4f4e6 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTerm.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTerm.java
@@ -82,7 +82,13 @@ public final class VocabularyTerm extends CodeWithRegistration<Vocabulary> imple
     @Override
     public String toString()
     {
-        return (getLabel() != null ? getLabel() + " " : "") + "[" + getCode() + "]";
+        if (label == null)
+        {
+            return getCode();
+        } else
+        {
+            return label + " [" + getCode() + "]";
+        }
     }
 
     public String getUrl()