diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccessItemsAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccessItemsAccTest.java
index 4430e6188..fe7af4f7a 100644
--- a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccessItemsAccTest.java
+++ b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccessItemsAccTest.java
@@ -5,6 +5,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import java.util.Arrays;
 import java.util.List;
 
 import org.junit.Assert;
@@ -139,4 +140,32 @@ public class QueryWorkbasketAccessItemsAccTest extends AbstractAccTest {
         Assert.assertEquals("WAI:100000000000000000000000000000000009", results.get(0).getId());
     }
 
+    @WithAccessId(
+        userName = "admin")
+    @Test
+    public void testQueryForIdIn() throws NotAuthorizedException {
+        WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
+        String[] expectedIds = {"WAI:100000000000000000000000000000000001",
+                "WAI:100000000000000000000000000000000015",
+                "WAI:100000000000000000000000000000000007"};
+        List<WorkbasketAccessItem> results = workbasketService.createWorkbasketAccessItemQuery()
+                .idIn(expectedIds)
+                .list();
+        for (String id : Arrays.asList(expectedIds)) {
+            assertTrue(results.stream().anyMatch(accessItem -> accessItem.getId().equals(id)));
+        }
+    }
+
+    @WithAccessId(
+        userName = "businessadmin")
+    @Test
+    public void testQueryForOrderById() throws NotAuthorizedException {
+        WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
+        List<WorkbasketAccessItem> results = workbasketService.createWorkbasketAccessItemQuery()
+                .orderById(asc)
+                .list();
+        assertEquals("0000000000000000000000000000000000000900", results.get(0).getId());
+        assertEquals("WAI:100000000000000000000000000000000123", results.get(results.size() - 1).getId());
+    }
+
 }
diff --git a/lib/taskana-core/src/test/resources/sql/workbasket-access-list.sql b/lib/taskana-core/src/test/resources/sql/workbasket-access-list.sql
index 7ce37edbb..d5fd96fd8 100644
--- a/lib/taskana-core/src/test/resources/sql/workbasket-access-list.sql
+++ b/lib/taskana-core/src/test/resources/sql/workbasket-access-list.sql
@@ -37,13 +37,13 @@ INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000
 INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000026', 'WBI:100000000000000000000000000000000015',    'group_2', 'UsersGroup'        , true, true, true,  true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
 
 -- Access to workbaskets for sorting test
-INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('900', '900', 'max', 'Behrendt, Maximilian', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
-INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('901', '901', 'max', 'Behrendt, Maximilian', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
-INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('902', '902', 'max', 'Behrendt, Maximilian', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
-INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('903', '903', 'max', 'Behrendt, Maximilian', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
-INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('904', '904', 'max', 'Behrendt, Maximilian', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
-INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('905', '905', 'max', 'Behrendt, Maximilian', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
-INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('906', '906', 'max', 'Behrendt, Maximilian', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
-INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('907', '907', 'max', 'Behrendt, Maximilian', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
-INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('908', '908', 'max', 'Behrendt, Maximilian', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
-INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('909', '909', 'max', 'Behrendt, Maximilian', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
+INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('0000000000000000000000000000000000000900', '0000000000000000000000000000000000000900', 'max', 'Behrendt, Maximilian', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
+INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('0000000000000000000000000000000000000901', '0000000000000000000000000000000000000901', 'max', 'Behrendt, Maximilian', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
+INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('0000000000000000000000000000000000000902', '0000000000000000000000000000000000000902', 'max', 'Behrendt, Maximilian', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
+INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('0000000000000000000000000000000000000903', '0000000000000000000000000000000000000903', 'max', 'Behrendt, Maximilian', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
+INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('0000000000000000000000000000000000000904', '0000000000000000000000000000000000000904', 'max', 'Behrendt, Maximilian', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
+INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('0000000000000000000000000000000000000905', '0000000000000000000000000000000000000905', 'max', 'Behrendt, Maximilian', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
+INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('0000000000000000000000000000000000000906', '0000000000000000000000000000000000000906', 'max', 'Behrendt, Maximilian', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
+INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('0000000000000000000000000000000000000907', '0000000000000000000000000000000000000907', 'max', 'Behrendt, Maximilian', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
+INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('0000000000000000000000000000000000000908', '0000000000000000000000000000000000000908', 'max', 'Behrendt, Maximilian', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
+INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('0000000000000000000000000000000000000909', '0000000000000000000000000000000000000909', 'max', 'Behrendt, Maximilian', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
diff --git a/lib/taskana-core/src/test/resources/sql/workbasket.sql b/lib/taskana-core/src/test/resources/sql/workbasket.sql
index d4e1fc37a..3a3de8895 100644
--- a/lib/taskana-core/src/test/resources/sql/workbasket.sql
+++ b/lib/taskana-core/src/test/resources/sql/workbasket.sql
@@ -18,13 +18,13 @@ INSERT INTO TASKANA.WORKBASKET VALUES ('WBI:100000000000000000000000000000000014
 INSERT INTO TASKANA.WORKBASKET VALUES ('WBI:100000000000000000000000000000000015', 'USER_3_2', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'PPK User 2 KSC 1 Domain B', 'DOMAIN_B', 'PERSONAL', 'PPK User 1 KSC 1 Domain B', 'owner0815', 'ABCABC', '', '', '', '', '', '', '');
 
 -- Workbaskets for sorting test
-INSERT INTO TASKANA.WORKBASKET VALUES ('900', 'sort001', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'basxet0', 'DOM_XY', 'TOPIC',     'Lorem ipsum dolor sit amet.', 'Max', '', '', '', '', '', '', '', '');
-INSERT INTO TASKANA.WORKBASKET VALUES ('901', 'Sort002', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Basxet1', 'DOM_XY', 'TOPIC',     'Lorem ipsum dolor sit amet.', 'Max', '', '', '', '', '', '', '', '');
-INSERT INTO TASKANA.WORKBASKET VALUES ('902', 'sOrt003', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'bAsxet2', 'DOM_XY', 'TOPIC',     'Lorem ipsum dolor sit amet.', 'Max', '', '', '', '', '', '', '', '');
-INSERT INTO TASKANA.WORKBASKET VALUES ('903', 'soRt004', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'baSxet3', 'DOM_XY', 'TOPIC',     'Lorem ipsum dolor sit amet.', 'Max', '', '', '', '', '', '', '', '');
-INSERT INTO TASKANA.WORKBASKET VALUES ('904', 'sorT005', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'basXet4', 'DOM_XY', 'TOPIC',     'Lorem ipsum dolor sit amet.', 'Max', '', '', '', '', '', '', '', '');
-INSERT INTO TASKANA.WORKBASKET VALUES ('905', 'Sort006', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'basxEt5', 'DOM_XY', 'TOPIC',     'Lorem ipsum dolor sit amet.', 'Max', '', '', '', '', '', '', '', '');
-INSERT INTO TASKANA.WORKBASKET VALUES ('906', 'SOrt007', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'basxeT6', 'DOM_XY', 'TOPIC',     'Lorem ipsum dolor sit amet.', 'Max', '', '', '', '', '', '', '', '');
-INSERT INTO TASKANA.WORKBASKET VALUES ('907', 'SoRt008', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'BAsxet7', 'DOM_XY', 'TOPIC',     'Lorem ipsum dolor sit amet.', 'Max', '', '', '', '', '', '', '', '');
-INSERT INTO TASKANA.WORKBASKET VALUES ('908', 'SorT009', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'BaSxet8', 'DOM_XY', 'TOPIC',     'Lorem ipsum dolor sit amet.', 'Max', '', '', '', '', '', '', '', '');
-INSERT INTO TASKANA.WORKBASKET VALUES ('909', 'Sort010', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'BasXet9', 'DOM_XY', 'TOPIC',     'Lorem ipsum dolor sit amet.', 'Max', '', '', '', '', '', '', '', '');
+INSERT INTO TASKANA.WORKBASKET VALUES ('0000000000000000000000000000000000000900', 'sort001', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'basxet0', 'DOM_XY', 'TOPIC',     'Lorem ipsum dolor sit amet.', 'Max', '', '', '', '', '', '', '', '');
+INSERT INTO TASKANA.WORKBASKET VALUES ('0000000000000000000000000000000000000901', 'Sort002', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Basxet1', 'DOM_XY', 'TOPIC',     'Lorem ipsum dolor sit amet.', 'Max', '', '', '', '', '', '', '', '');
+INSERT INTO TASKANA.WORKBASKET VALUES ('0000000000000000000000000000000000000902', 'sOrt003', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'bAsxet2', 'DOM_XY', 'TOPIC',     'Lorem ipsum dolor sit amet.', 'Max', '', '', '', '', '', '', '', '');
+INSERT INTO TASKANA.WORKBASKET VALUES ('0000000000000000000000000000000000000903', 'soRt004', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'baSxet3', 'DOM_XY', 'TOPIC',     'Lorem ipsum dolor sit amet.', 'Max', '', '', '', '', '', '', '', '');
+INSERT INTO TASKANA.WORKBASKET VALUES ('0000000000000000000000000000000000000904', 'sorT005', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'basXet4', 'DOM_XY', 'TOPIC',     'Lorem ipsum dolor sit amet.', 'Max', '', '', '', '', '', '', '', '');
+INSERT INTO TASKANA.WORKBASKET VALUES ('0000000000000000000000000000000000000905', 'Sort006', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'basxEt5', 'DOM_XY', 'TOPIC',     'Lorem ipsum dolor sit amet.', 'Max', '', '', '', '', '', '', '', '');
+INSERT INTO TASKANA.WORKBASKET VALUES ('0000000000000000000000000000000000000906', 'SOrt007', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'basxeT6', 'DOM_XY', 'TOPIC',     'Lorem ipsum dolor sit amet.', 'Max', '', '', '', '', '', '', '', '');
+INSERT INTO TASKANA.WORKBASKET VALUES ('0000000000000000000000000000000000000907', 'SoRt008', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'BAsxet7', 'DOM_XY', 'TOPIC',     'Lorem ipsum dolor sit amet.', 'Max', '', '', '', '', '', '', '', '');
+INSERT INTO TASKANA.WORKBASKET VALUES ('0000000000000000000000000000000000000908', 'SorT009', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'BaSxet8', 'DOM_XY', 'TOPIC',     'Lorem ipsum dolor sit amet.', 'Max', '', '', '', '', '', '', '', '');
+INSERT INTO TASKANA.WORKBASKET VALUES ('0000000000000000000000000000000000000909', 'Sort010', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'BasXet9', 'DOM_XY', 'TOPIC',     'Lorem ipsum dolor sit amet.', 'Max', '', '', '', '', '', '', '', '');