diff --git a/src/main/java/de/ids_mannheim/korap/annotation/ResourceParser.java b/src/main/java/de/ids_mannheim/korap/annotation/ResourceParser.java
index f617618..fb9eed0 100644
--- a/src/main/java/de/ids_mannheim/korap/annotation/ResourceParser.java
+++ b/src/main/java/de/ids_mannheim/korap/annotation/ResourceParser.java
@@ -44,6 +44,8 @@
     public static String RESOURCE_FILE = "resources.json";
     public static ObjectMapper mapper = new ObjectMapper();
 
+    private double apiVersion = 1.0;
+    
     public void run () throws IOException, KustvaktException {
         InputStream is = null;
         File f = new File("data/"+RESOURCE_FILE);
@@ -69,11 +71,11 @@
             if (requiredAccess.isEmpty()){
 				if (!corpusQuery.isEmpty()) {
 					String koralQuery = queryService
-							.serializeCorpusQuery(corpusQuery, 1.0);
+							.serializeCorpusQuery(corpusQuery, apiVersion);
 					// assume all vc are not cached and use the given koralQuery
 					// for cached-vc, the koralQuery should contain referTo
 					CorpusAccess access = queryService.determineRequiredAccess(
-							false, resourceId, koralQuery);
+							false, resourceId, koralQuery, apiVersion);
 					requiredAccess = access.name();
 				}
             }
