diff --git a/lib/taskana-core/src/main/java/pro/taskana/ClassificationQuery.java b/lib/taskana-core/src/main/java/pro/taskana/ClassificationQuery.java
index 7138c2241..e516a4600 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/ClassificationQuery.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/ClassificationQuery.java
@@ -14,7 +14,7 @@ public interface ClassificationQuery extends BaseQuery<ClassificationSummary> {
      *            as String
      * @return the query
      */
-    ClassificationQuery key(String... key);
+    ClassificationQuery keyIn(String... key);
 
     /**
      * Add your parentClassificationKey to your query.
@@ -23,7 +23,7 @@ public interface ClassificationQuery extends BaseQuery<ClassificationSummary> {
      *            as String
      * @return the query
      */
-    ClassificationQuery parentClassificationKey(String... parentClassificationKey);
+    ClassificationQuery parentClassificationKeyIn(String... parentClassificationKey);
 
     /**
      * Add your category to your query.
@@ -32,7 +32,7 @@ public interface ClassificationQuery extends BaseQuery<ClassificationSummary> {
      *            as String
      * @return the query
      */
-    ClassificationQuery category(String... category);
+    ClassificationQuery categoryIn(String... category);
 
     /**
      * Add your type to your query.
@@ -41,7 +41,7 @@ public interface ClassificationQuery extends BaseQuery<ClassificationSummary> {
      *            as String
      * @return the query
      */
-    ClassificationQuery type(String... type);
+    ClassificationQuery typeIn(String... type);
 
     /**
      * Add your domains to your query which are used as filter.
@@ -50,7 +50,7 @@ public interface ClassificationQuery extends BaseQuery<ClassificationSummary> {
      *            or domains for filtering.
      * @return the query
      */
-    ClassificationQuery domain(String... domain);
+    ClassificationQuery domainIn(String... domain);
 
     /**
      * Add to your query if the Classification shall be valid in its domain.
@@ -73,21 +73,30 @@ public interface ClassificationQuery extends BaseQuery<ClassificationSummary> {
     /**
      * Add your name to your query.
      *
-     * @param name
+     * @param nameIn
      *            as String
      * @return the query
      */
-    ClassificationQuery name(String... name);
+    ClassificationQuery nameIn(String... nameIn);
 
     /**
-     * Add your description to your query. It will be compared in SQL with an LIKE. If you use a wildcard like % tehn it
+     * Add your name to your query. It will be compared in SQL with an LIKE.
+     *
+     * @param nameLike
+     *            as String
+     * @return the query
+     */
+    ClassificationQuery nameLike(String... nameLike);
+
+    /**
+     * Add your description to your query. It will be compared in SQL with an LIKE. If you use a wildcard like % then it
      * will be transmitted to the database.
      *
-     * @param description
+     * @param descriptionLike
      *            your description
      * @return the query
      */
-    ClassificationQuery descriptionLike(String description);
+    ClassificationQuery descriptionLike(String descriptionLike);
 
     /**
      * Add your priority to your query.
@@ -101,27 +110,180 @@ public interface ClassificationQuery extends BaseQuery<ClassificationSummary> {
     /**
      * Add your serviceLevel to your query.
      *
-     * @param serviceLevel
+     * @param serviceLevelIn
      *            as String
      * @return the query
      */
-    ClassificationQuery serviceLevel(String... serviceLevel);
+    ClassificationQuery serviceLevelIn(String... serviceLevelIn);
+
+    /**
+     * Add your serviceLevel to your query. It will be compared in SQL with an LIKE.
+     *
+     * @param serviceLevelLike
+     *            as String
+     * @return the query
+     */
+    ClassificationQuery serviceLevelLike(String... serviceLevelLike);
 
     /**
      * Add your applicationEntryPoint to your query.
      *
-     * @param applicationEntryPoint
+     * @param applicationEntryPointIn
      *            name of the applications entrypoint
      * @return the query
      */
-    ClassificationQuery applicationEntryPoint(String... applicationEntryPoint);
+    ClassificationQuery applicationEntryPointIn(String... applicationEntryPointIn);
 
     /**
-     * Add your customFields to your query.
+     * Add your applicationEntryPoint to your query. It will be compared in SQL with an LIKE.
      *
-     * @param customFields
-     *            filtering the content of all custom attributes
+     * @param applicationEntryPointLike
+     *            name of the applications entrypoint
      * @return the query
      */
-    ClassificationQuery customFields(String... customFields);
+    ClassificationQuery applicationEntryPointLike(String... applicationEntryPointLike);
+
+    /**
+     * Add custom1 to your query.
+     *
+     * @param custom1In
+     *            filter for custom1
+     * @return the query
+     */
+    ClassificationQuery custom1In(String... custom1In);
+
+    /**
+     * Add custom1 to your query.
+     *
+     * @param custom1Like
+     *            filter for custom1 with a LIKE-query
+     * @return the query
+     */
+    ClassificationQuery custom1Like(String... custom1Like);
+
+    /**
+     * Add custom2 to your query.
+     *
+     * @param custom2In
+     *            filter for custom2
+     * @return the query
+     */
+    ClassificationQuery custom2In(String... custom2In);
+
+    /**
+     * Add custom2 to your query.
+     *
+     * @param custom2Like
+     *            filter for custom2 with a LIKE-query
+     * @return the query
+     */
+    ClassificationQuery custom2Like(String... custom2Like);
+
+    /**
+     * Add custom3 to your query.
+     *
+     * @param custom3In
+     *            filter for custom3
+     * @return the query
+     */
+    ClassificationQuery custom3In(String... custom3In);
+
+    /**
+     * Add custom3 to your query.
+     *
+     * @param custom3Like
+     *            filter for custom3 with a LIKE-query
+     * @return the query
+     */
+    ClassificationQuery custom3Like(String... custom3Like);
+
+    /**
+     * Add custom4 to your query.
+     *
+     * @param custom4In
+     *            filter for custom4
+     * @return the query
+     */
+    ClassificationQuery custom4In(String... custom4In);
+
+    /**
+     * Add custom4 to your query.
+     *
+     * @param custom4Like
+     *            filter for custom4 with a LIKE-query
+     * @return the query
+     */
+    ClassificationQuery custom4Like(String... custom4Like);
+
+    /**
+     * Add custom5 to your query.
+     *
+     * @param custom5In
+     *            filter for custom5
+     * @return the query
+     */
+    ClassificationQuery custom5In(String... custom5In);
+
+    /**
+     * Add custom5 to your query.
+     *
+     * @param custom5Like
+     *            filter for custom5 with a LIKE-query
+     * @return the query
+     */
+    ClassificationQuery custom5Like(String... custom5Like);
+
+    /**
+     * Add custom6 to your query.
+     *
+     * @param custom6In
+     *            filter for custom6
+     * @return the query
+     */
+    ClassificationQuery custom6In(String... custom6In);
+
+    /**
+     * Add custom6 to your query.
+     *
+     * @param custom6Like
+     *            filter for custom6 with a LIKE-query
+     * @return the query
+     */
+    ClassificationQuery custom6Like(String... custom6Like);
+
+    /**
+     * Add custom7 to your query.
+     *
+     * @param custom7In
+     *            filter for custom7
+     * @return the query
+     */
+    ClassificationQuery custom7In(String... custom7In);
+
+    /**
+     * Add custom7 to your query.
+     *
+     * @param custom7Like
+     *            filter for custom7 with a LIKE-query
+     * @return the query
+     */
+    ClassificationQuery custom7Like(String... custom7Like);
+
+    /**
+     * Add custom8 to your query.
+     *
+     * @param custom8In
+     *            filter for custom8
+     * @return the query
+     */
+    ClassificationQuery custom8In(String... custom8In);
+
+    /**
+     * Add custom8 to your query.
+     *
+     * @param custom8Like
+     *            filter for custom8 with a LIKE-query
+     * @return the query
+     */
+    ClassificationQuery custom8Like(String... custom8Like);
 }
diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationQueryImpl.java
index 5326ef06c..cc8fae0da 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationQueryImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationQueryImpl.java
@@ -34,43 +34,61 @@ public class ClassificationQueryImpl implements ClassificationQuery {
     private String[] domain;
     private Boolean validInDomain;
     private Instant[] created;
-    private String[] name;
+    private String[] nameIn;
+    private String[] nameLike;
     private String description;
     private int[] priority;
-    private String[] serviceLevel;
-    private String[] customFields;
-    private String[] applicationEntryPoint;
+    private String[] serviceLevelIn;
+    private String[] serviceLevelLike;
+    private String[] applicationEntryPointIn;
+    private String[] applicationEntryPointLike;
+    private String[] custom1In;
+    private String[] custom1Like;
+    private String[] custom2In;
+    private String[] custom2Like;
+    private String[] custom3In;
+    private String[] custom3Like;
+    private String[] custom4In;
+    private String[] custom4Like;
+    private String[] custom5In;
+    private String[] custom5Like;
+    private String[] custom6In;
+    private String[] custom6Like;
+    private String[] custom7In;
+    private String[] custom7Like;
+    private String[] custom8In;
+    private String[] custom8Like;
 
     public ClassificationQueryImpl(TaskanaEngine taskanaEngine) {
         this.taskanaEngineImpl = (TaskanaEngineImpl) taskanaEngine;
     }
 
     @Override
-    public ClassificationQuery key(String... key) {
+    public ClassificationQuery keyIn(String... key) {
         this.key = key;
         return this;
     }
 
     @Override
-    public ClassificationQuery parentClassificationKey(String... parentClassificationKey) {
+    public ClassificationQuery parentClassificationKeyIn(String... parentClassificationKey) {
         this.parentClassificationKey = parentClassificationKey;
         return this;
     }
 
     @Override
-    public ClassificationQuery category(String... category) {
+    public ClassificationQuery categoryIn(String... category) {
         this.category = category;
         return this;
     }
 
     @Override
-    public ClassificationQuery type(String... type) {
+    public ClassificationQuery typeIn(String... type) {
         this.type = type;
         return this;
     }
 
     @Override
-    public ClassificationQuery domain(String... domain) {
+    public ClassificationQuery domainIn(String... domain) {
         this.domain = domain;
         return this;
     }
@@ -88,8 +106,14 @@ public class ClassificationQueryImpl implements ClassificationQuery {
     }
 
     @Override
-    public ClassificationQuery name(String... name) {
-        this.name = name;
+    public ClassificationQuery nameIn(String... nameIn) {
+        this.nameIn = nameIn;
+        return this;
+    }
+
+    @Override
+    public ClassificationQuery nameLike(String... nameLike) {
+        this.nameLike = nameLike;
         return this;
     }
 
@@ -106,20 +130,122 @@ public class ClassificationQueryImpl implements ClassificationQuery {
     }
 
     @Override
-    public ClassificationQuery serviceLevel(String... serviceLevel) {
-        this.serviceLevel = serviceLevel;
+    public ClassificationQuery serviceLevelIn(String... serviceLevelIn) {
+        this.serviceLevelIn = serviceLevelIn;
         return this;
     }
 
     @Override
-    public ClassificationQuery applicationEntryPoint(String... applicationEntryPoint) {
-        this.applicationEntryPoint = applicationEntryPoint;
+    public ClassificationQuery serviceLevelLike(String... serviceLevelLike) {
+        this.serviceLevelLike = serviceLevelLike;
         return this;
     }
 
     @Override
-    public ClassificationQuery customFields(String... customFields) {
-        this.customFields = customFields;
+    public ClassificationQuery applicationEntryPointIn(String... applicationEntryPointIn) {
+        this.applicationEntryPointIn = applicationEntryPointIn;
+        return this;
+    }
+
+    @Override
+    public ClassificationQuery applicationEntryPointLike(String... applicationEntryPointLike) {
+        this.applicationEntryPointLike = applicationEntryPointLike;
+        return this;
+    }
+
+    @Override
+    public ClassificationQuery custom1In(String... custom1In) {
+        this.custom1In = custom1In;
+        return this;
+    }
+
+   @Override
+    public ClassificationQuery custom1Like(String... custom1Like) {
+        this.custom1Like = custom1Like;
+        return this;
+    }
+
+    @Override
+    public ClassificationQuery custom2In(String... custom2In) {
+        this.custom2In = custom2In;
+        return this;
+    }
+
+    @Override
+    public ClassificationQuery custom2Like(String... custom2Like) {
+        this.custom2Like = custom2Like;
+        return this;
+    }
+
+    @Override
+    public ClassificationQuery custom3In(String... custom3In) {
+        this.custom3In = custom3In;
+        return this;
+    }
+
+    @Override
+    public ClassificationQuery custom3Like(String... custom3Like) {
+        this.custom3Like = custom3Like;
+        return this;
+    }
+
+    @Override
+    public ClassificationQuery custom4In(String... custom4In) {
+        this.custom4In = custom4In;
+        return this;
+    }
+
+    @Override
+    public ClassificationQuery custom4Like(String... custom4Like) {
+        this.custom4Like = custom4Like;
+        return this;
+    }
+
+    @Override
+    public ClassificationQuery custom5In(String... custom5In) {
+        this.custom5In = custom5In;
+        return this;
+    }
+
+    @Override
+    public ClassificationQuery custom5Like(String... custom5Like) {
+        this.custom5Like = custom5Like;
+        return this;
+    }
+
+    @Override
+    public ClassificationQuery custom6In(String... custom6In) {
+        this.custom6In = custom6In;
+        return this;
+    }
+
+    @Override
+    public ClassificationQuery custom6Like(String... custom6Like) {
+        this.custom6Like = custom6Like;
+        return this;
+    }
+
+    @Override
+    public ClassificationQuery custom7In(String... custom7In) {
+        this.custom7In = custom7In;
+        return this;
+    }
+
+    @Override
+    public ClassificationQuery custom7Like(String... custom7Like) {
+        this.custom7Like = custom7Like;
+        return this;
+    }
+
+    @Override
+    public ClassificationQuery custom8In(String... custom8In) {
+        this.custom8In = custom8In;
+        return this;
+    }
+
+    @Override
+    public ClassificationQuery custom8Like(String... custom8Like) {
+        this.custom8Like = custom8Like;
         return this;
     }
 
@@ -216,19 +342,27 @@ public class ClassificationQueryImpl implements ClassificationQuery {
         this.type = type;
     }
 
-    public String[] getName() {
-        return name;
+    public String[] getNameIn() {
+        return nameIn;
     }
 
-    public void setName(String[] name) {
-        this.name = name;
+    public void setNameIn(String[] nameIn) {
+        this.nameIn = nameIn;
     }
 
-    public String getDescription() {
+    public String[] getNameLike() {
+        return nameLike;
+    }
+
+    public void setNameLike(String[] nameLike) {
+        this.nameLike = nameLike;
+    }
+
+    public String getDescriptionLike() {
         return description;
     }
 
-    public void setDescription(String description) {
+    public void setDescriptionLike(String description) {
         this.description = description;
     }
 
@@ -240,12 +374,20 @@ public class ClassificationQueryImpl implements ClassificationQuery {
         this.priority = priority;
     }
 
-    public String[] getServiceLevel() {
-        return serviceLevel;
+    public String[] getServiceLevelIn() {
+        return serviceLevelIn;
     }
 
-    public void setServiceLevel(String[] serviceLevel) {
-        this.serviceLevel = serviceLevel;
+    public void setServiceLevelIn(String[] serviceLevel) {
+        this.serviceLevelIn = serviceLevel;
+    }
+
+    public String[] getServiceLevelLike() {
+        return serviceLevelLike;
+    }
+
+    public void setServiceLevelLike(String[] serviceLevelLike) {
+        this.serviceLevelLike = serviceLevelLike;
     }
 
     public String[] getDomain() {
@@ -272,20 +414,148 @@ public class ClassificationQueryImpl implements ClassificationQuery {
         this.created = created;
     }
 
-    public String[] getApplicationEntryPoint() {
-        return applicationEntryPoint;
+    public String[] getApplicationEntryPointIn() {
+        return applicationEntryPointIn;
     }
 
-    public void setApplicationEntryPoint(String[] applicationEntryPoint) {
-        this.applicationEntryPoint = applicationEntryPoint;
+    public void setApplicationEntryPointIn(String[] applicationEntryPoint) {
+        this.applicationEntryPointIn = applicationEntryPoint;
     }
 
-    public String[] getCustomFields() {
-        return customFields;
+    public String[] getApplicationEntryPointLike() {
+        return applicationEntryPointLike;
     }
 
-    public void setCustomFields(String[] customFields) {
-        this.customFields = customFields;
+    public void setApplicationEntryPointLike(String[] applicationEntryPoint) {
+        this.applicationEntryPointLike = applicationEntryPoint;
+    }
+
+    public String[] getCustom1In() {
+        return custom1In;
+    }
+
+    public void setCustom1In(String[] custom1In) {
+        this.custom1In = custom1In;
+    }
+
+    public String[] getCustom1Like() {
+        return custom1Like;
+    }
+
+    public void setCustom1Like(String[] custom1Like) {
+        this.custom1Like = custom1Like;
+    }
+
+    public String[] getCustom2In() {
+        return custom2In;
+    }
+
+    public void setCustom2In(String[] custom2In) {
+        this.custom2In = custom2In;
+    }
+
+    public String[] getCustom2Like() {
+        return custom2Like;
+    }
+
+    public void setCustom2Like(String[] custom2Like) {
+        this.custom2Like = custom2Like;
+    }
+
+    public String[] getCustom3In() {
+        return custom3In;
+    }
+
+    public void setCustom3In(String[] custom3In) {
+        this.custom3In = custom3In;
+    }
+
+    public String[] getCustom3Like() {
+        return custom3Like;
+    }
+
+    public void setCustom3Like(String[] custom3Like) {
+        this.custom3Like = custom3Like;
+    }
+
+    public String[] getCustom4In() {
+        return custom4In;
+    }
+
+    public void setCustom4In(String[] custom4In) {
+        this.custom4In = custom4In;
+    }
+
+    public String[] getCustom4Like() {
+        return custom4Like;
+    }
+
+    public void setCustom4Like(String[] custom4Like) {
+        this.custom4Like = custom4Like;
+    }
+
+    public String[] getCustom5In() {
+        return custom5In;
+    }
+
+    public void setCustom5In(String[] custom5In) {
+        this.custom5In = custom5In;
+    }
+
+    public String[] getCustom5Like() {
+        return custom5Like;
+    }
+
+    public void setCustom5Like(String[] custom5Like) {
+        this.custom5Like = custom5Like;
+    }
+
+    public String[] getCustom6In() {
+        return custom6In;
+    }
+
+    public void setCustom6In(String[] custom6In) {
+        this.custom6In = custom6In;
+    }
+
+    public String[] getCustom6Like() {
+        return custom6Like;
+    }
+
+    public void setCustom6Like(String[] custom6Like) {
+        this.custom6Like = custom6Like;
+    }
+
+    public String[] getCustom7In() {
+        return custom7In;
+    }
+
+    public void setCustom7In(String[] custom7In) {
+        this.custom7In = custom7In;
+    }
+
+    public String[] getCustom7Like() {
+        return custom7Like;
+    }
+
+    public void setCustom7Like(String[] custom7Like) {
+        this.custom7Like = custom7Like;
+    }
+
+    public String[] getCustom8In() {
+        return custom8In;
+    }
+
+    public void setCustom8In(String[] custom8In) {
+        this.custom8In = custom8In;
+    }
+
+    public String[] getCustom8Like() {
+        return custom8Like;
+    }
+
+    public void setCustom8Like(String[] custom8Like) {
+        this.custom8Like = custom8Like;
     }
 
     @Override
@@ -319,16 +589,54 @@ public class ClassificationQueryImpl implements ClassificationQuery {
         builder.append(validInDomain);
         builder.append(", created=");
         builder.append(Arrays.toString(created));
-        builder.append(", name=");
-        builder.append(Arrays.toString(name));
-        builder.append(", description=");
+        builder.append(", nameIn=");
+        builder.append(Arrays.toString(nameIn));
+        builder.append(", nameLike=");
+        builder.append(Arrays.toString(nameLike));
+        builder.append(", descriptionLike=");
         builder.append(description);
         builder.append(", priority=");
         builder.append(Arrays.toString(priority));
-        builder.append(", serviceLevel=");
-        builder.append(Arrays.toString(serviceLevel));
-        builder.append(", customFields=");
-        builder.append(Arrays.toString(customFields));
+        builder.append(", serviceLevelIn=");
+        builder.append(Arrays.toString(serviceLevelIn));
+        builder.append(", serviceLevelLike=");
+        builder.append(Arrays.toString(serviceLevelLike));
+        builder.append(", applicationEntryPointIn=");
+        builder.append(Arrays.toString(applicationEntryPointIn));
+        builder.append(", applicationEntryPointLike=");
+        builder.append(Arrays.toString(applicationEntryPointLike));
+        builder.append(", custom1In=");
+        builder.append(Arrays.toString(custom1In));
+        builder.append(", custom1Like=");
+        builder.append(Arrays.toString(custom1Like));
+        builder.append(", custom2In=");
+        builder.append(Arrays.toString(custom2In));
+        builder.append(", custom2Like=");
+        builder.append(Arrays.toString(custom2Like));
+        builder.append(", custom3In=");
+        builder.append(Arrays.toString(custom3In));
+        builder.append(", custom3Like=");
+        builder.append(Arrays.toString(custom3Like));
+        builder.append(", custom4In=");
+        builder.append(Arrays.toString(custom4In));
+        builder.append(", custom4Like=");
+        builder.append(Arrays.toString(custom4Like));
+        builder.append(", custom5In=");
+        builder.append(Arrays.toString(custom5In));
+        builder.append(", custom5Like=");
+        builder.append(Arrays.toString(custom5Like));
+        builder.append(", custom6In=");
+        builder.append(Arrays.toString(custom6In));
+        builder.append(", custom6Like=");
+        builder.append(Arrays.toString(custom6Like));
+        builder.append(", custom7In=");
+        builder.append(Arrays.toString(custom7In));
+        builder.append(", custom7Like=");
+        builder.append(Arrays.toString(custom7Like));
+        builder.append(", custom8In=");
+        builder.append(Arrays.toString(custom8In));
+        builder.append(", custom8Like=");
+        builder.append(Arrays.toString(custom8Like));
         builder.append("]");
         return builder.toString();
     }
diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationServiceImpl.java
index a09f89e2e..a6d10a79a 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationServiceImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationServiceImpl.java
@@ -46,7 +46,7 @@ public class ClassificationServiceImpl implements ClassificationService {
         try {
             taskanaEngineImpl.openConnection();
             rootClassificationSumamries = this.createClassificationQuery()
-                .parentClassificationKey("")
+                .parentClassificationKeyIn("")
                 .list();
             rootClassificationSumamries = this.populateChildClassifications(rootClassificationSumamries);
             return rootClassificationSumamries;
@@ -73,7 +73,7 @@ public class ClassificationServiceImpl implements ClassificationService {
             List<ClassificationSummary> children = new ArrayList<>();
             for (ClassificationSummary classification : classificationSumamries) {
                 List<ClassificationSummary> childClassifications = this.createClassificationQuery()
-                    .parentClassificationKey(classification.getKey())
+                    .parentClassificationKeyIn(classification.getKey())
                     .list();
                 children.addAll(populateChildClassifications(childClassifications));
             }
diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java
index 7ccadf9bd..a80ab79e2 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java
@@ -639,8 +639,8 @@ public class TaskServiceImpl implements TaskService {
         LOGGER.debug("getClassificationsForTasksAndAttachments() about to query classifications and exit");
         // perform classification query
         return this.classificationService.createClassificationQuery()
-            .domain(classificationDomainArray)
-            .key(classificationKeyArray)
+            .domainIn(classificationDomainArray)
+            .keyIn(classificationKeyArray)
             .list();
     }
 
diff --git a/lib/taskana-core/src/main/java/pro/taskana/model/mappings/QueryMapper.java b/lib/taskana-core/src/main/java/pro/taskana/model/mappings/QueryMapper.java
index 3554b14ce..1800f711b 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/model/mappings/QueryMapper.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/model/mappings/QueryMapper.java
@@ -100,12 +100,30 @@ public interface QueryMapper {
         + "<if test='domain != null'>AND DOMAIN IN(<foreach item='item' collection='domain' separator=',' >#{item}</foreach>)</if> "
         + "<if test='validInDomain != null'>AND VALID_IN_DOMAIN = #{validInDomain}</if> "
         + "<if test='created != null'>AND CREATED IN(<foreach item='item' collection='created' separator=',' >SUBSTRING(#{item}, 1, 10)</foreach>)</if> "
-        + "<if test='name != null'>AND NAME IN(<foreach item='item' collection='name' separator=',' >#{item}</foreach>)</if> "
-        + "<if test='description != null'>AND DESCRIPTION like #{description}</if> "
+        + "<if test='nameIn != null'>AND NAME IN(<foreach item='item' collection='nameIn' separator=',' >#{item}</foreach>)</if> "
+        + "<if test='nameLike != null'>AND (<foreach item='item' collection='nameLike' separator=' OR '>NAME LIKE #{item}</foreach>)</if> "
+        + "<if test='descriptionLike != null'>AND DESCRIPTION like #{descriptionLike}</if> "
         + "<if test='priority != null'>AND PRIORITY IN(<foreach item='item' collection='priority' separator=',' >#{item}</foreach>)</if> "
-        + "<if test='serviceLevel != null'>AND SERVICE_LEVEL IN(<foreach item='item' collection='serviceLevel' separator=',' >#{item}</foreach>)</if> "
-        + "<if test='applicationEntryPoint != null'>AND APPLICATION_ENTRY_POINT IN(<foreach item='item' collection='applicationEntryPoint' separator=',' >#{item}</foreach>)</if> "
-        + "<if test='customFields != null'>AND (CUSTOM_1 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR CUSTOM_2 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR CUSTOM_3 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR CUSTOM_4 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR CUSTOM_5 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR CUSTOM_6 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR CUSTOM_7 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR CUSTOM_8 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>))</if> "
+        + "<if test='serviceLevelIn != null'>AND SERVICE_LEVEL IN(<foreach item='item' collection='serviceLevelIn' separator=',' >#{item}</foreach>)</if> "
+        + "<if test='serviceLevelLike != null'>AND (<foreach item='item' collection='serviceLevelLike' separator=' OR ' >SERVICE_LEVEL LIKE #{item}</foreach>)</if> "
+        + "<if test='applicationEntryPointIn != null'>AND APPLICATION_ENTRY_POINT IN(<foreach item='item' collection='applicationEntryPoint' separator=',' >#{item}</foreach>)</if> "
+        + "<if test='applicationEntryPointLike != null'>AND (<foreach item='item' collection='applicationEntryPointLike' separator=' OR ' >APPLICATION_ENTRY_POINT LIKE #{item}</foreach>)</if> "
+        + "<if test='custom1In != null'>AND CUSTOM_1 IN(<foreach item='item' collection='custom1In' separator=',' >#{item}</foreach>) </if> "
+        + "<if test='custom1Like != null'>AND (<foreach item='item' collection='custom1Like' separator=' OR ' >CUSTOM_1 LIKE #{item}</foreach>)</if> "
+        + "<if test='custom2In != null'>AND CUSTOM_2 IN(<foreach item='item' collection='custom2In' separator=',' >#{item}</foreach>) </if> "
+        + "<if test='custom2Like != null'>AND (<foreach item='item' collection='custom2Like' separator=' OR ' > CUSTOM_2 LIKE #{item}</foreach>)</if> "
+        + "<if test='custom3In != null'>AND CUSTOM_3 IN(<foreach item='item' collection='custom3In' separator=',' >#{item}</foreach>) </if> "
+        + "<if test='custom3Like != null'>AND (<foreach item='item' collection='custom3Like' separator=' OR ' > CUSTOM_3 LIKE #{item}</foreach>)</if> "
+        + "<if test='custom4In != null'>AND CUSTOM_4 IN(<foreach item='item' collection='custom4In' separator=',' >#{item}</foreach>) </if> "
+        + "<if test='custom4Like != null'>AND (<foreach item='item' collection='custom4Like' separator=' OR ' > CUSTOM_4 LIKE #{item}</foreach>)</if> "
+        + "<if test='custom5In != null'>AND CUSTOM_5 IN(<foreach item='item' collection='custom5In' separator=',' >#{item}</foreach>) </if> "
+        + "<if test='custom5Like != null'>AND (<foreach item='item' collection='custom5Like' separator=' OR ' > CUSTOM_5 LIKE #{item}</foreach>)</if> "
+        + "<if test='custom6In != null'>AND CUSTOM_6 IN(<foreach item='item' collection='custom6In' separator=',' >#{item}</foreach>) </if> "
+        + "<if test='custom6Like != null'>AND (<foreach item='item' collection='custom6Like' separator=' OR ' > CUSTOM_6 LIKE #{item}</foreach>)</if> "
+        + "<if test='custom7In != null'>AND CUSTOM_7 IN(<foreach item='item' collection='custom7In' separator=',' >#{item}</foreach>) </if> "
+        + "<if test='custom7Like != null'>AND (<foreach item='item' collection='custom7Like' separator=' OR ' > CUSTOM_7 LIKE #{item}</foreach>)</if> "
+        + "<if test='custom8In != null'>AND CUSTOM_8 IN(<foreach item='item' collection='custom8In' separator=',' >#{item}</foreach>) </if> "
+        + "<if test='custom8Like != null'>AND (<foreach item='item' collection='custom8Like' separator=' OR ' > CUSTOM_8 LIKE #{item}</foreach>)</if> "
         + "</where>"
         + "</script>")
     @Results({@Result(property = "id", column = "ID"),
@@ -225,12 +243,30 @@ public interface QueryMapper {
         + "<if test='domain != null'>AND DOMAIN IN(<foreach item='item' collection='domain' separator=',' >#{item}</foreach>)</if> "
         + "<if test='validInDomain != null'>AND VALID_IN_DOMAIN = #{validInDomain}</if> "
         + "<if test='created != null'>AND CREATED IN(<foreach item='item' collection='created' separator=',' >SUBSTRING(#{item}, 1, 10)</foreach>)</if> "
-        + "<if test='name != null'>AND NAME IN(<foreach item='item' collection='name' separator=',' >#{item}</foreach>)</if> "
-        + "<if test='description != null'>AND DESCRIPTION like #{description}</if> "
+        + "<if test='nameIn != null'>AND NAME IN(<foreach item='item' collection='nameIn' separator=',' >#{item}</foreach>)</if> "
+        + "<if test='nameLike != null'>AND (<foreach item='item' collection='nameLike' separator=' OR '>NAME LIKE #{item}</foreach>)</if> "
+        + "<if test='descriptionLike != null'>AND DESCRIPTION like #{descriptionLike}</if> "
         + "<if test='priority != null'>AND PRIORITY IN(<foreach item='item' collection='priority' separator=',' >#{item}</foreach>)</if> "
-        + "<if test='serviceLevel != null'>AND SERVICE_LEVEL IN(<foreach item='item' collection='serviceLevel' separator=',' >#{item}</foreach>)</if> "
-        + "<if test='applicationEntryPoint != null'>AND APPLICATION_ENTRY_POINT IN(<foreach item='item' collection='applicationEntryPoint' separator=',' >#{item}</foreach>)</if> "
-        + "<if test='customFields != null'>AND (CUSTOM_1 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR CUSTOM_2 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR CUSTOM_3 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR CUSTOM_4 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR CUSTOM_5 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR CUSTOM_6 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR CUSTOM_7 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR CUSTOM_8 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>))</if> "
+        + "<if test='serviceLevelIn != null'>AND SERVICE_LEVEL IN(<foreach item='item' collection='serviceLevelIn' separator=',' >#{item}</foreach>)</if> "
+        + "<if test='serviceLevelLike != null'>AND (<foreach item='item' collection='serviceLevelLike' separator=' OR ' >SERVICE_LEVEL LIKE #{item}</foreach>)</if> "
+        + "<if test='applicationEntryPointIn != null'>AND APPLICATION_ENTRY_POINT IN(<foreach item='item' collection='applicationEntryPoint' separator=',' >#{item}</foreach>)</if> "
+        + "<if test='applicationEntryPointLike != null'>AND (<foreach item='item' collection='applicationEntryPointLike' separator=' OR ' >APPLICATION_ENTRY_POINT LIKE #{item}</foreach>)</if> "
+        + "<if test='custom1In != null'>AND CUSTOM_1 IN(<foreach item='item' collection='custom1In' separator=',' >#{item}</foreach>) </if> "
+        + "<if test='custom1Like != null'>AND (<foreach item='item' collection='custom1Like' separator=' OR ' >CUSTOM_1 LIKE #{item}</foreach>)</if> "
+        + "<if test='custom2In != null'>AND CUSTOM_2 IN(<foreach item='item' collection='custom2In' separator=',' >#{item}</foreach>) </if> "
+        + "<if test='custom2Like != null'>AND (<foreach item='item' collection='custom2Like' separator=' OR ' > CUSTOM_2 LIKE #{item}</foreach>)</if> "
+        + "<if test='custom3In != null'>AND CUSTOM_3 IN(<foreach item='item' collection='custom3In' separator=',' >#{item}</foreach>) </if> "
+        + "<if test='custom3Like != null'>AND (<foreach item='item' collection='custom3Like' separator=' OR ' > CUSTOM_3 LIKE #{item}</foreach>)</if> "
+        + "<if test='custom4In != null'>AND CUSTOM_4 IN(<foreach item='item' collection='custom4In' separator=',' >#{item}</foreach>) </if> "
+        + "<if test='custom4Like != null'>AND (<foreach item='item' collection='custom4Like' separator=' OR ' > CUSTOM_4 LIKE #{item}</foreach>)</if> "
+        + "<if test='custom5In != null'>AND CUSTOM_5 IN(<foreach item='item' collection='custom5In' separator=',' >#{item}</foreach>) </if> "
+        + "<if test='custom5Like != null'>AND (<foreach item='item' collection='custom5Like' separator=' OR ' > CUSTOM_5 LIKE #{item}</foreach>)</if> "
+        + "<if test='custom6In != null'>AND CUSTOM_6 IN(<foreach item='item' collection='custom6In' separator=',' >#{item}</foreach>) </if> "
+        + "<if test='custom6Like != null'>AND (<foreach item='item' collection='custom6Like' separator=' OR ' > CUSTOM_6 LIKE #{item}</foreach>)</if> "
+        + "<if test='custom7In != null'>AND CUSTOM_7 IN(<foreach item='item' collection='custom7In' separator=',' >#{item}</foreach>) </if> "
+        + "<if test='custom7Like != null'>AND (<foreach item='item' collection='custom7Like' separator=' OR ' > CUSTOM_7 LIKE #{item}</foreach>)</if> "
+        + "<if test='custom8In != null'>AND CUSTOM_8 IN(<foreach item='item' collection='custom8In' separator=',' >#{item}</foreach>) </if> "
+        + "<if test='custom8Like != null'>AND (<foreach item='item' collection='custom8Like' separator=' OR ' > CUSTOM_8 LIKE #{item}</foreach>)</if> "
         + "</where>"
         + "</script>")
     Long countQueryClassifications(ClassificationQueryImpl classificationQuery);
diff --git a/lib/taskana-core/src/test/java/acceptance/classification/QueryClassificationAccTest.java b/lib/taskana-core/src/test/java/acceptance/classification/QueryClassificationAccTest.java
index 9748c7c4d..e921bbca7 100644
--- a/lib/taskana-core/src/test/java/acceptance/classification/QueryClassificationAccTest.java
+++ b/lib/taskana-core/src/test/java/acceptance/classification/QueryClassificationAccTest.java
@@ -9,7 +9,6 @@ import java.util.stream.Collectors;
 
 import org.h2.store.fs.FileUtils;
 import org.junit.AfterClass;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import acceptance.AbstractAccTest;
@@ -28,42 +27,39 @@ public class QueryClassificationAccTest extends AbstractAccTest {
         super();
     }
 
-    @Ignore
     @Test
     public void testFindClassificationsByCategoryAndDomain()
         throws SQLException, ClassificationNotFoundException, NotAuthorizedException, InvalidArgumentException {
         ClassificationService classificationService = taskanaEngine.getClassificationService();
         List<ClassificationSummary> classificationSummaryList = classificationService.createClassificationQuery()
-            // .categoryIn("MANUAL")
-            // .domainIn("DOMAIN_A")
+            .categoryIn("MANUAL")
+            .domainIn("DOMAIN_A")
             .list();
 
         assertNotNull(classificationSummaryList);
         assertEquals(2, classificationSummaryList.size());
     }
 
-    @Ignore
     @Test
     public void testGetOneClassificationForMultipleDomains()
         throws SQLException, ClassificationNotFoundException, NotAuthorizedException, InvalidArgumentException {
         ClassificationService classificationService = taskanaEngine.getClassificationService();
         List<ClassificationSummary> classifications = classificationService.createClassificationQuery()
-            // .keyIn("L10000")
-            // .domainIn("DOMAIN_A", "DOMAIN_B", "")
+            .keyIn("L10000")
+            .domainIn("DOMAIN_A", "DOMAIN_B", "")
             .list();
 
         assertNotNull(classifications);
         assertEquals(2, classifications.size());
     }
 
-    @Ignore
     @Test
     public void testGetClassificationsForTypeAndParent()
         throws SQLException, ClassificationNotFoundException, NotAuthorizedException, InvalidArgumentException {
         ClassificationService classificationService = taskanaEngine.getClassificationService();
         List<ClassificationSummary> classifications = classificationService.createClassificationQuery()
-            // .typeIn("TASK", "DOCUMENT")
-            // .parentClassificationKeyIn("")
+            .typeIn("TASK", "DOCUMENT")
+            .parentClassificationKeyIn("")
             .list();
 
         assertNotNull(classifications);
@@ -82,14 +78,13 @@ public class QueryClassificationAccTest extends AbstractAccTest {
         assertEquals(18, taskTypes.size());
     }
 
-    @Ignore
     @Test
     public void testGetClassificationsForKeyAndCategories()
         throws SQLException, ClassificationNotFoundException, NotAuthorizedException, InvalidArgumentException {
         ClassificationService classificationService = taskanaEngine.getClassificationService();
         List<ClassificationSummary> classifications = classificationService.createClassificationQuery()
-            // .keyIn("T2100", "L10000")
-            // .categoryIn("EXTERN", "MANUAL")
+            .keyIn("T2100", "L10000")
+            .categoryIn("EXTERN", "MANUAL")
             .list();
 
         assertNotNull(classifications);
@@ -108,80 +103,65 @@ public class QueryClassificationAccTest extends AbstractAccTest {
         assertEquals(3, manualCategory.size());
     }
 
-    @Ignore
     @Test
     public void testGetClassificationsWithParentKey()
         throws SQLException, ClassificationNotFoundException, NotAuthorizedException, InvalidArgumentException {
         ClassificationService classificationService = taskanaEngine.getClassificationService();
         List<ClassificationSummary> classifications = classificationService.createClassificationQuery()
-            // .keyIn("A12", "A13")
-            // .categoryIn("EXTERN", "MANUAL")
-            // .parentClassificationKeyIn("L10000")
+            .keyIn("A12", "A13")
+            .categoryIn("EXTERN", "MANUAL")
+            .parentClassificationKeyIn("L10000")
             .list();
 
         assertNotNull(classifications);
         assertEquals(1, classifications.size());
 
         classifications = classificationService.createClassificationQuery()
-            // .keyIn("A12", "A13")
-            // .categoryIn("EXTERN", "MANUAL", "AUTOMATIC")
-            // .parentClassificationKeyIn("L10000", "T2100", "T6310")
-            // .domainIn("DOMAIN_A")
+            .keyIn("A12", "A13")
+            .categoryIn("EXTERN", "MANUAL", "AUTOMATIC")
+            .parentClassificationKeyIn("L10000", "T2100", "T6310")
+            .domainIn("DOMAIN_A")
             .list();
         assertNotNull(classifications);
         assertEquals(2, classifications.size());
     }
 
-    @Ignore
-    @Test
-    public void testGetClassificationsWithCustomFields()
-        throws SQLException, ClassificationNotFoundException, NotAuthorizedException, InvalidArgumentException {
-        ClassificationService classificationService = taskanaEngine.getClassificationService();
-        List<ClassificationSummary> classifications = classificationService.createClassificationQuery()
-            // .custom1In("VNR,RVNR,KOLVNR", "VNR")
-            // .domainIn("DOMAIN_A")
-            .list();
-        assertNotNull(classifications);
-        assertEquals(13, classifications.size());
-    }
-
-    @Ignore
     @Test
     public void testGetClassificationsWithCustom1()
         throws SQLException, ClassificationNotFoundException, NotAuthorizedException, InvalidArgumentException {
         ClassificationService classificationService = taskanaEngine.getClassificationService();
         List<ClassificationSummary> classifications = classificationService.createClassificationQuery()
-            // .custom1In("VNR,RVNR,KOLVNR", "VNR")
-            // .domainIn("DOMAIN_A")
-            .list();
+             .custom1Like("VNR,RVNR,KOLVNR", "VNR")
+             .domainIn("DOMAIN_A")
+             .list();
         assertNotNull(classifications);
-        assertEquals(13, classifications.size());
+        assertEquals(12, classifications.size());
     }
 
-    @Ignore
     @Test
     public void testGetClassificationsWithCustom1Like()
         throws SQLException, ClassificationNotFoundException, NotAuthorizedException, InvalidArgumentException {
         ClassificationService classificationService = taskanaEngine.getClassificationService();
         List<ClassificationSummary> classifications = classificationService.createClassificationQuery()
-            // .custom1Like("%RVNR%")
-            // .domainIn("DOMAIN_A")
-            .list();
+             .custom1Like("%RVNR%")
+             .domainIn("DOMAIN_A")
+             .typeIn("TASK")
+             .list();
         assertNotNull(classifications);
-        assertEquals(11, classifications.size());
+        assertEquals(10, classifications.size());
     }
 
-    @Ignore
     @Test
     public void testGetClassificationsWithParentAndCustom2()
         throws SQLException, ClassificationNotFoundException, NotAuthorizedException, InvalidArgumentException {
         ClassificationService classificationService = taskanaEngine.getClassificationService();
         List<ClassificationSummary> classifications = classificationService.createClassificationQuery()
-            // .parentClassificationKeyIn("L11010")
-            // .custom2In("TEXT_1")
+             .parentClassificationKeyIn("L11010")
+             .custom2Like("TEXT_1", "TEXT_2")
             .list();
+        // zwei tests
         assertNotNull(classifications);
-        assertEquals(2, classifications.size());
+        assertEquals(3, classifications.size());
     }
 
     @AfterClass
diff --git a/lib/taskana-core/src/test/java/acceptance/classification/QueryClassificationWithPaginationAccTest.java b/lib/taskana-core/src/test/java/acceptance/classification/QueryClassificationWithPaginationAccTest.java
index 9a522cad1..7530330f9 100644
--- a/lib/taskana-core/src/test/java/acceptance/classification/QueryClassificationWithPaginationAccTest.java
+++ b/lib/taskana-core/src/test/java/acceptance/classification/QueryClassificationWithPaginationAccTest.java
@@ -32,7 +32,7 @@ public class QueryClassificationWithPaginationAccTest extends AbstractAccTest {
     public void testGetFirstPageOfClassificationQueryWithOffset() throws NotAuthorizedException {
         ClassificationService classificationService = taskanaEngine.getClassificationService();
         List<ClassificationSummary> results = classificationService.createClassificationQuery()
-            .domain("DOMAIN_A")
+            .domainIn("DOMAIN_A")
             .list(0, 5);
         assertThat(results.size(), equalTo(5));
     }
@@ -41,7 +41,7 @@ public class QueryClassificationWithPaginationAccTest extends AbstractAccTest {
     public void testGetSecondPageOfClassificationQueryWithOffset() throws NotAuthorizedException {
         ClassificationService classificationService = taskanaEngine.getClassificationService();
         List<ClassificationSummary> results = classificationService.createClassificationQuery()
-            .domain("DOMAIN_A")
+            .domainIn("DOMAIN_A")
             .list(5, 5);
         assertThat(results.size(), equalTo(5));
     }
@@ -52,19 +52,19 @@ public class QueryClassificationWithPaginationAccTest extends AbstractAccTest {
 
         // both will be 0, working
         List<ClassificationSummary> results = classificationService.createClassificationQuery()
-            .domain("DOMAIN_A")
+            .domainIn("DOMAIN_A")
             .list(-1, -3);
         assertThat(results.size(), equalTo(0));
 
         // limit will be 0
         results = classificationService.createClassificationQuery()
-            .domain("DOMAIN_A")
+            .domainIn("DOMAIN_A")
             .list(1, -3);
         assertThat(results.size(), equalTo(0));
 
         // offset will be 0
         results = classificationService.createClassificationQuery()
-            .domain("DOMAIN_A")
+            .domainIn("DOMAIN_A")
             .list(-1, 3);
         assertThat(results.size(), equalTo(3));
     }
@@ -77,7 +77,7 @@ public class QueryClassificationWithPaginationAccTest extends AbstractAccTest {
         int pageNumber = 1;
         int pageSize = 4;
         List<ClassificationSummary> results = classificationService.createClassificationQuery()
-            .domain("DOMAIN_A")
+            .domainIn("DOMAIN_A")
             .listPage(pageNumber, pageSize);
         assertThat(results.size(), equalTo(4));
 
@@ -85,7 +85,7 @@ public class QueryClassificationWithPaginationAccTest extends AbstractAccTest {
         pageNumber = 3;
         pageSize = 4;
         results = classificationService.createClassificationQuery()
-            .domain("DOMAIN_A")
+            .domainIn("DOMAIN_A")
             .listPage(pageNumber, pageSize);
         assertThat(results.size(), equalTo(3));
 
@@ -93,7 +93,7 @@ public class QueryClassificationWithPaginationAccTest extends AbstractAccTest {
         pageNumber = 0;
         pageSize = 100;
         results = classificationService.createClassificationQuery()
-            .domain("DOMAIN_A")
+            .domainIn("DOMAIN_A")
             .listPage(pageNumber, pageSize);
         assertThat(results.size(), equalTo(15));
 
@@ -101,7 +101,7 @@ public class QueryClassificationWithPaginationAccTest extends AbstractAccTest {
         pageNumber = 1;
         pageSize = 10;
         results = classificationService.createClassificationQuery()
-            .domain("DOMAIN_A")
+            .domainIn("DOMAIN_A")
             .listPage(pageNumber, pageSize);
         assertThat(results.size(), equalTo(5));
     }
@@ -114,7 +114,7 @@ public class QueryClassificationWithPaginationAccTest extends AbstractAccTest {
         int pageNumber = 1;
         int pageSize = 0;
         List<ClassificationSummary> results = classificationService.createClassificationQuery()
-            .domain("DOMAIN_A")
+            .domainIn("DOMAIN_A")
             .listPage(pageNumber, pageSize);
         assertThat(results.size(), equalTo(0));
 
@@ -122,7 +122,7 @@ public class QueryClassificationWithPaginationAccTest extends AbstractAccTest {
         pageNumber = 1;
         pageSize = -1;
         results = classificationService.createClassificationQuery()
-            .domain("DOMAIN_A")
+            .domainIn("DOMAIN_A")
             .listPage(pageNumber, pageSize);
         assertThat(results.size(), equalTo(0));
 
@@ -130,7 +130,7 @@ public class QueryClassificationWithPaginationAccTest extends AbstractAccTest {
         pageNumber = -1;
         pageSize = 10;
         results = classificationService.createClassificationQuery()
-            .domain("DOMAIN_A")
+            .domainIn("DOMAIN_A")
             .listPage(pageNumber, pageSize);
         assertThat(results.size(), equalTo(10));
     }
@@ -150,7 +150,7 @@ public class QueryClassificationWithPaginationAccTest extends AbstractAccTest {
         int pageNumber = 5;
         int pageSize = 10;
         classificationService.createClassificationQuery()
-            .domain("DOMAIN_A")
+            .domainIn("DOMAIN_A")
             .listPage(pageNumber, pageSize);
     }
 
@@ -159,7 +159,7 @@ public class QueryClassificationWithPaginationAccTest extends AbstractAccTest {
         throws NotAuthorizedException {
         ClassificationService classificationService = taskanaEngine.getClassificationService();
         long count = classificationService.createClassificationQuery()
-            .domain("DOMAIN_A")
+            .domainIn("DOMAIN_A")
             .count();
         assertThat(count, equalTo(15L));
     }
diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationQueryImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationQueryImplTest.java
index 8acb1ef4e..028f1d55c 100644
--- a/lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationQueryImplTest.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationQueryImplTest.java
@@ -44,10 +44,10 @@ public class ClassificationQueryImplTest {
         when(taskanaEngine.getSqlSession()).thenReturn(sqlSession);
         when(sqlSession.selectList(any(), any())).thenReturn(new ArrayList<>());
 
-        List<ClassificationSummary> result = classificationQueryImpl.name("test", "asd", "blubber")
-            .type("cool", "bla")
+        List<ClassificationSummary> result = classificationQueryImpl.nameIn("test", "asd", "blubber")
+            .typeIn("cool", "bla")
             .priority(1, 2)
-            .parentClassificationKey("superId")
+            .parentClassificationKeyIn("superId")
             .list();
         Assert.assertNotNull(result);
     }
@@ -58,10 +58,10 @@ public class ClassificationQueryImplTest {
         when(taskanaEngine.getSqlSession()).thenReturn(sqlSession);
         when(sqlSession.selectList(any(), any(), any())).thenReturn(new ArrayList<>());
 
-        List<ClassificationSummary> result = classificationQueryImpl.name("test", "asd", "blubber")
-            .type("cool", "bla")
+        List<ClassificationSummary> result = classificationQueryImpl.nameIn("test", "asd", "blubber")
+            .typeIn("cool", "bla")
             .priority(1, 2)
-            .parentClassificationKey("superId")
+            .parentClassificationKeyIn("superId")
             .list(1, 1);
         Assert.assertNotNull(result);
     }
@@ -71,10 +71,10 @@ public class ClassificationQueryImplTest {
         when(taskanaEngine.getSqlSession()).thenReturn(sqlSession);
         when(sqlSession.selectOne(any(), any())).thenReturn(new ClassificationSummaryImpl());
 
-        ClassificationSummary result = classificationQueryImpl.name("test", "asd", "blubber")
-            .type("cool", "bla")
+        ClassificationSummary result = classificationQueryImpl.nameIn("test", "asd", "blubber")
+            .typeIn("cool", "bla")
             .priority(1, 2)
-            .parentClassificationKey("superId")
+            .parentClassificationKeyIn("superId")
             .single();
         Assert.assertNotNull(result);
     }
diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationServiceImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationServiceImplTest.java
index 4e01cd620..1d2f65b2f 100644
--- a/lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationServiceImplTest.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationServiceImplTest.java
@@ -67,14 +67,14 @@ public class ClassificationServiceImplTest {
         List<Classification> classifications = new ArrayList<>();
 
         doReturn(classificationQueryImplMock).when(cutSpy).createClassificationQuery();
-        doReturn(classificationQueryImplMock).when(classificationQueryImplMock).parentClassificationKey("");
+        doReturn(classificationQueryImplMock).when(classificationQueryImplMock).parentClassificationKeyIn("");
         doReturn(classifications).when(classificationQueryImplMock).list();
 
         List<ClassificationSummary> actaulResults = cutSpy.getClassificationTree();
 
         verify(taskanaEngineImplMock, times(2)).openConnection();
         verify(cutSpy, times(1)).createClassificationQuery();
-        verify(classificationQueryImplMock, times(1)).parentClassificationKey("");
+        verify(classificationQueryImplMock, times(1)).parentClassificationKeyIn("");
         verify(classificationQueryImplMock, times(1)).list();
         verify(taskanaEngineImplMock, times(2)).returnConnection();
         assertThat(actaulResults, equalTo(classifications));
diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/TaskServiceImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/TaskServiceImplTest.java
index 197bcdcc5..b097a31e7 100644
--- a/lib/taskana-core/src/test/java/pro/taskana/impl/TaskServiceImplTest.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/impl/TaskServiceImplTest.java
@@ -412,8 +412,8 @@ public class TaskServiceImplTest {
         PowerMockito.mockStatic(CurrentUserContext.class);
         Mockito.when(CurrentUserContext.getUserid()).thenReturn(expectedOwner);
         doReturn(classificationQueryImplMock).when(classificationServiceImplMock).createClassificationQuery();
-        doReturn(classificationQueryImplMock).when(classificationQueryImplMock).domain(any());
-        doReturn(classificationQueryImplMock).when(classificationQueryImplMock).key(any());
+        doReturn(classificationQueryImplMock).when(classificationQueryImplMock).domainIn(any());
+        doReturn(classificationQueryImplMock).when(classificationQueryImplMock).keyIn(any());
         doReturn(new ArrayList<>()).when(classificationQueryImplMock).list();
         doReturn(dummyClassification).when(
             classificationServiceImplMock)
@@ -431,8 +431,8 @@ public class TaskServiceImplTest {
         verify(taskanaEngineImpl, times(2)).openConnection();
         verify(taskMapperMock, times(1)).findById(expectedTask.getId());
         verify(attachmentMapperMock, times(1)).findAttachmentsByTaskId(expectedTask.getId());
-        verify(classificationQueryImplMock, times(1)).domain(any());
-        verify(classificationQueryImplMock, times(1)).key(any());
+        verify(classificationQueryImplMock, times(1)).domainIn(any());
+        verify(classificationQueryImplMock, times(1)).keyIn(any());
         verify(classificationQueryImplMock, times(1)).list();
         verify(taskMapperMock, times(1)).update(any());
         verify(taskanaEngineImpl, times(2)).returnConnection();
@@ -482,8 +482,8 @@ public class TaskServiceImplTest {
         doReturn(null).when(attachmentMapperMock).findAttachmentsByTaskId(task.getId());
         doReturn(task).when(cutSpy).completeTask(task.getId(), isForced);
         doReturn(classificationQueryImplMock).when(classificationServiceImplMock).createClassificationQuery();
-        doReturn(classificationQueryImplMock).when(classificationQueryImplMock).domain(any());
-        doReturn(classificationQueryImplMock).when(classificationQueryImplMock).key(any());
+        doReturn(classificationQueryImplMock).when(classificationQueryImplMock).domainIn(any());
+        doReturn(classificationQueryImplMock).when(classificationQueryImplMock).keyIn(any());
         doReturn(new ArrayList<>()).when(classificationQueryImplMock).list();
         List<ClassificationSummaryImpl> classificationList = Arrays
             .asList((ClassificationSummaryImpl) dummyClassification.asSummary());
@@ -497,8 +497,8 @@ public class TaskServiceImplTest {
         verify(taskMapperMock, times(1)).findById(task.getId());
         verify(attachmentMapperMock, times(1)).findAttachmentsByTaskId(task.getId());
         verify(classificationServiceImplMock, times(1)).createClassificationQuery();
-        verify(classificationQueryImplMock, times(1)).domain(any());
-        verify(classificationQueryImplMock, times(1)).key(any());
+        verify(classificationQueryImplMock, times(1)).domainIn(any());
+        verify(classificationQueryImplMock, times(1)).keyIn(any());
         verify(classificationQueryImplMock, times(1)).list();
         verify(taskMapperMock, times(1)).update(any());
         verify(taskanaEngineImpl, times(2)).returnConnection();
@@ -913,8 +913,8 @@ public class TaskServiceImplTest {
         doReturn(null).when(attachmentMapperMock).findAttachmentsByTaskId(expectedTask.getId());
 
         doReturn(classificationQueryImplMock).when(classificationServiceImplMock).createClassificationQuery();
-        doReturn(classificationQueryImplMock).when(classificationQueryImplMock).domain(any());
-        doReturn(classificationQueryImplMock).when(classificationQueryImplMock).key(any());
+        doReturn(classificationQueryImplMock).when(classificationQueryImplMock).domainIn(any());
+        doReturn(classificationQueryImplMock).when(classificationQueryImplMock).keyIn(any());
         doReturn(new ArrayList<>()).when(classificationQueryImplMock).list();
 
         List<ClassificationSummaryImpl> classificationList = Arrays
@@ -928,8 +928,8 @@ public class TaskServiceImplTest {
         verify(taskMapperMock, times(1)).findById(expectedTask.getId());
         verify(attachmentMapperMock, times(1)).findAttachmentsByTaskId(expectedTask.getId());
         verify(classificationServiceImplMock, times(1)).createClassificationQuery();
-        verify(classificationQueryImplMock, times(1)).domain(any());
-        verify(classificationQueryImplMock, times(1)).key(any());
+        verify(classificationQueryImplMock, times(1)).domainIn(any());
+        verify(classificationQueryImplMock, times(1)).keyIn(any());
         verify(classificationQueryImplMock, times(1)).list();
         verify(taskanaEngineImpl, times(1)).returnConnection();
         verifyNoMoreInteractions(attachmentMapperMock, taskanaEngineConfigurationMock, taskanaEngineMock,
@@ -1012,8 +1012,8 @@ public class TaskServiceImplTest {
         doReturn(new WorkbasketImpl()).when(workbasketServiceMock).getWorkbasketByKey(any());
         doReturn(expectedResultList).when(taskMapperMock).findTaskSummariesByWorkbasketKey(workbasketKey);
         doReturn(classificationQueryImplMock).when(classificationServiceImplMock).createClassificationQuery();
-        doReturn(classificationQueryImplMock).when(classificationQueryImplMock).key(any());
-        doReturn(classificationQueryImplMock).when(classificationQueryImplMock).domain(any());
+        doReturn(classificationQueryImplMock).when(classificationQueryImplMock).keyIn(any());
+        doReturn(classificationQueryImplMock).when(classificationQueryImplMock).domainIn(any());
         doReturn(workbasketQueryImplMock).when(workbasketServiceMock).createWorkbasketQuery();
         doReturn(workbasketQueryImplMock).when(workbasketQueryImplMock).keyIn(any());
         doReturn(expectedWorkbaskets).when(workbasketQueryImplMock).list();
@@ -1026,8 +1026,8 @@ public class TaskServiceImplTest {
         verify(taskMapperMock, times(1)).findTaskSummariesByWorkbasketKey(workbasketKey);
         verify(workbasketServiceMock, times(1)).getWorkbasketByKey(workbasketKey);
         verify(classificationServiceImplMock, times(1)).createClassificationQuery();
-        verify(classificationQueryImplMock, times(1)).domain(any());
-        verify(classificationQueryImplMock, times(1)).key(any());
+        verify(classificationQueryImplMock, times(1)).domainIn(any());
+        verify(classificationQueryImplMock, times(1)).keyIn(any());
         verify(classificationQueryImplMock, times(1)).list();
         verify(workbasketServiceMock, times(1)).createWorkbasketQuery();
         verify(workbasketQueryImplMock, times(1)).keyIn(any());
diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/TestClassificationQuery.java b/lib/taskana-core/src/test/java/pro/taskana/impl/TestClassificationQuery.java
index 391535d7e..6fc20b55b 100644
--- a/lib/taskana-core/src/test/java/pro/taskana/impl/TestClassificationQuery.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/impl/TestClassificationQuery.java
@@ -22,28 +22,28 @@ public class TestClassificationQuery implements ClassificationQuery {
     }
 
     @Override
-    public ClassificationQuery key(String... key) {
+    public ClassificationQuery keyIn(String... key) {
         return this;
     }
 
     @Override
-    public ClassificationQuery parentClassificationKey(String... parentClassificationKey) {
+    public ClassificationQuery parentClassificationKeyIn(String... parentClassificationKey) {
         this.parentClassificationKey = parentClassificationKey;
         return this;
     }
 
     @Override
-    public ClassificationQuery category(String... category) {
+    public ClassificationQuery categoryIn(String... category) {
         return this;
     }
 
     @Override
-    public ClassificationQuery type(String... type) {
+    public ClassificationQuery typeIn(String... type) {
         return this;
     }
 
     @Override
-    public ClassificationQuery domain(String... domain) {
+    public ClassificationQuery domainIn(String... domain) {
         return this;
     }
 
@@ -58,7 +58,12 @@ public class TestClassificationQuery implements ClassificationQuery {
     }
 
     @Override
-    public ClassificationQuery name(String... name) {
+    public ClassificationQuery nameIn(String... name) {
+        return this;
+    }
+
+    @Override
+    public ClassificationQuery nameLike(String... nameLike) {
         return this;
     }
 
@@ -73,17 +78,102 @@ public class TestClassificationQuery implements ClassificationQuery {
     }
 
     @Override
-    public ClassificationQuery serviceLevel(String... serviceLevel) {
+    public ClassificationQuery serviceLevelIn(String... serviceLevel) {
         return this;
     }
 
     @Override
-    public ClassificationQuery applicationEntryPoint(String... applicationEntryPoint) {
+    public ClassificationQuery serviceLevelLike(String... serviceLevelLike) {
+        return this;
+    }
+
+    @Override
+    public ClassificationQuery applicationEntryPointIn(String... applicationEntryPoint) {
         return null;
     }
 
     @Override
-    public ClassificationQuery customFields(String... customFields) {
+    public ClassificationQuery applicationEntryPointLike(String... applicationEntryPointLike) {
+        return this;
+    }
+
+    @Override
+    public ClassificationQuery custom1In(String... customFields) {
+        return this;
+    }
+
+    @Override
+    public ClassificationQuery custom1Like(String... custom1Like) {
+        return this;
+    }
+
+    @Override
+    public ClassificationQuery custom2In(String... custom2In) {
+        return this;
+    }
+
+    @Override
+    public ClassificationQuery custom2Like(String... custom2Like) {
+        return this;
+    }
+
+    @Override
+    public ClassificationQuery custom3In(String... custom3In) {
+        return this;
+    }
+
+    @Override
+    public ClassificationQuery custom3Like(String... custom3Like) {
+        return this;
+    }
+
+    @Override
+    public ClassificationQuery custom4In(String... custom4In) {
+        return this;
+    }
+
+    @Override
+    public ClassificationQuery custom4Like(String... custom4Like) {
+        return this;
+    }
+
+    @Override
+    public ClassificationQuery custom5In(String... custom5In) {
+        return this;
+    }
+
+    @Override
+    public ClassificationQuery custom5Like(String... custom5Like) {
+        return this;
+    }
+
+    @Override
+    public ClassificationQuery custom6In(String... custom6In) {
+        return this;
+    }
+
+    @Override
+    public ClassificationQuery custom6Like(String... custom6Like) {
+        return this;
+    }
+
+    @Override
+    public ClassificationQuery custom7In(String... custom7In) {
+        return this;
+    }
+
+    @Override
+    public ClassificationQuery custom7Like(String... custom7Like) {
+        return this;
+    }
+
+    @Override
+    public ClassificationQuery custom8In(String... custom8In) {
+        return this;
+    }
+
+    @Override
+    public ClassificationQuery custom8Like(String... custom8Like) {
         return this;
     }
 
diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/integration/ClassificationServiceImplIntAutoCommitTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/integration/ClassificationServiceImplIntAutoCommitTest.java
index 51a201e47..4131fdd6c 100644
--- a/lib/taskana-core/src/test/java/pro/taskana/impl/integration/ClassificationServiceImplIntAutoCommitTest.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/impl/integration/ClassificationServiceImplIntAutoCommitTest.java
@@ -230,11 +230,11 @@ public class ClassificationServiceImplIntAutoCommitTest {
         classificationService.createClassification(classification3);
 
         List<ClassificationSummary> list = classificationService.createClassificationQuery()
-            .category("category1")
-            .domain("domain1")
+            .categoryIn("category1")
+            .domainIn("domain1")
             .list();
         Assert.assertEquals(1, list.size());
-        list = classificationService.createClassificationQuery().domain("domain1", "domain3").list();
+        list = classificationService.createClassificationQuery().domainIn("domain1", "domain3").list();
         Assert.assertEquals(2, list.size());
     }
 
@@ -264,12 +264,12 @@ public class ClassificationServiceImplIntAutoCommitTest {
 
         List<ClassificationSummary> list = classificationService.createClassificationQuery()
             .descriptionLike("DESC1")
-            .customFields("custom1")
+            .custom1In("custom1")
             .list();
         Assert.assertEquals(1, list.size());
-        list = classificationService.createClassificationQuery().customFields("custom2").list();
-        Assert.assertEquals(2, list.size());
-        list = classificationService.createClassificationQuery().descriptionLike("DESC1").category("category1").list();
+        list = classificationService.createClassificationQuery().custom1In("custom2").list();
+        Assert.assertEquals(1, list.size());
+        list = classificationService.createClassificationQuery().descriptionLike("DESC1").categoryIn("category1").list();
         Assert.assertEquals(2, list.size());
     }
 
@@ -295,15 +295,15 @@ public class ClassificationServiceImplIntAutoCommitTest {
         classificationService.createClassification(classification3);
 
         List<ClassificationSummary> list = classificationService.createClassificationQuery()
-            .parentClassificationKey(classification.getKey())
+            .parentClassificationKeyIn(classification.getKey())
             .list();
         Assert.assertEquals(2, list.size());
-        list = classificationService.createClassificationQuery().type("type1").priority(Integer.decode("5")).list();
+        list = classificationService.createClassificationQuery().typeIn("type1").priority(Integer.decode("5")).list();
         Assert.assertEquals(2, list.size());
         list = classificationService.createClassificationQuery()
             .priority(Integer.decode("5"))
-            .type("type1")
-            .parentClassificationKey(classification1.getKey())
+            .typeIn("type1")
+            .parentClassificationKeyIn(classification1.getKey())
             .list();
         Assert.assertEquals(1, list.size());
     }
@@ -337,11 +337,11 @@ public class ClassificationServiceImplIntAutoCommitTest {
         classificationService.createClassification(classification3);
         all++;
 
-        List<ClassificationSummary> list = classificationService.createClassificationQuery().name("name").list();
+        List<ClassificationSummary> list = classificationService.createClassificationQuery().nameIn("name").list();
         Assert.assertEquals(1, list.size());
-        list = classificationService.createClassificationQuery().serviceLevel("P1D").descriptionLike("desc").list();
+        list = classificationService.createClassificationQuery().serviceLevelIn("P1D").descriptionLike("desc").list();
         Assert.assertEquals(2, list.size());
-        list = classificationService.createClassificationQuery().serviceLevel("P1DT1H").name("name").list();
+        list = classificationService.createClassificationQuery().serviceLevelIn("P1DT1H").nameIn("name").list();
         Assert.assertEquals(0, list.size());
         list = classificationService.createClassificationQuery().descriptionLike("desc%").list();
         Assert.assertEquals(all, list.size());
@@ -361,7 +361,7 @@ public class ClassificationServiceImplIntAutoCommitTest {
         classification1 = classificationService.updateClassification(classification1);
 
         List<ClassificationSummary> list = classificationService.createClassificationQuery()
-            .parentClassificationKey("")
+            .parentClassificationKeyIn("")
             .list();
         Assert.assertEquals(1, list.size());
         list = classificationService.createClassificationQuery()
@@ -378,7 +378,7 @@ public class ClassificationServiceImplIntAutoCommitTest {
         list = classificationService.createClassificationQuery().created(Instant.now()).list();
         Assert.assertEquals(listAll.size(), list.size());
 
-        list = classificationService.createClassificationQuery().domain("domain1").validInDomain(false).list();
+        list = classificationService.createClassificationQuery().domainIn("domain1").validInDomain(false).list();
         Assert.assertEquals(0, list.size());
 
         list = classificationService.createClassificationQuery()
diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/integration/ClassificationServiceImplIntExplicitTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/integration/ClassificationServiceImplIntExplicitTest.java
index 0596772ec..86d7f6330 100644
--- a/lib/taskana-core/src/test/java/pro/taskana/impl/integration/ClassificationServiceImplIntExplicitTest.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/impl/integration/ClassificationServiceImplIntExplicitTest.java
@@ -259,11 +259,11 @@ public class ClassificationServiceImplIntExplicitTest {
         classificationService.createClassification(classification3);
 
         List<ClassificationSummary> list = classificationService.createClassificationQuery()
-            .category("category1")
-            .domain("domain1")
+            .categoryIn("category1")
+            .domainIn("domain1")
             .list();
         Assert.assertEquals(1, list.size());
-        list = classificationService.createClassificationQuery().domain("domain1", "domain3").list();
+        list = classificationService.createClassificationQuery().domainIn("domain1", "domain3").list();
         Assert.assertEquals(2, list.size());
         connection.commit();
     }
@@ -296,12 +296,12 @@ public class ClassificationServiceImplIntExplicitTest {
 
         List<ClassificationSummary> list = classificationService.createClassificationQuery()
             .descriptionLike("DESC1")
-            .customFields("custom1")
+            .custom1In("custom1")
             .list();
         Assert.assertEquals(1, list.size());
-        list = classificationService.createClassificationQuery().customFields("custom2").list();
-        Assert.assertEquals(2, list.size());
-        list = classificationService.createClassificationQuery().descriptionLike("DESC1").category("category1").list();
+        list = classificationService.createClassificationQuery().custom1In("custom2").list();
+        Assert.assertEquals(1, list.size());
+        list = classificationService.createClassificationQuery().descriptionLike("DESC1").categoryIn("category1").list();
         Assert.assertEquals(2, list.size());
         connection.commit();
     }
@@ -329,15 +329,15 @@ public class ClassificationServiceImplIntExplicitTest {
         classificationService.createClassification(classification3);
 
         List<ClassificationSummary> list = classificationService.createClassificationQuery()
-            .parentClassificationKey(classification.getKey())
+            .parentClassificationKeyIn(classification.getKey())
             .list();
         Assert.assertEquals(2, list.size());
-        list = classificationService.createClassificationQuery().type("type1").priority(Integer.decode("5")).list();
+        list = classificationService.createClassificationQuery().typeIn("type1").priority(Integer.decode("5")).list();
         Assert.assertEquals(2, list.size());
         list = classificationService.createClassificationQuery()
             .priority(Integer.decode("5"))
-            .type("type1")
-            .parentClassificationKey(classification1.getKey())
+            .typeIn("type1")
+            .parentClassificationKeyIn(classification1.getKey())
             .list();
         Assert.assertEquals(1, list.size());
         connection.commit();
@@ -374,11 +374,11 @@ public class ClassificationServiceImplIntExplicitTest {
         classificationService.createClassification(classification3);
         all++;
 
-        List<ClassificationSummary> list = classificationService.createClassificationQuery().name("name").list();
+        List<ClassificationSummary> list = classificationService.createClassificationQuery().nameIn("name").list();
         Assert.assertEquals(1, list.size());
-        list = classificationService.createClassificationQuery().serviceLevel("P1D").descriptionLike("desc").list();
+        list = classificationService.createClassificationQuery().serviceLevelIn("P1D").descriptionLike("desc").list();
         Assert.assertEquals(2, list.size());
-        list = classificationService.createClassificationQuery().serviceLevel("P1DT1H").name("name").list();
+        list = classificationService.createClassificationQuery().serviceLevelIn("P1DT1H").nameIn("name").list();
         Assert.assertEquals(0, list.size());
         list = classificationService.createClassificationQuery().descriptionLike("desc%").list();
         Assert.assertEquals(all, list.size());
@@ -399,7 +399,7 @@ public class ClassificationServiceImplIntExplicitTest {
         classification1 = classificationService.updateClassification(classification1);
 
         List<ClassificationSummary> list = classificationService.createClassificationQuery()
-            .parentClassificationKey("")
+            .parentClassificationKeyIn("")
             .list();
         Assert.assertEquals(1, list.size());
         list = classificationService.createClassificationQuery()
@@ -411,15 +411,15 @@ public class ClassificationServiceImplIntExplicitTest {
         Assert.assertEquals(2, list.size());
         list = classificationService.createClassificationQuery().created(Instant.now()).list();
         Assert.assertEquals(2, list.size());
-        list = classificationService.createClassificationQuery().domain("domain1").validInDomain(false).list();
+        list = classificationService.createClassificationQuery().domainIn("domain1").validInDomain(false).list();
         Assert.assertEquals(0, list.size());
         list = classificationService.createClassificationQuery()
-            .key(classification1.getKey())
+            .keyIn(classification1.getKey())
             .list();
         Assert.assertEquals(1, list.size());
 
         list = classificationService.createClassificationQuery()
-            .parentClassificationKey(classification.getKey())
+            .parentClassificationKeyIn(classification.getKey())
             .list();
         Assert.assertEquals(1, list.size());
         assertThat(list.get(0).getKey(), equalTo(classification1.getKey()));