diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractEntitySearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractEntitySearchCriteria.java
index a64de5cf6e7cd0b0406e8af06992b3b23fa039ec..18ba0675437601806b712d063251faea2171183b 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractEntitySearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractEntitySearchCriteria.java
@@ -25,8 +25,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
  * @author pkupczyk
  */
 @JsonObject("as.dto.common.search.AbstractEntitySearchCriteria")
-public abstract class AbstractEntitySearchCriteria<ID extends IObjectId, TypeSearchCriteria extends EntityTypeSearchCriteria> extends
-        AbstractObjectSearchCriteria<ID>
+public abstract class AbstractEntitySearchCriteria<ID extends IObjectId> extends AbstractObjectSearchCriteria<ID>
 {
 
     private static final long serialVersionUID = 1L;
@@ -36,9 +35,9 @@ public abstract class AbstractEntitySearchCriteria<ID extends IObjectId, TypeSea
         return with(new CodeSearchCriteria());
     }
 
-    public TypeSearchCriteria withType()
+    public EntityTypeSearchCriteria withType()
     {
-        return (TypeSearchCriteria) with(new EntityTypeSearchCriteria());
+        return with(new EntityTypeSearchCriteria());
     }
 
     public PermIdSearchCriteria withPermId()
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetSearchCriteria.java
index fc5e57e3bb98e2c41d51b7fde99fcc20c1fec525..03e45448697db2270810f13040a01ea5080a94b4 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetSearchCriteria.java
@@ -20,7 +20,6 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractEntitySear
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchCriteriaToStringBuilder;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchOperator;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.id.IDataSetId;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.entitytype.search.EntityTypeSearchCriteria;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.search.ExperimentSearchCriteria;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.search.NoExperimentSearchCriteria;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.search.NoSampleSearchCriteria;
@@ -31,7 +30,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
  * @author pkupczyk
  */
 @JsonObject("as.dto.dataset.search.DataSetSearchCriteria")
-public class DataSetSearchCriteria extends AbstractEntitySearchCriteria<IDataSetId, EntityTypeSearchCriteria>
+public class DataSetSearchCriteria extends AbstractEntitySearchCriteria<IDataSetId>
 {
 
     private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/ExperimentSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/ExperimentSearchCriteria.java
index 04278dbcfc22155fcc2d0ef30c0d4e0c857fca27..a074e21f6840a6e11b9b0e32cef65bd731259dd0 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/ExperimentSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/ExperimentSearchCriteria.java
@@ -19,7 +19,6 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.search;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractEntitySearchCriteria;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchCriteriaToStringBuilder;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchOperator;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.entitytype.search.EntityTypeSearchCriteria;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.id.IExperimentId;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.project.search.ProjectSearchCriteria;
 import ch.systemsx.cisd.base.annotation.JsonObject;
@@ -28,7 +27,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
  * @author pkupczyk
  */
 @JsonObject("as.dto.experiment.search.ExperimentSearchCriteria")
-public class ExperimentSearchCriteria extends AbstractEntitySearchCriteria<IExperimentId, EntityTypeSearchCriteria>
+public class ExperimentSearchCriteria extends AbstractEntitySearchCriteria<IExperimentId>
 {
 
     private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/search/MaterialSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/search/MaterialSearchCriteria.java
index a5dbadb627adff7e31e70dcfd2a2692c166f2159..eb4d2da2b80d3c61071241bd08e4217540bc7af6 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/search/MaterialSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/search/MaterialSearchCriteria.java
@@ -19,7 +19,6 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.material.search;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractEntitySearchCriteria;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchCriteriaToStringBuilder;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchOperator;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.entitytype.search.EntityTypeSearchCriteria;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.material.id.IMaterialId;
 import ch.systemsx.cisd.base.annotation.JsonObject;
 
@@ -27,7 +26,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
  * @author pkupczyk
  */
 @JsonObject("as.dto.material.search.MaterialSearchCriteria")
-public class MaterialSearchCriteria extends AbstractEntitySearchCriteria<IMaterialId, EntityTypeSearchCriteria>
+public class MaterialSearchCriteria extends AbstractEntitySearchCriteria<IMaterialId>
 {
 
     private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleSearchCriteria.java
index ee1211bd9ffe1ae35c8305a0b27bd724382f59c5..61ce72b12ad626cf969293e7046368dda2e781c8 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleSearchCriteria.java
@@ -30,7 +30,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
  * @author pkupczyk
  */
 @JsonObject("as.dto.sample.search.SampleSearchCriteria")
-public class SampleSearchCriteria extends AbstractEntitySearchCriteria<ISampleId, SampleTypeSearchCriteria>
+public class SampleSearchCriteria extends AbstractEntitySearchCriteria<ISampleId>
 {
 
     private static final long serialVersionUID = 1L;