diff --git a/src/main/java/de/ids_mannheim/korap/rewrite/AvailabilityRewrite.java b/src/main/java/de/ids_mannheim/korap/rewrite/AvailabilityRewrite.java
index 934efd0..d0c0f38 100644
--- a/src/main/java/de/ids_mannheim/korap/rewrite/AvailabilityRewrite.java
+++ b/src/main/java/de/ids_mannheim/korap/rewrite/AvailabilityRewrite.java
@@ -3,7 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.text.CaseUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -44,6 +43,8 @@
 public class AvailabilityRewrite implements RewriteTask.RewriteQuery {
 
     public static Logger jlog = LogManager.getLogger(AvailabilityRewrite.class);
+    
+    private double apiVersion = 1.1; 
 
     public AvailabilityRewrite () {
         super();
@@ -104,10 +105,10 @@
         return actualAvailabilities;
     }
 
-    @Override
-    public KoralNode rewriteQuery (KoralNode koralNode, KustvaktConfiguration config,
-            User user) throws KustvaktException {
-        JsonNode jsonNode = koralNode.rawNode();
+	@Override
+	public KoralNode rewriteQuery (KoralNode koralNode,
+			KustvaktConfiguration config, User user) throws KustvaktException {
+		JsonNode jsonNode = koralNode.rawNode();
 
         FullConfiguration fullConfig = (FullConfiguration) config;
         CorpusAccess corpusAccess = user.getCorpusAccess();
@@ -117,16 +118,21 @@
 
         String availabilityQuery = getCorpusQuery(corpusAccess, fullConfig);
         
-        if (jsonNode.has("collection")) {
+        String collectionNodeName = (apiVersion >= 1.1) ? "corpus"
+				: "collection";
+        
+        if (jsonNode.has(collectionNodeName)) {
             if (jsonNode.toString().contains("availability")) {
             	List<String> actualAvalability = new ArrayList<>();
                 actualAvalability.addAll(availabilityRules);
 
-                actualAvalability = checkAvailability(jsonNode.at("/collection"),
-                		availabilityRules, actualAvalability, false);
-                if (!actualAvalability.isEmpty()) {
-                	createOperationAnd(availabilityQuery, jsonNode,
-    						corpusAccessName, koralNode);
+				actualAvalability = checkAvailability(
+						jsonNode.at("/" + collectionNodeName),
+						availabilityRules, actualAvalability, false);
+				if (!actualAvalability.isEmpty()) {
+					createOperationAnd(availabilityQuery, jsonNode,
+							corpusAccessName, koralNode, apiVersion,
+							collectionNodeName);
                 	
 //                    builder.with(availabilityQuery);
 //                    builder.setBaseQuery(builder.toJSON());
@@ -136,45 +142,49 @@
 			}
 			else {
 				createOperationAnd(availabilityQuery, jsonNode,
-						corpusAccessName, koralNode);
+						corpusAccessName, koralNode, apiVersion,
+						collectionNodeName);
 			}
         }
 		else {
 			KoralCollectionQueryBuilder builder = 
-					new KoralCollectionQueryBuilder();
+					new KoralCollectionQueryBuilder(apiVersion);
 			builder.with(availabilityQuery);
 			JsonNode rewrittenNode = JsonUtils.readTree(builder.toJSON())
-					.at("/collection");
+					.at("/"+collectionNodeName);
 			
 			RewriteIdentifier identifier = new RewriteIdentifier(null, null,
-						corpusAccessName + " corpus access policy has been added.");
-			koralNode.set("collection", rewrittenNode, identifier);
+					corpusAccessName + " corpus access policy has been added.");
+			koralNode.set(collectionNodeName, rewrittenNode, identifier);
 		}
 
-        koralNode = koralNode.at("/collection");
+        koralNode = koralNode.at("/"+collectionNodeName);
         return koralNode;
     }
     
     private void createOperationAnd (String availabilityQuery,
-			JsonNode jsonNode, String corpusAccessName, KoralNode node)
+			JsonNode jsonNode, String corpusAccessName, KoralNode node,
+			double apiVersion, String collectionNodeName)
 			throws KustvaktException {
 
 		KoralCollectionQueryBuilder availabilityBuilder = 
-				new KoralCollectionQueryBuilder();
+				new KoralCollectionQueryBuilder(apiVersion);
 		availabilityBuilder.with(availabilityQuery);
 		JsonNode availabilityNode = JsonUtils
 				.readTree(availabilityBuilder.toJSON());
 
-		String source = jsonNode.at("/collection").toString();
+		String source = jsonNode.at("/"+collectionNodeName).toString();
 		JsonNode sourceNode = JsonUtils.readTree(source);
 
-		KoralCollectionQueryBuilder builder = new KoralCollectionQueryBuilder();
-		// Base query must contains collection
+		KoralCollectionQueryBuilder builder = 
+				new KoralCollectionQueryBuilder(apiVersion);
+		// Base query must contains collection or corpus node
 		builder.setBaseQuery(availabilityNode);
-		JsonNode rewrittenNode = builder.mergeWith(jsonNode).at("/collection");
+		JsonNode rewrittenNode = builder.mergeWith(jsonNode)
+				.at("/" + collectionNodeName);
 		RewriteIdentifier identifier = new RewriteIdentifier(null, sourceNode,
 				corpusAccessName + " corpus access policy has been added.");
-		node.replace("collection", rewrittenNode, identifier);
+		node.replace(collectionNodeName, rewrittenNode, identifier);
 	}
     
     private List<String> getAvailabilityRules (CorpusAccess access,
diff --git a/src/main/java/de/ids_mannheim/korap/rewrite/CollectionCleanRewrite.java b/src/main/java/de/ids_mannheim/korap/rewrite/CollectionCleanRewrite.java
index 5aacdd5..0ac1de3 100644
--- a/src/main/java/de/ids_mannheim/korap/rewrite/CollectionCleanRewrite.java
+++ b/src/main/java/de/ids_mannheim/korap/rewrite/CollectionCleanRewrite.java
@@ -13,6 +13,8 @@
  * EM: not used anymore. This rewrite was to remove an empty koral:doc
  * group in operands.
  * 
+ * EM: legacy "collection" term should be replaced with "corpus".
+ * 
  * @author hanl
  * @date 28/07/2015
  */
diff --git a/src/main/java/de/ids_mannheim/korap/rewrite/CollectionConstraint.java b/src/main/java/de/ids_mannheim/korap/rewrite/CollectionConstraint.java
index 979602e..6342dbb 100644
--- a/src/main/java/de/ids_mannheim/korap/rewrite/CollectionConstraint.java
+++ b/src/main/java/de/ids_mannheim/korap/rewrite/CollectionConstraint.java
@@ -10,6 +10,8 @@
  * EM: not used anymore. This rewrite was meant to remove doc from
  * a collection by checking user access to the doc.
  * 
+ * EM: legacy "collection" term should be replaced with "corpus".
+ * 
  * @author hanl
  * @date 03/07/2015
  */
diff --git a/src/test/java/de/ids_mannheim/korap/misc/LocalQueryTest.java b/src/test/java/de/ids_mannheim/korap/misc/LocalQueryTest.java
index 9591a0e..d0edbf0 100644
--- a/src/test/java/de/ids_mannheim/korap/misc/LocalQueryTest.java
+++ b/src/test/java/de/ids_mannheim/korap/misc/LocalQueryTest.java
@@ -24,6 +24,8 @@
 public class LocalQueryTest extends SpringJerseyTest {
 
     private static String index;
+    
+    private double apiVersion = 1.0;
 
     @Autowired
     KustvaktConfiguration config;
@@ -40,7 +42,8 @@
         // qstring = "textType = Aphorismus";
         // qstring = "title ~ \"Werther\"";
         SearchKrill krill = new SearchKrill(index);
-        KoralCollectionQueryBuilder coll = new KoralCollectionQueryBuilder();
+        KoralCollectionQueryBuilder coll = 
+        		new KoralCollectionQueryBuilder(apiVersion);
         coll.with(qstring);
         String stats = krill.getStatistics(coll.toJSON());
         assert stats != null && !stats.isEmpty() && !stats.equals("null");
@@ -49,7 +52,7 @@
     @Test
     public void testCollQuery () throws IOException, KustvaktException {
         String qstring = "creationDate since 1800 & creationDate until 1820";
-        CollectionQueryProcessor processor = new CollectionQueryProcessor();
+        CollectionQueryProcessor processor = new CollectionQueryProcessor(1.0);
         processor.process(qstring);
         String s = JsonUtils.toJSON(processor.getRequestMap());
         KrillCollection c = new KrillCollection(s);
diff --git a/src/test/java/de/ids_mannheim/korap/rewrite/AvailabilityRewriteTest.java b/src/test/java/de/ids_mannheim/korap/rewrite/AvailabilityRewriteTest.java
index d087e60..5e07b05 100644
--- a/src/test/java/de/ids_mannheim/korap/rewrite/AvailabilityRewriteTest.java
+++ b/src/test/java/de/ids_mannheim/korap/rewrite/AvailabilityRewriteTest.java
@@ -3,6 +3,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -24,7 +25,10 @@
     public KustvaktConfiguration config;
     
     private double apiVersion = Double.parseDouble(API_VERSION.substring(1));
+    private String collectionNodeName = (apiVersion >= 1.1) ? "corpus"
+			: "collection";
 
+    @Disabled
     @Test
     public void testCollectionNodeRemoveCorpusIdNoErrors ()
             throws KustvaktException {
@@ -37,12 +41,13 @@
         JsonNode node = JsonUtils.readTree(handler.processQuery(result,
                 User.UserFactory.getUser("test_user")));
         assertNotNull(node);
-        assertEquals(1, node.at("/collection/operands").size());
+        assertEquals(1, node.at("/"+collectionNodeName+"/operands").size());
     }
 
     @Test
     public void testCollectionNodeDeletionNotification () {}
 
+    @Disabled
     @Test
     public void testCollectionNodeRemoveAllCorpusIdNoErrors ()
             throws KustvaktException {
@@ -55,11 +60,12 @@
         JsonNode node = JsonUtils.readTree(handler.processQuery(result,
                 User.UserFactory.getUser("test_user")));
         assertNotNull(node);
-        assertEquals(0, node.at("/collection/operands").size());
-        assertEquals("koral:rewrite",
-            node.at("/collection/rewrites/0/@type").asText());
+        assertEquals(0, node.at("/"+collectionNodeName+"/operands").size());
+        assertEquals("koral:rewrite", 
+        		node.at("/"+collectionNodeName+"/rewrites/0/@type").asText());
     }
-
+    
+    @Disabled
     @Test
     public void testCollectionNodeRemoveGroupedCorpusIdNoErrors ()
             throws KustvaktException {
@@ -74,14 +80,15 @@
                 User.UserFactory.getUser("test_user")));
         assertNotNull(node);
         assertEquals("koral:docGroup",
-            node.at("/collection/operands/0/@type").asText());
-        assertEquals("textClass",
-            node.at("/collection/operands/0/operands/0/key").asText());
+        		node.at("/"+collectionNodeName+"/operands/0/@type").asText());
+        assertEquals("textClass", 
+        		node.at("/"+collectionNodeName+"/operands/0/operands/0/key").asText());
         assertEquals("koral:rewrite",
-            node.at("/collection/rewrites/0/@type").asText());
+        		node.at("/"+collectionNodeName+"/rewrites/0/@type").asText());
     }
 
     // fixme: will probably fail when one doc groups are being refactored
+    @Disabled
     @Test
     public void testCollectionCleanEmptyDocGroupNoErrors ()
             throws KustvaktException {
@@ -96,16 +103,17 @@
         JsonNode node = JsonUtils.readTree(handler.processQuery(result,
                 User.UserFactory.getUser("test_user")));
         assertNotNull(node);
-        assertEquals("koral:docGroup", node.at("/collection/@type").asText());
-        assertEquals(2, node.at("/collection/operands").size());
-        assertEquals("textClass",
-            node.at("/collection/operands/0/key").asText());
-        assertEquals("textClass",
-            node.at("/collection/operands/1/key").asText());
-        assertEquals("koral:rewrite",
-            node.at("/collection/rewrites/0/@type").asText());
+        assertEquals("koral:docGroup", node.at("/"+collectionNodeName+"/@type").asText());
+        assertEquals(2, node.at("/"+collectionNodeName+"/operands").size());
+		assertEquals("textClass",
+				node.at("/" + collectionNodeName + "/operands/0/key").asText());
+		assertEquals("textClass",
+				node.at("/" + collectionNodeName + "/operands/1/key").asText());
+		assertEquals("koral:rewrite", node
+				.at("/" + collectionNodeName + "/rewrites/0/@type").asText());
     }
 
+    @Disabled
     @Test
     public void testCollectionCleanMoveOneDocFromGroupUpNoErrors ()
             throws KustvaktException {
@@ -119,13 +127,16 @@
         JsonNode node = JsonUtils.readTree(handler.processQuery(result,
                 User.UserFactory.getUser("test_user")));
         assertNotNull(node);
-        assertEquals("koral:doc", node.at("/collection/@type").asText());
-        assertEquals("textClass", node.at("/collection/key").asText());
-        assertEquals("wissenschaft", node.at("/collection/value").asText());
+        assertEquals("koral:doc", node.at("/"+collectionNodeName+"/@type").asText());
+        assertEquals("textClass", 
+        		node.at("/"+collectionNodeName+"/key").asText());
+        assertEquals("wissenschaft",
+        		node.at("/"+collectionNodeName+"/value").asText());
         assertEquals("koral:rewrite",
-            node.at("/collection/rewrites/0/@type").asText());
+        		node.at("/"+collectionNodeName+"/rewrites/0/@type").asText());
     }
 
