diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityVerificationInterceptor.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityVerificationInterceptor.java
index 143b8c93374356da2840b6db5097cf75c3e93427..defb5386635a0d2419db52390de60fb013fd7ac2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityVerificationInterceptor.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityVerificationInterceptor.java
@@ -188,7 +188,7 @@ public class EntityVerificationInterceptor extends EmptyInterceptor
 
     private String entityDescription(IEntityInformationWithPropertiesHolder entity)
     {
-        return entity.getEntityKind().getLabel() + " " + entity.getCode() + " ("
+        return entity.getEntityKind().getLabel() + " " + entity.getIdentifier() + " ("
                 + entity.getEntityType().getCode() + ")";
     }
 
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IEntityInformationHolderDTO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IEntityInformationHolderDTO.java
index b253685ceef7b52faec2a34feedb37078823938d..0b3e4ebcd04372518d9f84f7ecaa2ace971c4bdc 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IEntityInformationHolderDTO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IEntityInformationHolderDTO.java
@@ -17,6 +17,7 @@
 package ch.systemsx.cisd.openbis.generic.shared.dto;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.IIdAndCodeHolder;
+import ch.systemsx.cisd.openbis.generic.shared.basic.IIdentifierHolder;
 import ch.systemsx.cisd.openbis.generic.shared.basic.IPermIdHolder;
 import ch.systemsx.cisd.openbis.generic.shared.dto.properties.EntityKind;
 
@@ -25,7 +26,8 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.properties.EntityKind;
  * 
  * @author Izabela Adamczyk
  */
-public interface IEntityInformationHolderDTO extends IIdAndCodeHolder, IPermIdHolder
+public interface IEntityInformationHolderDTO extends IIdAndCodeHolder, IPermIdHolder,
+        IIdentifierHolder
 {
     /**
      * Returns the entity type of this matching entity.
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialPE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialPE.java
index e3251c4ea68a2bcd5ad382d70c32453f8e345562..12940228c73c340e2104967b15de8fab9b81884c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialPE.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialPE.java
@@ -60,6 +60,7 @@ import org.hibernate.validator.constraints.Length;
 import ch.systemsx.cisd.common.collections.UnmodifiableSetDecorator;
 import ch.systemsx.cisd.common.utilities.ModifiedShortPrefixToStringStyle;
 import ch.systemsx.cisd.openbis.generic.shared.IServer;
+import ch.systemsx.cisd.openbis.generic.shared.basic.IIdentifierHolder;
 import ch.systemsx.cisd.openbis.generic.shared.dto.hibernate.SearchFieldConstants;
 import ch.systemsx.cisd.openbis.generic.shared.dto.properties.EntityKind;
 import ch.systemsx.cisd.openbis.generic.shared.util.EqualsHashUtils;
@@ -349,6 +350,7 @@ public class MaterialPE implements IIdAndCodeHolder, Comparable<MaterialPE>,
     // IMatchingEntity
     //
 
+    @Override
     @Transient
     @Field(index = Index.NO, store = Store.YES, name = SearchFieldConstants.IDENTIFIER)
     public final String getIdentifier()