+    @Disabled
     @Test
     public void testCollectionCleanEmptyGroupAndMoveOneFromGroupUpNoErrors ()
             throws KustvaktException {
@@ -140,12 +151,13 @@
         JsonNode node = JsonUtils.readTree(handler.processQuery(result,
                 User.UserFactory.getUser("test_user")));
         assertNotNull(node);
-        assertEquals("koral:doc", node.at("/collection/@type").asText());
-        assertEquals("textClass", node.at("/collection/key").asText());
-        assertEquals("koral:rewrite",
-            node.at("/collection/rewrites/0/@type").asText());
+        assertEquals("koral:doc", node.at("/"+collectionNodeName+"/@type").asText());
+        assertEquals("textClass", node.at("/"+collectionNodeName+"/key").asText());
+        assertEquals("koral:rewrite", 
+        		node.at("/"+collectionNodeName+"/rewrites/0/@type").asText());
     }
 
+    @Disabled
     @Test
     public void testCollectionRemoveAndMoveOneFromGroupUpNoErrors ()
             throws KustvaktException {
@@ -160,33 +172,14 @@
         JsonNode node = JsonUtils.readTree(handler.processQuery(org,
                 User.UserFactory.getUser("test_user")));
         assertNotNull(node);
-        assertEquals("koral:docGroup", node.at("/collection/@type").asText());
-        assertEquals(2, node.at("/collection/operands").size());
+        assertEquals("koral:docGroup",
+        		node.at("/"+collectionNodeName+"/@type").asText());
+        assertEquals(2, node.at("/"+collectionNodeName+"/operands").size());
         assertEquals("koral:doc",
-            node.at("/collection/operands/0/@type").asText());
-        assertEquals("koral:doc",
-            node.at("/collection/operands/1/@type").asText());
-        assertEquals("koral:rewrite",
-            node.at("/collection/rewrites/0/@type").asText());
-    }
-
-    @Test
-    public void testPublicCollectionRewriteEmptyAdd ()
-            throws KustvaktException {
-        RewriteHandler handler = new RewriteHandler(config);
-        handler.add(AvailabilityRewrite.class);
-        QuerySerializer s = new QuerySerializer(apiVersion);
-        s.setQuery(TestVariables.SIMPLE_ADD_QUERY, "poliqarp");
-        String org = s.toJSON();
-        JsonNode node = JsonUtils.readTree(handler.processQuery(org,
-                User.UserFactory.getUser("test_user")));
-        assertNotNull(node);
-        assertEquals("availability", node.at("/collection/key").asText());
-        assertEquals("CC.*", node.at("/collection/value").asText());
-        assertEquals("koral:rewrite",
-            node.at("/collection/rewrites/0/@type").asText());
-        assertEquals(freeCorpusAccess,
-        		node.at("/collection/rewrites/0/_comment").asText());
+        		node.at("/"+collectionNodeName+"/operands/0/@type").asText());
+        assertEquals("koral:doc", node.at("/"+collectionNodeName+"/operands/1/@type").asText());
+        assertEquals("koral:rewrite", 
+        		node.at("/"+collectionNodeName+"/rewrites/0/@type").asText());
     }
 
     @Test
@@ -201,21 +194,42 @@
         JsonNode node = JsonUtils.readTree(handler.processQuery(org,
                 User.UserFactory.getUser("test_user")));
         assertNotNull(node);
-        assertEquals(2, node.at("/collection/operands").size());
+        assertEquals(2, node.at("/"+collectionNodeName+"/operands").size());
         assertEquals("availability",
-            node.at("/collection/operands/0/key").asText());
+        		node.at("/"+collectionNodeName+"/operands/0/key").asText());
         assertEquals("CC.*",
-            node.at("/collection/operands/0/value").asText());
+        		node.at("/"+collectionNodeName+"/operands/0/value").asText());
         assertEquals("docSigle",
-            node.at("/collection/operands/1/operands/0/key").asText());
-        assertEquals("textClass",
-            node.at("/collection/operands/1/operands/1/key").asText());
-        assertEquals("koral:rewrite",
-            node.at("/collection/rewrites/0/@type").asText());
-//        assertEquals(node.at("/collection/rewrites/0/scope").asText(),
+        		node.at("/"+collectionNodeName+"/operands/1/operands/0/key").asText());
+        assertEquals("textClass", 
+        		node.at("/"+collectionNodeName+"/operands/1/operands/1/key").asText());
+        assertEquals("koral:rewrite", 
+        		node.at("/"+collectionNodeName+"/rewrites/0/@type").asText());
+//        assertEquals(node.at("/"+collectionNodeName+"/rewrites/0/scope").asText(),
 //                "availability(FREE)");
     }
+    
+    @Test
+    public void testPublicCollectionRewriteEmptyAdd ()
+            throws KustvaktException {
+        RewriteHandler handler = new RewriteHandler(config);
+        handler.add(AvailabilityRewrite.class);
+        QuerySerializer s = new QuerySerializer(apiVersion);
+        s.setQuery(TestVariables.SIMPLE_ADD_QUERY, "poliqarp");
+        String org = s.toJSON();
+        JsonNode node = JsonUtils.readTree(handler.processQuery(org,
+                User.UserFactory.getUser("test_user")));
+        assertNotNull(node);
+        assertEquals(node.at("/"+collectionNodeName+"/key").asText(), "availability");
+        assertEquals(node.at("/"+collectionNodeName+"/value").asText(), "CC.*");
+        assertEquals(node.at("/"+collectionNodeName+"/rewrites/0/@type").asText(),
+                "koral:rewrite");
+        assertEquals(freeCorpusAccess,
+        		node.at("/"+collectionNodeName+"/rewrites/0/_comment").asText());
+    }
 
+
+    @Disabled
     @Test
     public void testRemoveCorpusFromDifferentGroups ()
             throws KustvaktException {
@@ -229,18 +243,22 @@
         JsonNode node = JsonUtils.readTree(handler.processQuery(org,
                 User.UserFactory.getUser("test_user")));
         assertNotNull(node);
-        assertEquals("koral:docGroup", node.at("/collection/@type").asText());
-        assertEquals(2, node.at("/collection/operands").size());
+        assertEquals("koral:docGroup", 
+        		node.at("/"+collectionNodeName+"/@type").asText());
+        assertEquals(2, node.at("/"+collectionNodeName+"/operands").size());
         assertEquals("koral:docGroup",
-            node.at("/collection/operands/0/@type").asText());
+        		node.at("/"+collectionNodeName+"/operands/0/@type").asText());
         assertEquals("koral:docGroup",
-            node.at("/collection/operands/1/@type").asText());
-        assertEquals(1, node.at("/collection/operands/0/operands").size());
-        assertEquals(1, node.at("/collection/operands/1/operands").size());
+        		node.at("/"+collectionNodeName+"/operands/1/@type").asText());
+        assertEquals(1, node.at("/"+collectionNodeName+"/operands/0/operands")
+        		.size());
+        assertEquals(1, node.at("/"+collectionNodeName+"/operands/1/operands")
+        		.size());
         assertEquals("koral:rewrite",
-            node.at("/collection/rewrites/0/@type").asText());
+        		node.at("/"+collectionNodeName+"/rewrites/0/@type").asText());
     }
 
+    @Disabled
     @Test
     public void testRemoveOneCorpusAndMoveDocFromTwoGroups ()
             throws KustvaktException {
@@ -256,23 +274,22 @@
         JsonNode node = JsonUtils.readTree(handler.processQuery(org,
                 User.UserFactory.getUser("test_user")));
         assertNotNull(node);
-        assertEquals("koral:docGroup", node.at("/collection/@type").asText());
-        assertEquals(2, node.at("/collection/operands").size());
-        assertEquals("koral:doc",
-            node.at("/collection/operands/0/@type").asText());
-        assertEquals("koral:doc",
-            node.at("/collection/operands/0/@type").asText());
-        assertEquals("textClass",
-            node.at("/collection/operands/0/key").asText());
-        assertEquals("wissenschaft",
-            node.at("/collection/operands/0/value").asText());
-        assertEquals("koral:doc",
-            node.at("/collection/operands/1/@type").asText());
-        assertEquals("textClass",
-            node.at("/collection/operands/1/key").asText());
-        assertEquals("freizeit",
-            node.at("/collection/operands/1/value").asText());
-        assertEquals("koral:rewrite",
-            node.at("/collection/rewrites/0/@type").asText());
+
+        assertEquals("koral:docGroup", node.at("/"+collectionNodeName+"/@type").asText());
+        assertEquals(2, node.at("/"+collectionNodeName+"/operands").size());
+		assertEquals("koral:doc", node
+				.at("/" + collectionNodeName + "/operands/0/@type").asText());
+		assertEquals("textClass",
+				node.at("/" + collectionNodeName + "/operands/0/key").asText());
+		assertEquals("wissenschaft", node
+				.at("/" + collectionNodeName + "/operands/0/value").asText());
+		assertEquals("koral:doc", node
+				.at("/" + collectionNodeName + "/operands/1/@type").asText());
+		assertEquals("textClass",
+				node.at("/" + collectionNodeName + "/operands/1/key").asText());
+		assertEquals("freizeit", node
+				.at("/" + collectionNodeName + "/operands/1/value").asText());
+		assertEquals("koral:rewrite", node
+				.at("/" + collectionNodeName + "/rewrites/0/@type").asText());
     }
 }
diff --git a/src/test/java/de/ids_mannheim/korap/web/controller/StatisticsControllerTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/StatisticsControllerTest.java
index 97b50c6..5391e59 100644
--- a/src/test/java/de/ids_mannheim/korap/web/controller/StatisticsControllerTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/controller/StatisticsControllerTest.java
@@ -180,7 +180,8 @@
         JsonNode node = JsonUtils.readTree(ent);
         assertEquals(de.ids_mannheim.korap.util.StatusCodes.MISSING_COLLECTION,
                 node.at("/errors/0/0").asInt());
-        assertTrue(node.at("/errors/0/1").asText().contains(" is not found"));
+        assertEquals("VC is not found",
+                node.at("/errors/0/1").asText());
     }
 
     @Test
diff --git a/src/test/java/de/ids_mannheim/korap/web/lite/LiteStatisticControllerTest.java b/src/test/java/de/ids_mannheim/korap/web/lite/LiteStatisticControllerTest.java
index 2de23f7..0c24533 100644
--- a/src/test/java/de/ids_mannheim/korap/web/lite/LiteStatisticControllerTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/lite/LiteStatisticControllerTest.java
@@ -89,11 +89,11 @@
                 .post(Entity.json("{}"));
         assertEquals(Status.BAD_REQUEST.getStatusCode(), response.getStatus());
         String ent = response.readEntity(String.class);
-        JsonNode node = JsonUtils.readTree(ent);
-        assertEquals(de.ids_mannheim.korap.util.StatusCodes.MISSING_COLLECTION,
-            node.at("/errors/0/0").asInt());
-        assertTrue(node.at("/errors/0/1").asText().contains(" is not found"));
-    }
+		JsonNode node = JsonUtils.readTree(ent);
+		assertEquals(de.ids_mannheim.korap.util.StatusCodes.MISSING_COLLECTION,
+				node.at("/errors/0/0").asInt());
+		assertEquals("VC is not found", node.at("/errors/0/1").asText());
+	}
 
     @Test
     public void testGetStatisticsWithIncorrectJson ()