diff --git a/src/main/antlr/cosmas/c2ps.g b/src/main/antlr/cosmas/c2ps.g
index 5a5d46d..ed56030 100644
--- a/src/main/antlr/cosmas/c2ps.g
+++ b/src/main/antlr/cosmas/c2ps.g
@@ -9,7 +9,6 @@
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
 grammar c2ps;
-//import c2ps_regex;
 
 options { output=AST; backtrack=true; k=5;}
 tokens  {C2PQ; OPBED; OPTS; OPBEG; OPEND; OPNHIT; OPALL; OPLEM; OPPROX;
@@ -139,7 +138,6 @@
 fragment RE_alter    : ( ( RE_char | RE_chgroup ) '|' RE_expr )+;
 fragment RE_chgroup  : '[' RE_char+ ']';
 fragment RE_chars    : (RE_char | RE_chgroup | ( '(' RE_expr ')')) (('+'|'*'|FOCC)'?'? |'?')? ;
-//fragment RE_expr   : (RE_char | RE_alter | RE_chgroup | RE_group)+;
 fragment RE_expr   : (RE_alter | RE_chars)+;
 fragment REGEX       : '"'  (RE_expr | '\'' | ':' )* '"';
 
@@ -155,17 +153,6 @@
 	| WORD '/' WORD '!'? '=' WORD ':' (WORD|REGEX)
 	;
 
-/*
-fragment MORPHEXPR
-	: (WORD|regex)
-	| WORD ':' (WORD|regex)
-	| WORD '!'? '=' (WORD|regex) 
-	| WORD '!'? '=' WORD ':' (WORD|regex)
-	| WORD '/' WORD '!'? '=' (WORD|regex)
-	| WORD '/' WORD '!'? '=' WORD ':' (WORD|regex)
-	;
-*/
-	
 OP_MORPH:	'MORPH(' 
 				MORPHEXPR (' '* '&' ' '* MORPHEXPR)* ' '* 
 			')' ;
@@ -176,7 +163,6 @@
 //
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
-
 c2ps_query 
 	:	searchExpr EOF -> ^(C2PQ searchExpr);
 
diff --git a/src/main/java/de/ids_mannheim/korap/query/serialize/Cosmas2QueryProcessor.java b/src/main/java/de/ids_mannheim/korap/query/serialize/Cosmas2QueryProcessor.java
index b3e1d45..cabf32c 100644
--- a/src/main/java/de/ids_mannheim/korap/query/serialize/Cosmas2QueryProcessor.java
+++ b/src/main/java/de/ids_mannheim/korap/query/serialize/Cosmas2QueryProcessor.java
@@ -492,14 +492,14 @@
         ((ArrayList<Object>) classRefCheck.get("operands")).add(posgroup);
         LinkedHashMap<String, Object> focusGroup = null;
         if ((boolean) positionOptions.get("matchall") == true) {
-            focusGroup = KoralObjectGenerator.makeResetReference();
+            focusGroup = KoralObjectGenerator.makeClassRefOp("classRefOp:delete", 
+                    new Integer[]{128+classCounter++}, 128+classCounter);
             ((ArrayList<Object>) focusGroup.get("operands")).add(classRefCheck);
         }
         else { // match only first argument
             focusGroup = KoralObjectGenerator.wrapInReference(classRefCheck,
-                    128 + classCounter - 1);
+                    128 + classCounter);
         }
-        System.err.println(positionOptions);
         // wrap in 'merge' operation if grouping option is set
         if (positionOptions.containsKey("grouping")) {
             if (positionOptions.get("grouping").equals(true)) {
diff --git a/src/main/java/de/ids_mannheim/korap/query/serialize/util/KoralObjectGenerator.java b/src/main/java/de/ids_mannheim/korap/query/serialize/util/KoralObjectGenerator.java
index 45135ef..804b8f9 100644
--- a/src/main/java/de/ids_mannheim/korap/query/serialize/util/KoralObjectGenerator.java
+++ b/src/main/java/de/ids_mannheim/korap/query/serialize/util/KoralObjectGenerator.java
@@ -237,6 +237,7 @@
         return makeReference(classRef, false);
     }
 
+    @Deprecated
     public static LinkedHashMap<String, Object> makeResetReference() {
         LinkedHashMap<String, Object> group = new LinkedHashMap<String, Object>();
         group.put("@type", "korap:reference");
diff --git a/src/test/java/Cosmas2QueryProcessorTest.java b/src/test/java/Cosmas2QueryProcessorTest.java
deleted file mode 100644
index e9c1815..0000000
--- a/src/test/java/Cosmas2QueryProcessorTest.java
+++ /dev/null
@@ -1,1172 +0,0 @@
-import static org.junit.Assert.*;
-
-import java.io.IOException;
-import java.util.ArrayList;
-
-import org.junit.Test;
-
-import de.ids_mannheim.korap.query.serialize.QuerySerializer;
-import de.ids_mannheim.korap.query.serialize.util.StatusCodes;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-/**
- * Tests for JSON-LD serialization of Cosmas II queries. 
- * @author Joachim Bingel (bingel@ids-mannheim.de)
- * @version 1.0
- */
-public class Cosmas2QueryProcessorTest {
-
-
-	String query;
-	ArrayList<JsonNode> operands;
-
-	QuerySerializer qs = new QuerySerializer();
-	ObjectMapper mapper = new ObjectMapper();
-	JsonNode res;
-
-	@Test
-	public void testContext() throws JsonProcessingException, IOException {
-		String contextString = "http://ids-mannheim.de/ns/KorAP/json-ld/v0.2/context.jsonld";
-		query = "foo";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals(contextString, res.get("@context").asText());
-	}
-
-
-	@Test
-	public void testSingleToken() throws JsonProcessingException, IOException {
-		query = "der";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:token", 		res.at("/query/@type").asText());
-		assertEquals("korap:term", 			res.at("/query/wrap/@type").asText());
-		assertEquals("der", 				res.at("/query/wrap/key").asText());
-		assertEquals("orth", 				res.at("/query/wrap/layer").asText());
-		assertEquals("match:eq",			res.at("/query/wrap/match").asText());
-
-		query = "&Mann";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:token", 		res.at("/query/@type").asText());
-		assertEquals("korap:term", 			res.at("/query/wrap/@type").asText());
-		assertEquals("Mann", 				res.at("/query/wrap/key").asText());
-		assertEquals("lemma", 				res.at("/query/wrap/layer").asText());
-		assertEquals("match:eq",			res.at("/query/wrap/match").asText());
-	}
-
-
-
-	@Test
-	public void testWildcardToken() throws JsonProcessingException, IOException {
-		query = "*der";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:term", 			res.at("/query/wrap/@type").asText());
-		assertEquals("type:wildcard",		res.at("/query/wrap/type").asText());
-		assertEquals("*der", 				res.at("/query/wrap/key").asText());
-		assertEquals("orth", 				res.at("/query/wrap/layer").asText());
-		assertEquals("match:eq",			res.at("/query/wrap/match").asText());
-
-		query = "*de*?r";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("*de*?r", 				res.at("/query/wrap/key").asText());
-	}
-	//	
-	@Test
-	public void testCaseSensitivityFlag() throws JsonProcessingException, IOException {
-		query = "$deutscher";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:term", 			res.at("/query/wrap/@type").asText());
-		assertEquals("deutscher",			res.at("/query/wrap/key").asText());
-		assertEquals(true,					res.at("/query/wrap/caseInsensitive").asBoolean());
-		assertEquals("orth", 				res.at("/query/wrap/layer").asText());
-		assertEquals("match:eq",			res.at("/query/wrap/match").asText());
-
-		query = "$deutscher Bundestag";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:group",			res.at("/query/@type").asText());
-		assertEquals("operation:sequence",	res.at("/query/operation").asText());
-		assertEquals("korap:term", 			res.at("/query/operands/0/wrap/@type").asText());
-		assertEquals("deutscher",			res.at("/query/operands/0/wrap/key").asText());
-		assertEquals(true,					res.at("/query/operands/0/wrap/caseInsensitive").asBoolean());
-		assertEquals("orth", 				res.at("/query/operands/0/wrap/layer").asText());
-		assertEquals("match:eq",			res.at("/query/operands/0/wrap/match").asText());
-		assertEquals("Bundestag",			res.at("/query/operands/1/wrap/key").asText());
-		assertEquals(true,					res.at("/query/operands/1/wrap/caseInsensitive").isMissingNode());
-	}
-
-	@Test
-	public void testMORPH() throws JsonProcessingException, IOException {
-		query = "MORPH(p=V)";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:token",			res.at("/query/@type").asText());
-		assertEquals("korap:term", 			res.at("/query/wrap/@type").asText());
-		assertEquals("V",					res.at("/query/wrap/key").asText());
-		assertEquals("p",					res.at("/query/wrap/layer").asText());
-		assertEquals("match:eq",			res.at("/query/wrap/match").asText());
-
-		query = "MORPH(V)";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:token",			res.at("/query/@type").asText());
-		assertEquals("korap:term", 			res.at("/query/wrap/@type").asText());
-		assertEquals("V",					res.at("/query/wrap/key").asText());
-		assertEquals("match:eq",			res.at("/query/wrap/match").asText());
-
-		query = "MORPH(tt/p=V)";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:token",			res.at("/query/@type").asText());
-		assertEquals("korap:term", 			res.at("/query/wrap/@type").asText());
-		assertEquals("V",					res.at("/query/wrap/key").asText());
-		assertEquals("p",					res.at("/query/wrap/layer").asText());
-		assertEquals("tt",					res.at("/query/wrap/foundry").asText());
-		assertEquals("match:eq",			res.at("/query/wrap/match").asText());
-
-		query = "MORPH(tt/p=\"V.*\")";
-        qs.setQuery(query, "cosmas2");
-        res = mapper.readTree(qs.toJSON());
-        assertEquals("korap:token",         res.at("/query/@type").asText());
-        assertEquals("korap:term",          res.at("/query/wrap/@type").asText());
-        assertEquals("type:regex",          res.at("/query/wrap/type").asText());
-        assertEquals("V.*",                 res.at("/query/wrap/key").asText());
-        assertEquals("p",                   res.at("/query/wrap/layer").asText());
-        assertEquals("tt",                  res.at("/query/wrap/foundry").asText());
-        assertEquals("match:eq",            res.at("/query/wrap/match").asText());
-
-		query = "MORPH(mate/m=temp:pres)";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:token",			res.at("/query/@type").asText());
-		assertEquals("korap:term", 			res.at("/query/wrap/@type").asText());
-		assertEquals("temp",				res.at("/query/wrap/key").asText());
-		assertEquals("pres",				res.at("/query/wrap/value").asText());
-		assertEquals("m",					res.at("/query/wrap/layer").asText());
-		assertEquals("mate",				res.at("/query/wrap/foundry").asText());
-		assertEquals("match:eq",			res.at("/query/wrap/match").asText());
-
-		query = "MORPH(tt/p=V & mate/m!=temp:pres)";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:token",			res.at("/query/@type").asText());
-		assertEquals("korap:termGroup",		res.at("/query/wrap/@type").asText());
-		assertEquals("V",					res.at("/query/wrap/operands/0/key").asText());
-		assertEquals("p",					res.at("/query/wrap/operands/0/layer").asText());
-		assertEquals("tt",					res.at("/query/wrap/operands/0/foundry").asText());
-		assertEquals("match:eq",			res.at("/query/wrap/operands/0/match").asText());
-		assertEquals("temp",				res.at("/query/wrap/operands/1/key").asText());
-		assertEquals("pres",				res.at("/query/wrap/operands/1/value").asText());
-		assertEquals("m",					res.at("/query/wrap/operands/1/layer").asText());
-		assertEquals("mate",				res.at("/query/wrap/operands/1/foundry").asText());
-		assertEquals("match:ne",			res.at("/query/wrap/operands/1/match").asText());
-	}
-
-	@Test
-	public void testSequence() throws JsonProcessingException, IOException {
-		query = "der Mann";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:group",			res.at("/query/@type").asText());
-		assertEquals("operation:sequence",	res.at("/query/operation").asText());
-		assertEquals("der",					res.at("/query/operands/0/wrap/key").asText());
-		assertEquals("Mann",				res.at("/query/operands/1/wrap/key").asText());
-		assertEquals(true,					res.at("/query/operands/2").isMissingNode());
-
-		query = "der Mann schläft";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:group",			res.at("/query/@type").asText());
-		assertEquals("operation:sequence",	res.at("/query/operation").asText());
-		assertEquals("der",					res.at("/query/operands/0/wrap/key").asText());
-		assertEquals("Mann",				res.at("/query/operands/1/wrap/key").asText());
-		assertEquals("schläft",				res.at("/query/operands/2/wrap/key").asText());
-		assertEquals(true,					res.at("/query/operands/3").isMissingNode());
-
-		query = "der Mann schläft lang";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:group",			res.at("/query/@type").asText());
-		assertEquals("operation:sequence",	res.at("/query/operation").asText());
-		assertEquals("der",					res.at("/query/operands/0/wrap/key").asText());
-		assertEquals("Mann",				res.at("/query/operands/1/wrap/key").asText());
-		assertEquals("schläft",				res.at("/query/operands/2/wrap/key").asText());
-		assertEquals("lang",				res.at("/query/operands/3/wrap/key").asText());
-		assertEquals(true,					res.at("/query/operands/4").isMissingNode());
-
-		query = "der #ELEM(W)";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:group",			res.at("/query/@type").asText());
-		assertEquals("operation:sequence",	res.at("/query/operation").asText());
-		assertEquals("der",					res.at("/query/operands/0/wrap/key").asText());
-		assertEquals("w",					res.at("/query/operands/1/key").asText());
-		assertEquals("korap:span",			res.at("/query/operands/1/@type").asText());
-		assertEquals(true,					res.at("/query/operands/2").isMissingNode());
-
-		query = "der #ELEM(W) Mann";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:group",			res.at("/query/@type").asText());
-		assertEquals("operation:sequence",	res.at("/query/operation").asText());
-		assertEquals("der",					res.at("/query/operands/0/wrap/key").asText());
-		assertEquals("w",					res.at("/query/operands/1/key").asText());
-		assertEquals("korap:span",			res.at("/query/operands/1/@type").asText());
-		assertEquals("Mann",				res.at("/query/operands/2/wrap/key").asText());
-		assertEquals(true,					res.at("/query/operands/3").isMissingNode());
-
-		query = "der MORPH(p=ADJA) Mann";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:group",			res.at("/query/@type").asText());
-		assertEquals("operation:sequence",	res.at("/query/operation").asText());
-		assertEquals("der",					res.at("/query/operands/0/wrap/key").asText());
-		assertEquals("ADJA",				res.at("/query/operands/1/wrap/key").asText());
-		assertEquals("p",					res.at("/query/operands/1/wrap/layer").asText());
-		assertEquals("Mann",				res.at("/query/operands/2/wrap/key").asText());
-		assertEquals(true,					res.at("/query/operands/3").isMissingNode());
-	}
-
-	@Test
-	public void testOPOR() throws JsonProcessingException, IOException {
-		query = "Sonne oder Mond";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:group",			res.at("/query/@type").asText());
-		assertEquals("operation:or",		res.at("/query/operation").asText());
-		assertEquals("Sonne",				res.at("/query/operands/0/wrap/key").asText());
-		assertEquals("Mond",				res.at("/query/operands/1/wrap/key").asText());
-		assertEquals(true,					res.at("/query/operands/2").isMissingNode());
-
-		query = "(Sonne scheint) oder Mond";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:group",			res.at("/query/@type").asText());
-		assertEquals("operation:or",		res.at("/query/operation").asText());
-		assertEquals("korap:group",			res.at("/query/operands/0/@type").asText());
-		assertEquals("operation:sequence",	res.at("/query/operands/0/operation").asText());
-		assertEquals("Sonne",				res.at("/query/operands/0/operands/0/wrap/key").asText());
-		assertEquals("scheint",				res.at("/query/operands/0/operands/1/wrap/key").asText());
-		assertEquals("Mond",				res.at("/query/operands/1/wrap/key").asText());
-		assertEquals(true,					res.at("/query/operands/2").isMissingNode());
-
-		query = "(Sonne scheint) oder (Mond scheint)";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:group",			res.at("/query/@type").asText());
-		assertEquals("operation:or",		res.at("/query/operation").asText());
-		assertEquals("korap:group",			res.at("/query/operands/0/@type").asText());
-		assertEquals("operation:sequence",	res.at("/query/operands/0/operation").asText());
-		assertEquals("korap:group",			res.at("/query/operands/1/@type").asText());
-		assertEquals("operation:sequence",	res.at("/query/operands/1/operation").asText());
-		assertEquals("Sonne",				res.at("/query/operands/0/operands/0/wrap/key").asText());
-		assertEquals("scheint",				res.at("/query/operands/0/operands/1/wrap/key").asText());
-		assertEquals("Mond",				res.at("/query/operands/1/operands/0/wrap/key").asText());
-		assertEquals("scheint",				res.at("/query/operands/1/operands/1/wrap/key").asText());
-		assertEquals(true,					res.at("/query/operands/2").isMissingNode());
-	}
-
-	@Test
-	public void testOPORAND() throws JsonProcessingException, IOException {
-		query = "(Sonne oder Mond) und scheint";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:group",			res.at("/query/@type").asText());
-		assertEquals("operation:sequence",	res.at("/query/operation").asText());
-		assertEquals("cosmas:distance",		res.at("/query/distances/0/@type").asText());
-		assertEquals("t",					res.at("/query/distances/0/key").asText());
-		assertEquals(0,						res.at("/query/distances/0/min").asInt());
-		assertEquals(0,						res.at("/query/distances/0/max").asInt());
-		assertEquals("korap:group",			res.at("/query/operands/0/@type").asText());
-		assertEquals("operation:or",		res.at("/query/operands/0/operation").asText());
-		assertEquals("Sonne",				res.at("/query/operands/0/operands/0/wrap/key").asText());
-		assertEquals("Mond",				res.at("/query/operands/0/operands/1/wrap/key").asText());
-		assertEquals("korap:token",			res.at("/query/operands/1/@type").asText());
-		assertEquals("scheint",				res.at("/query/operands/1/wrap/key").asText());
-
-		query = "scheint und (Sonne oder Mond)";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:group",			res.at("/query/@type").asText());
-		assertEquals("operation:sequence",	res.at("/query/operation").asText());
-		assertEquals("cosmas:distance",		res.at("/query/distances/0/@type").asText());
-		assertEquals("t",					res.at("/query/distances/0/key").asText());
-		assertEquals(0,						res.at("/query/distances/0/min").asInt());
-		assertEquals(0,						res.at("/query/distances/0/max").asInt());
-		assertEquals("korap:token",			res.at("/query/operands/0/@type").asText());
-		assertEquals("scheint",				res.at("/query/operands/0/wrap/key").asText());
-		assertEquals("korap:group",			res.at("/query/operands/1/@type").asText());
-		assertEquals("operation:or",		res.at("/query/operands/1/operation").asText());
-		assertEquals("Sonne",				res.at("/query/operands/1/operands/0/wrap/key").asText());
-		assertEquals("Mond",				res.at("/query/operands/1/operands/1/wrap/key").asText());
-
-		query = "Regen und scheint und (Sonne oder Mond)";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:group",			res.at("/query/@type").asText());
-		assertEquals("operation:sequence",	res.at("/query/operation").asText());
-		assertEquals("cosmas:distance",		res.at("/query/distances/0/@type").asText());
-		assertEquals("t",					res.at("/query/distances/0/key").asText());
-		assertEquals(0,						res.at("/query/distances/0/min").asInt());
-		assertEquals(0,						res.at("/query/distances/0/max").asInt());
-		assertEquals("korap:token",			res.at("/query/operands/0/@type").asText());
-		assertEquals("Regen",				res.at("/query/operands/0/wrap/key").asText());
-		assertEquals("korap:group",			res.at("/query/@type").asText());
-		assertEquals("operation:sequence",	res.at("/query/operation").asText());
-		assertEquals("cosmas:distance",		res.at("/query/operands/1/distances/0/@type").asText());
-		assertEquals("t",					res.at("/query/operands/1/distances/0/key").asText());
-		assertEquals(0,						res.at("/query/operands/1/distances/0/min").asInt());
-		assertEquals(0,						res.at("/query/operands/1/distances/0/max").asInt());
-		assertEquals("scheint",				res.at("/query/operands/1/operands/0/wrap/key").asText());
-		assertEquals("korap:group",			res.at("/query/operands/1/operands/1/@type").asText());
-		assertEquals("operation:or",		res.at("/query/operands/1/operands/1/operation").asText());
-		assertEquals("Sonne",				res.at("/query/operands/1/operands/1/operands/0/wrap/key").asText());
-		assertEquals("Mond",				res.at("/query/operands/1/operands/1/operands/1/wrap/key").asText());
-	}
-
-	@Test
-	public void testOPNOT() throws JsonProcessingException, IOException {
-		query = "Sonne nicht Mond";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:group",			res.at("/query/@type").asText());
-		assertEquals("operation:sequence",	res.at("/query/operation").asText());
-		assertEquals("cosmas:distance",		res.at("/query/distances/0/@type").asText());
-		assertEquals("t",					res.at("/query/distances/0/key").asText());
-		assertEquals(0,						res.at("/query/distances/0/min").asInt());
-		assertEquals(0,						res.at("/query/distances/0/max").asInt());
-		assertEquals(true,					res.at("/query/distances/0/exclude").asBoolean());
-		assertEquals("korap:token",			res.at("/query/operands/0/@type").asText());
-		assertEquals("Sonne",				res.at("/query/operands/0/wrap/key").asText());
-		assertEquals("Mond",				res.at("/query/operands/1/wrap/key").asText());
-
-		query = "Sonne nicht Mond nicht Sterne";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:group",			res.at("/query/@type").asText());
-		assertEquals("operation:sequence",	res.at("/query/operation").asText());
-		assertEquals("cosmas:distance",		res.at("/query/distances/0/@type").asText());
-		assertEquals("t",					res.at("/query/distances/0/key").asText());
-		assertEquals(0,						res.at("/query/distances/0/min").asInt());
-		assertEquals(0,						res.at("/query/distances/0/max").asInt());
-		assertEquals(true,					res.at("/query/distances/0/exclude").asBoolean());
-		assertEquals("korap:token",			res.at("/query/operands/0/@type").asText());
-		assertEquals("Sonne",				res.at("/query/operands/0/wrap/key").asText());
-		assertEquals("korap:group",			res.at("/query/operands/1/@type").asText());
-		assertEquals("operation:sequence",	res.at("/query/operands/1/operation").asText());
-		assertEquals("cosmas:distance",		res.at("/query/operands/1/distances/0/@type").asText());
-		assertEquals("t",					res.at("/query/operands/1/distances/0/key").asText());
-		assertEquals(0,						res.at("/query/operands/1/distances/0/min").asInt());
-		assertEquals(0,						res.at("/query/operands/1/distances/0/max").asInt());
-		assertEquals(true,					res.at("/query/operands/1/distances/0/exclude").asBoolean());
-		assertEquals("Mond",				res.at("/query/operands/1/operands/0/wrap/key").asText());
-		assertEquals("Sterne",				res.at("/query/operands/1/operands/1/wrap/key").asText());
-
-		query = "(Sonne nicht Mond) nicht Sterne";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:group",			res.at("/query/@type").asText());
-		assertEquals("operation:sequence",	res.at("/query/operation").asText());
-		assertEquals("cosmas:distance",		res.at("/query/distances/0/@type").asText());
-		assertEquals("t",					res.at("/query/distances/0/key").asText());
-		assertEquals(0,						res.at("/query/distances/0/min").asInt());
-		assertEquals(0,						res.at("/query/distances/0/max").asInt());
-		assertEquals(true,					res.at("/query/distances/0/exclude").asBoolean());
-		assertEquals("korap:group",			res.at("/query/operands/0/@type").asText());
-		assertEquals("operation:sequence",	res.at("/query/operands/0/operation").asText());
-		assertEquals("cosmas:distance",		res.at("/query/operands/0/distances/0/@type").asText());
-		assertEquals("t",					res.at("/query/operands/0/distances/0/key").asText());
-		assertEquals(0,						res.at("/query/operands/0/distances/0/min").asInt());
-		assertEquals(0,						res.at("/query/operands/0/distances/0/max").asInt());
-		assertEquals(true,					res.at("/query/operands/0/distances/0/exclude").asBoolean());
-		assertEquals("Sonne",				res.at("/query/operands/0/operands/0/wrap/key").asText());
-		assertEquals("Mond",				res.at("/query/operands/0/operands/1/wrap/key").asText());
-		assertEquals("korap:token",			res.at("/query/operands/1/@type").asText());
-		assertEquals("Sterne",				res.at("/query/operands/1/wrap/key").asText());
-	}
-
-	@Test
-	public void testOPPROX() throws JsonProcessingException, IOException {
-		query = "Sonne /+w1:4 Mond";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:reference",		res.at("/query/@type").asText());
-		assertEquals("operation:focus",		res.at("/query/operation").asText());
-		assertEquals(129,					res.at("/query/classRef/0").asInt());
-		assertEquals("korap:group",			res.at("/query/operands/0/@type").asText());
-		assertEquals("operation:sequence",	res.at("/query/operands/0/operation").asText());
-		assertEquals("korap:distance",		res.at("/query/operands/0/distances/0/@type").asText());
-		assertEquals("w",					res.at("/query/operands/0/distances/0/key").asText());
-		assertEquals(1,						res.at("/query/operands/0/distances/0/boundary/min").asInt());
-		assertEquals(4,						res.at("/query/operands/0/distances/0/boundary/max").asInt());
-		assertEquals(true,					res.at("/query/operands/0/inOrder").asBoolean());
-		assertEquals("korap:group",			res.at("/query/operands/0/operands/0/@type").asText());
-		assertEquals("operation:class",		res.at("/query/operands/0/operands/0/operation").asText());
-		assertEquals(129,					res.at("/query/operands/0/operands/0/classOut").asInt());
-		assertEquals(129,					res.at("/query/operands/0/operands/1/classOut").asInt());
-		assertEquals("korap:token",			res.at("/query/operands/0/operands/0/operands/0/@type").asText());
-		assertEquals("Sonne",				res.at("/query/operands/0/operands/0/operands/0/wrap/key").asText());
-		assertEquals("Mond",				res.at("/query/operands/0/operands/1/operands/0/wrap/key").asText());
-
-		query = "Sonne /+w1:4,s0,p1:3 Mond";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:reference",		res.at("/query/@type").asText());
-		assertEquals("operation:focus",		res.at("/query/operation").asText());
-		assertEquals(129,					res.at("/query/classRef/0").asInt());
-		assertEquals("korap:group",			res.at("/query/operands/0/@type").asText());
-		assertEquals("operation:sequence",	res.at("/query/operands/0/operation").asText());
-		assertEquals("korap:distance",		res.at("/query/operands/0/distances/0/@type").asText());
-		assertEquals("w",					res.at("/query/operands/0/distances/0/key").asText());
-		assertEquals(1,						res.at("/query/operands/0/distances/0/boundary/min").asInt());
-		assertEquals(4,						res.at("/query/operands/0/distances/0/boundary/max").asInt());
-		assertEquals("s",					res.at("/query/operands/0/distances/1/key").asText());
-		assertEquals(0,						res.at("/query/operands/0/distances/1/boundary/min").asInt());
-		assertEquals("p",					res.at("/query/operands/0/distances/2/key").asText());
-		assertEquals(1,						res.at("/query/operands/0/distances/2/boundary/min").asInt());
-		assertEquals(3,						res.at("/query/operands/0/distances/2/boundary/max").asInt());
-		assertEquals(true,					res.at("/query/operands/0/inOrder").asBoolean());
-		assertEquals("korap:group",			res.at("/query/operands/0/operands/0/@type").asText());
-		assertEquals("operation:class",		res.at("/query/operands/0/operands/0/operation").asText());
-		assertEquals(129,					res.at("/query/operands/0/operands/0/classOut").asInt());
-		assertEquals(129,					res.at("/query/operands/0/operands/1/classOut").asInt());
-		assertEquals("korap:token",			res.at("/query/operands/0/operands/0/operands/0/@type").asText());
-		assertEquals("Sonne",				res.at("/query/operands/0/operands/0/operands/0/wrap/key").asText());
-		assertEquals("Mond",				res.at("/query/operands/0/operands/1/operands/0/wrap/key").asText());
-
-		query = "Sonne /+w4 Mond";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:distance",		res.at("/query/operands/0/distances/0/@type").asText());
-		assertEquals("w",					res.at("/query/operands/0/distances/0/key").asText());
-		assertEquals(0,						res.at("/query/operands/0/distances/0/boundary/min").asInt());
-		assertEquals(4,						res.at("/query/operands/0/distances/0/boundary/max").asInt());
-
-		query = "Sonne /-w4 Mond";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:distance",		res.at("/query/operands/0/distances/0/@type").asText());
-		assertEquals("w",					res.at("/query/operands/0/distances/0/key").asText());
-		assertEquals(0,						res.at("/query/operands/0/distances/0/boundary/min").asInt());
-		assertEquals(4,						res.at("/query/operands/0/distances/0/boundary/max").asInt());
-		assertEquals("Mond",				res.at("/query/operands/0/operands/0/operands/0/wrap/key").asText());
-		assertEquals("Sonne",				res.at("/query/operands/0/operands/1/operands/0/wrap/key").asText());
-
-		query = "Sonne /w4 Mond";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:distance",		res.at("/query/operands/0/distances/0/@type").asText());
-		assertEquals("w",					res.at("/query/operands/0/distances/0/key").asText());
-		assertEquals(0,						res.at("/query/operands/0/distances/0/boundary/min").asInt());
-		assertEquals(4,						res.at("/query/operands/0/distances/0/boundary/max").asInt());
-		assertEquals("Sonne",				res.at("/query/operands/0/operands/0/operands/0/wrap/key").asText());
-		assertEquals("Mond",				res.at("/query/operands/0/operands/1/operands/0/wrap/key").asText());
-		assertEquals(false,					res.at("/query/operands/0/inOrder").asBoolean());
-	}
-
-	@Test
-	public void testOPPROXNested() throws JsonProcessingException, IOException {	
-		query = "Sonne /+w1:4 Mond /+w1:7 Sterne";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:reference",		res.at("/query/@type").asText());
-		assertEquals("operation:focus",		res.at("/query/operation").asText());
-		assertEquals(129,					res.at("/query/classRef/0").asInt());
-		assertEquals("korap:group",			res.at("/query/operands/0/@type").asText());
-		assertEquals("operation:sequence",	res.at("/query/operands/0/operation").asText());
-		assertEquals("korap:distance",		res.at("/query/operands/0/distances/0/@type").asText());
-		assertEquals("w",					res.at("/query/operands/0/distances/0/key").asText());
-		assertEquals(1,						res.at("/query/operands/0/distances/0/boundary/min").asInt());
-		assertEquals(4,						res.at("/query/operands/0/distances/0/boundary/max").asInt());
-		assertEquals(true,					res.at("/query/operands/0/inOrder").asBoolean());
-		assertEquals("korap:group",			res.at("/query/operands/0/operands/0/@type").asText());
-		assertEquals("operation:class",		res.at("/query/operands/0/operands/0/operation").asText());
-		assertEquals(129,					res.at("/query/operands/0/operands/0/classOut").asInt());
-		assertEquals("Sonne",				res.at("/query/operands/0/operands/0/operands/0/wrap/key").asText());
-		assertEquals(129,					res.at("/query/operands/0/operands/1/classOut").asInt());
-		assertEquals("korap:reference",		res.at("/query/operands/0/operands/1/operands/0/@type").asText());
-		assertEquals(130,					res.at("/query/operands/0/operands/1/operands/0/classRef/0").asInt());
-		assertEquals("operation:focus",		res.at("/query/operands/0/operands/1/operands/0/operation").asText());
-		assertEquals("operation:sequence",	res.at("/query/operands/0/operands/1/operands/0/operands/0/operation").asText());
-		assertEquals("w",					res.at("/query/operands/0/operands/1/operands/0/operands/0/distances/0/key").asText());
-		assertEquals(1,						res.at("/query/operands/0/operands/1/operands/0/operands/0/distances/0/boundary/min").asInt());
-		assertEquals(7,						res.at("/query/operands/0/operands/1/operands/0/operands/0/distances/0/boundary/max").asInt());
-		assertEquals(130,					res.at("/query/operands/0/operands/1/operands/0/operands/0/operands/0/classOut").asInt());
-		assertEquals("Mond",				res.at("/query/operands/0/operands/1/operands/0/operands/0/operands/0/operands/0/wrap/key").asText());
-		assertEquals(130,					res.at("/query/operands/0/operands/1/operands/0/operands/0/operands/1/classOut").asInt());
-		assertEquals("Sterne",				res.at("/query/operands/0/operands/1/operands/0/operands/0/operands/1/operands/0/wrap/key").asText());
-
-		query = "Sonne /+w1:4 Mond /-w1:7 Sterne";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("Sonne",				res.at("/query/operands/0/operands/0/operands/0/wrap/key").asText());
-		assertEquals("Sterne",				res.at("/query/operands/0/operands/1/operands/0/operands/0/operands/0/operands/0/wrap/key").asText());
-		assertEquals("Mond",				res.at("/query/operands/0/operands/1/operands/0/operands/0/operands/1/operands/0/wrap/key").asText());
-
-		query = "Sonne /-w4 Mond /+w2 Sterne";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:reference",		res.at("/query/@type").asText());
-		assertEquals("operation:focus",		res.at("/query/operation").asText());
-		assertEquals(129,					res.at("/query/classRef/0").asInt());
-		assertEquals("korap:group",			res.at("/query/operands/0/@type").asText());
-		assertEquals("operation:sequence",	res.at("/query/operands/0/operation").asText());
-		assertEquals("korap:distance",		res.at("/query/operands/0/distances/0/@type").asText());
-		assertEquals("w",					res.at("/query/operands/0/distances/0/key").asText());
-		assertEquals(0,						res.at("/query/operands/0/distances/0/boundary/min").asInt());
-		assertEquals(4,						res.at("/query/operands/0/distances/0/boundary/max").asInt());
-		assertEquals(true,					res.at("/query/operands/0/inOrder").asBoolean());
-		assertEquals("korap:group",			res.at("/query/operands/0/operands/1/@type").asText());
-		assertEquals("operation:class",		res.at("/query/operands/0/operands/1/operation").asText());
-		assertEquals(129,					res.at("/query/operands/0/operands/1/classOut").asInt());
-		assertEquals("Sonne",				res.at("/query/operands/0/operands/1/operands/0/wrap/key").asText());
-		assertEquals(129,					res.at("/query/operands/0/operands/0/classOut").asInt());
-		assertEquals("korap:reference",		res.at("/query/operands/0/operands/0/operands/0/@type").asText());
-		assertEquals(130,					res.at("/query/operands/0/operands/0/operands/0/classRef/0").asInt());
-		assertEquals("operation:focus",		res.at("/query/operands/0/operands/0/operands/0/operation").asText());
-		assertEquals("operation:sequence",	res.at("/query/operands/0/operands/0/operands/0/operands/0/operation").asText());
-		assertEquals("w",					res.at("/query/operands/0/operands/0/operands/0/operands/0/distances/0/key").asText());
-		assertEquals(0,						res.at("/query/operands/0/operands/0/operands/0/operands/0/distances/0/boundary/min").asInt());
-		assertEquals(2,						res.at("/query/operands/0/operands/0/operands/0/operands/0/distances/0/boundary/max").asInt());
-		assertEquals(130,					res.at("/query/operands/0/operands/0/operands/0/operands/0/operands/0/classOut").asInt());
-		assertEquals("Mond",				res.at("/query/operands/0/operands/0/operands/0/operands/0/operands/0/operands/0/wrap/key").asText());
-		assertEquals(130,					res.at("/query/operands/0/operands/0/operands/0/operands/0/operands/1/classOut").asInt());
-		assertEquals("Sterne",				res.at("/query/operands/0/operands/0/operands/0/operands/0/operands/1/operands/0/wrap/key").asText());
-
-	}
-
-	@Test
-	public void testOPIN() throws JsonProcessingException, IOException {
-		query = "wegen #IN <s>";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:reference",				res.at("/query/@type").asText());
-		assertEquals("operation:focus",				res.at("/query/operation").asText());
-		assertEquals(130,							res.at("/query/classRef/0").asInt());
-		assertEquals("korap:group",					res.at("/query/operands/0/@type").asText());
-		assertEquals("operation:class",				res.at("/query/operands/0/operation").asText());
-		assertEquals("classRefCheck:includes",		res.at("/query/operands/0/classRefCheck/0").asText());
-		assertEquals("korap:group",					res.at("/query/operands/0/operands/0/@type").asText());
-		assertEquals("operation:position",			res.at("/query/operands/0/operands/0/operation").asText());
-		assertEquals(true,							res.at("/query/operands/0/operands/0/frames/0").isMissingNode());
-		assertEquals(129,							res.at("/query/operands/0/classIn/0").asInt());
-		assertEquals(130,							res.at("/query/operands/0/classIn/1").asInt());
-		assertEquals("korap:group",					res.at("/query/operands/0/operands/0/@type").asText());
-		assertEquals("operation:class",				res.at("/query/operands/0/operands/0/operands/0/operation").asText());
-		assertEquals(129,							res.at("/query/operands/0/operands/0/operands/0/classOut").asInt());
-		assertEquals("korap:span",					res.at("/query/operands/0/operands/0/operands/0/operands/0/@type").asText());
-		assertEquals("s",							res.at("/query/operands/0/operands/0/operands/0/operands/0/key").asText());
-		assertEquals("korap:group",					res.at("/query/operands/0/operands/0/operands/1/@type").asText());
-		assertEquals("operation:class",				res.at("/query/operands/0/operands/0/operands/1/operation").asText());
-		assertEquals(130,							res.at("/query/operands/0/operands/0/operands/1/classOut").asInt());
-		assertEquals("korap:token",					res.at("/query/operands/0/operands/0/operands/1/operands/0/@type").asText());
-		assertEquals("wegen",						res.at("/query/operands/0/operands/0/operands/1/operands/0/wrap/key").asText());
-
-		query = "wegen #IN(L) <s>";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("classRefCheck:includes",		res.at("/query/operands/0/classRefCheck/0").asText());
-		assertEquals("frames:startswith",			res.at("/query/operands/0/operands/0/frames/0").asText());
-		assertEquals(true,							res.at("/query/operands/0/operands/0/frames/1").isMissingNode());
-
-		query = "wegen #IN(F) <s>";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("classRefCheck:includes",		res.at("/query/operands/0/classRefCheck/0").asText());
-		assertEquals("frames:matches",				res.at("/query/operands/0/operands/0/frames/0").asText());
-		assertEquals(true,							res.at("/query/operands/0/operands/0/frames/1").isMissingNode());
-
-		query = "wegen #IN(FI) <s>";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("classRefCheck:unequals",		res.at("/query/operands/0/classRefCheck/0").asText());
-		assertEquals("classRefCheck:includes",		res.at("/query/operands/0/classRefCheck/1").asText());
-		assertEquals("frames:matches",				res.at("/query/operands/0/operands/0/frames/0").asText());
-		assertEquals(true,							res.at("/query/operands/0/operands/0/frames/1").isMissingNode());
-
-		query = "wegen #IN(FE) <s>";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("classRefCheck:equals",		res.at("/query/operands/0/classRefCheck/0").asText());
-		assertEquals("frames:matches",				res.at("/query/operands/0/operands/0/frames/0").asText());
-		assertEquals(true,							res.at("/query/operands/0/operands/0/frames/1").isMissingNode());
-
-		query = "wegen #IN(%, L) <s>";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("classRefCheck:includes",		res.at("/query/operands/0/classRefCheck/0").asText());
-		assertEquals("frames:startswith",			res.at("/query/operands/0/operands/0/frames/0").asText());
-		assertEquals(true,							res.at("/query/operands/0/operands/0/frames/1").isMissingNode());
-		assertEquals(true,							res.at("/query/operands/0/operands/0/exclude").asBoolean());
-
-		query = "wegen #IN(FE,%,MIN) <s>";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals(true,							res.at("/query/reset").isMissingNode());
-		assertEquals("classRefCheck:equals",		res.at("/query/operands/0/classRefCheck/0").asText());
-		assertEquals("frames:matches",				res.at("/query/operands/0/operands/0/frames/0").asText());
-		assertEquals(true,							res.at("/query/operands/0/operands/0/exclude").asBoolean());
-		
-		query = "wegen #IN(FE,ALL,%,MIN) <s>";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals(true,							res.at("/query/reset").asBoolean());
-		assertEquals("classRefCheck:equals",		res.at("/query/operands/0/classRefCheck/0").asText());
-		assertEquals("frames:matches",				res.at("/query/operands/0/operands/0/frames/0").asText());
-		assertEquals(true,							res.at("/query/operands/0/operands/0/exclude").asBoolean());
-		
-		query = "wegen #IN(FE,ALL,%,MAX) <s>";
-        qs.setQuery(query, "cosmas2");
-        res = mapper.readTree(qs.toJSON());
-        assertEquals("operation:merge",             res.at("/query/operation").asText());
-        assertEquals(true,                          res.at("/query/operands/0/reset").asBoolean());
-        assertEquals("classRefCheck:equals",        res.at("/query/operands/0/operands/0/classRefCheck/0").asText());
-        assertEquals("frames:matches",              res.at("/query/operands/0/operands/0/operands/0/frames/0").asText());
-        assertEquals(true,                          res.at("/query/operands/0/operands/0/operands/0/exclude").asBoolean());
-	}
-
-	@Test
-	public void testOPOV() throws JsonProcessingException, IOException {
-		query = "wegen #OV <s>";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:reference",				res.at("/query/@type").asText());
-		assertEquals("operation:focus",				res.at("/query/operation").asText());
-		assertEquals(130,							res.at("/query/classRef/0").asInt());
-		assertEquals("korap:group",					res.at("/query/operands/0/@type").asText());
-		assertEquals("operation:class",				res.at("/query/operands/0/operation").asText());
-		assertEquals("classRefCheck:intersects",	res.at("/query/operands/0/classRefCheck/0").asText());
-		assertEquals("korap:group",					res.at("/query/operands/0/operands/0/@type").asText());
-		assertEquals("operation:position",			res.at("/query/operands/0/operands/0/operation").asText());
-		assertEquals(true,							res.at("/query/operands/0/operands/0/frames/0").isMissingNode());
-		assertEquals(129,							res.at("/query/operands/0/classIn/0").asInt());
-		assertEquals(130,							res.at("/query/operands/0/classIn/1").asInt());
-		assertEquals("korap:group",					res.at("/query/operands/0/operands/0/@type").asText());
-		assertEquals("operation:class",				res.at("/query/operands/0/operands/0/operands/0/operation").asText());
-		assertEquals(129,							res.at("/query/operands/0/operands/0/operands/0/classOut").asInt());
-		assertEquals("korap:span",					res.at("/query/operands/0/operands/0/operands/0/operands/0/@type").asText());
-		assertEquals("s",							res.at("/query/operands/0/operands/0/operands/0/operands/0/key").asText());
-		assertEquals("korap:group",					res.at("/query/operands/0/operands/0/operands/1/@type").asText());
-		assertEquals("operation:class",				res.at("/query/operands/0/operands/0/operands/1/operation").asText());
-		assertEquals(130,							res.at("/query/operands/0/operands/0/operands/1/classOut").asInt());
-		assertEquals("korap:token",					res.at("/query/operands/0/operands/0/operands/1/operands/0/@type").asText());
-		assertEquals("wegen",						res.at("/query/operands/0/operands/0/operands/1/operands/0/wrap/key").asText());
-
-		query = "wegen #OV(L) <s>";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("classRefCheck:intersects",	res.at("/query/operands/0/classRefCheck/0").asText());
-		assertEquals("frames:startswith",			res.at("/query/operands/0/operands/0/frames/0").asText());
-		assertEquals("frames:overlapsLeft",			res.at("/query/operands/0/operands/0/frames/1").asText());
-
-		query = "wegen #OV(F) <s>";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("classRefCheck:intersects",	res.at("/query/operands/0/classRefCheck/0").asText());
-		assertEquals("frames:matches",				res.at("/query/operands/0/operands/0/frames/0").asText());
-		assertEquals(true,							res.at("/query/operands/0/operands/0/frames/1").isMissingNode());
-
-		query = "wegen #OV(FI) <s>";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("classRefCheck:unequals",		res.at("/query/operands/0/classRefCheck/0").asText());
-		assertEquals("frames:matches",				res.at("/query/operands/0/operands/0/frames/0").asText());
-
-		query = "wegen #OV(FE) <s>";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("classRefCheck:equals",		res.at("/query/operands/0/classRefCheck/0").asText());
-		assertEquals("frames:matches",				res.at("/query/operands/0/operands/0/frames/0").asText());
-	}
-
-
-	@Test
-	public void testBEG_END() throws JsonProcessingException, IOException {
-		query = "#BEG(der /w3:5 Mann)";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:reference",		res.at("/query/@type").asText());
-		assertEquals("operation:focus",		res.at("/query/operation").asText());
-		assertEquals(0,						res.at("/query/spanRef/0").asInt());
-		assertEquals(1,						res.at("/query/spanRef/1").asInt());
-		assertEquals("korap:group",			res.at("/query/operands/0/@type").asText());
-		assertEquals("operation:sequence",	res.at("/query/operands/0/operation").asText());
-		assertEquals("korap:distance",		res.at("/query/operands/0/distances/0/@type").asText());
-		assertEquals("w",					res.at("/query/operands/0/distances/0/key").asText());
-		assertEquals(3,						res.at("/query/operands/0/distances/0/boundary/min").asInt());
-		assertEquals(5,						res.at("/query/operands/0/distances/0/boundary/max").asInt());
-		assertEquals(false,					res.at("/query/operands/0/inOrder").asBoolean());
-		assertEquals("korap:token",			res.at("/query/operands/0/operands/0/@type").asText());
-		assertEquals("der",					res.at("/query/operands/0/operands/0/wrap/key").asText());
-		assertEquals("Mann",				res.at("/query/operands/0/operands/1/wrap/key").asText());
-
-		query = "#BEG(der /w3:5 Mann) /+w10 kommt";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:reference",		res.at("/query/@type").asText());
-		assertEquals("operation:focus",		res.at("/query/operation").asText());
-		assertEquals(129,					res.at("/query/classRef/0").asInt());
-		assertEquals("korap:group",			res.at("/query/operands/0/@type").asText());
-		assertEquals("operation:sequence",	res.at("/query/operands/0/operation").asText());
-		assertEquals("korap:distance",		res.at("/query/operands/0/distances/0/@type").asText());
-		assertEquals("w",					res.at("/query/operands/0/distances/0/key").asText());
-		assertEquals(0,						res.at("/query/operands/0/distances/0/boundary/min").asInt());
-		assertEquals(10,					res.at("/query/operands/0/distances/0/boundary/max").asInt());
-		assertEquals(true,					res.at("/query/operands/0/inOrder").asBoolean());
-		assertEquals("korap:group",			res.at("/query/operands/0/operands/0/@type").asText());
-		assertEquals("operation:class",		res.at("/query/operands/0/operands/0/operation").asText());
-		assertEquals(129,					res.at("/query/operands/0/operands/0/classOut").asInt());
-		assertEquals("korap:reference",		res.at("/query/operands/0/operands/0/operands/0/@type").asText());
-		assertEquals("operation:focus",		res.at("/query/operands/0/operands/0/operands/0/operation").asText());
-		assertEquals(0,						res.at("/query/operands/0/operands/0/operands/0/spanRef/0").asInt());
-		assertEquals(1,						res.at("/query/operands/0/operands/0/operands/0/spanRef/1").asInt());
-		assertEquals("korap:group",			res.at("/query/operands/0/operands/0/operands/0/operands/0/@type").asText());
-		assertEquals("operation:sequence",	res.at("/query/operands/0/operands/0/operands/0/operands/0/operation").asText());
-		assertEquals("korap:distance",		res.at("/query/operands/0/operands/0/operands/0/operands/0/distances/0/@type").asText());
-		assertEquals("w",					res.at("/query/operands/0/operands/0/operands/0/operands/0/distances/0/key").asText());
-		assertEquals(3,						res.at("/query/operands/0/operands/0/operands/0/operands/0/distances/0/boundary/min").asInt());
-		assertEquals(5,						res.at("/query/operands/0/operands/0/operands/0/operands/0/distances/0/boundary/max").asInt());
-		assertEquals(false,					res.at("/query/operands/0/operands/0/operands/0/operands/0/inOrder").asBoolean());
-		assertEquals("korap:token",			res.at("/query/operands/0/operands/0/operands/0/operands/0/operands/0/@type").asText());
-		assertEquals("der",					res.at("/query/operands/0/operands/0/operands/0/operands/0/operands/0/wrap/key").asText());
-		assertEquals("Mann",				res.at("/query/operands/0/operands/0/operands/0/operands/0/operands/1/wrap/key").asText());
-		assertEquals("operation:class",		res.at("/query/operands/0/operands/1/operation").asText());
-		assertEquals(129,					res.at("/query/operands/0/operands/1/classOut").asInt());
-		assertEquals("korap:token",			res.at("/query/operands/0/operands/1/operands/0/@type").asText());
-		assertEquals("kommt",				res.at("/query/operands/0/operands/1/operands/0/wrap/key").asText());
-
-		query = "kommt /+w10 #BEG(der /w3:5 Mann)";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:reference",		res.at("/query/@type").asText());
-		assertEquals("operation:focus",		res.at("/query/operation").asText());
-		assertEquals(129,					res.at("/query/classRef/0").asInt());
-		assertEquals("korap:group",			res.at("/query/operands/0/@type").asText());
-		assertEquals("operation:sequence",	res.at("/query/operands/0/operation").asText());
-		assertEquals("korap:distance",		res.at("/query/operands/0/distances/0/@type").asText());
-		assertEquals("w",					res.at("/query/operands/0/distances/0/key").asText());
-		assertEquals(0,						res.at("/query/operands/0/distances/0/boundary/min").asInt());
-		assertEquals(10,					res.at("/query/operands/0/distances/0/boundary/max").asInt());
-		assertEquals(true,					res.at("/query/operands/0/inOrder").asBoolean());
-		assertEquals("korap:group",			res.at("/query/operands/0/operands/1/@type").asText());
-		assertEquals("operation:class",		res.at("/query/operands/0/operands/1/operation").asText());
-		assertEquals(129,					res.at("/query/operands/0/operands/1/classOut").asInt());
-		assertEquals("korap:reference",		res.at("/query/operands/0/operands/1/operands/0/@type").asText());
-		assertEquals("operation:focus",		res.at("/query/operands/0/operands/1/operands/0/operation").asText());
-		assertEquals(0,						res.at("/query/operands/0/operands/1/operands/0/spanRef/0").asInt());
-		assertEquals(1,						res.at("/query/operands/0/operands/1/operands/0/spanRef/1").asInt());
-		assertEquals("korap:group",			res.at("/query/operands/0/operands/1/operands/0/operands/0/@type").asText());
-		assertEquals("operation:sequence",	res.at("/query/operands/0/operands/1/operands/0/operands/0/operation").asText());
-		assertEquals("korap:distance",		res.at("/query/operands/0/operands/1/operands/0/operands/0/distances/0/@type").asText());
-		assertEquals("w",					res.at("/query/operands/0/operands/1/operands/0/operands/0/distances/0/key").asText());
-		assertEquals(3,						res.at("/query/operands/0/operands/1/operands/0/operands/0/distances/0/boundary/min").asInt());
-		assertEquals(5,						res.at("/query/operands/0/operands/1/operands/0/operands/0/distances/0/boundary/max").asInt());
-		assertEquals(false,					res.at("/query/operands/0/operands/1/operands/0/operands/0/inOrder").asBoolean());
-		assertEquals("korap:token",			res.at("/query/operands/0/operands/1/operands/0/operands/0/operands/0/@type").asText());
-		assertEquals("der",					res.at("/query/operands/0/operands/1/operands/0/operands/0/operands/0/wrap/key").asText());
-		assertEquals("Mann",				res.at("/query/operands/0/operands/1/operands/0/operands/0/operands/1/wrap/key").asText());
-		assertEquals("operation:class",		res.at("/query/operands/0/operands/0/operation").asText());
-		assertEquals(129,					res.at("/query/operands/0/operands/0/classOut").asInt());
-		assertEquals("korap:token",			res.at("/query/operands/0/operands/0/operands/0/@type").asText());
-		assertEquals("kommt",				res.at("/query/operands/0/operands/0/operands/0/wrap/key").asText());
-
-		query = "#END(der /w3:5 Mann)";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:reference",		res.at("/query/@type").asText());
-		assertEquals("operation:focus",		res.at("/query/operation").asText());
-		assertEquals(-1,					res.at("/query/spanRef/0").asInt());
-		assertEquals(1,						res.at("/query/spanRef/1").asInt());
-		assertEquals("korap:group",			res.at("/query/operands/0/@type").asText());
-		assertEquals("operation:sequence",	res.at("/query/operands/0/operation").asText());
-		assertEquals("korap:distance",		res.at("/query/operands/0/distances/0/@type").asText());
-		assertEquals("w",					res.at("/query/operands/0/distances/0/key").asText());
-		assertEquals(3,						res.at("/query/operands/0/distances/0/boundary/min").asInt());
-		assertEquals(5,						res.at("/query/operands/0/distances/0/boundary/max").asInt());
-		assertEquals(false,					res.at("/query/operands/0/inOrder").asBoolean());
-		assertEquals("korap:token",			res.at("/query/operands/0/operands/0/@type").asText());
-		assertEquals("der",					res.at("/query/operands/0/operands/0/wrap/key").asText());
-		assertEquals("Mann",				res.at("/query/operands/0/operands/1/wrap/key").asText());
-	}
-
-	@Test
-	public void testELEM() throws JsonProcessingException, IOException {
-		query = "#ELEM(S)";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:span",		res.at("/query/@type").asText());
-		assertEquals("s",				res.at("/query/key").asText());
-
-		query = "#ELEM(W ANA=N)";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:span",		res.at("/query/@type").asText());
-		assertEquals("w",				res.at("/query/key").asText());
-		assertEquals("korap:term",		res.at("/query/attr/@type").asText());
-		assertEquals("N",				res.at("/query/attr/key").asText());
-		assertEquals("p",				res.at("/query/attr/layer").asText());
-		assertEquals("match:eq",		res.at("/query/attr/match").asText());
-
-		query = "#ELEM(W ANA != 'N V')";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:span",		res.at("/query/@type").asText());
-		assertEquals("w",				res.at("/query/key").asText());
-		assertEquals("korap:termGroup",	res.at("/query/attr/@type").asText());
-		assertEquals("relation:and",	res.at("/query/attr/relation").asText());
-		assertEquals("korap:term",		res.at("/query/attr/operands/0/@type").asText());
-		assertEquals("N",				res.at("/query/attr/operands/0/key").asText());
-		assertEquals("p",				res.at("/query/attr/operands/0/layer").asText());
-		assertEquals("match:ne",		res.at("/query/attr/operands/0/match").asText());
-		assertEquals("korap:term",		res.at("/query/attr/operands/1/@type").asText());
-		assertEquals("V",				res.at("/query/attr/operands/1/key").asText());
-		assertEquals("p",				res.at("/query/attr/operands/1/layer").asText());
-		assertEquals("match:ne",		res.at("/query/attr/operands/1/match").asText());
-
-		query = "#ELEM(W ANA != 'N A V' Genre = Sport)";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:span",		res.at("/query/@type").asText());
-		assertEquals("w",				res.at("/query/key").asText());
-		assertEquals("korap:termGroup",	res.at("/query/attr/@type").asText());
-		assertEquals("relation:and",	res.at("/query/attr/relation").asText());
-		assertEquals("korap:termGroup",	res.at("/query/attr/operands/0/@type").asText());
-		assertEquals("relation:and",	res.at("/query/attr/operands/0/relation").asText());
-		assertEquals("N",				res.at("/query/attr/operands/0/operands/0/key").asText());
-		assertEquals("A",				res.at("/query/attr/operands/0/operands/1/key").asText());
-		assertEquals("V",				res.at("/query/attr/operands/0/operands/2/key").asText());
-		assertEquals("Genre",			res.at("/query/attr/operands/1/layer").asText());
-		assertEquals("Sport",			res.at("/query/attr/operands/1/key").asText());
-
-		query = "#ELEM(W ANA != 'N A V' Genre != 'Sport Politik')";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:span",		res.at("/query/@type").asText());
-		assertEquals("w",				res.at("/query/key").asText());
-		assertEquals("korap:termGroup",	res.at("/query/attr/@type").asText());
-		assertEquals("relation:and",	res.at("/query/attr/relation").asText());
-		assertEquals("korap:termGroup",	res.at("/query/attr/operands/0/@type").asText());
-		assertEquals("relation:and",	res.at("/query/attr/operands/0/relation").asText());
-		assertEquals("korap:termGroup",	res.at("/query/attr/operands/1/@type").asText());
-		assertEquals("relation:and",	res.at("/query/attr/operands/1/relation").asText());
-		assertEquals("N",				res.at("/query/attr/operands/0/operands/0/key").asText());
-		assertEquals("A",				res.at("/query/attr/operands/0/operands/1/key").asText());
-		assertEquals("V",				res.at("/query/attr/operands/0/operands/2/key").asText());
-		assertEquals("match:ne",		res.at("/query/attr/operands/0/operands/2/match").asText());
-		assertEquals("Genre",			res.at("/query/attr/operands/1/operands/0/layer").asText());
-		assertEquals("Sport",			res.at("/query/attr/operands/1/operands/0/key").asText());
-		assertEquals("Genre",			res.at("/query/attr/operands/1/operands/1/layer").asText());
-		assertEquals("Politik",			res.at("/query/attr/operands/1/operands/1/key").asText());
-		assertEquals("match:ne",		res.at("/query/attr/operands/1/operands/1/match").asText());
-	}
-	@Test
-	public void testOPALL() throws JsonProcessingException, IOException {
-		query = "#ALL(gehen /w1:10 voran)";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:group",			res.at("/query/@type").asText());
-		assertEquals("operation:sequence",	res.at("/query/operation").asText());
-		assertEquals("gehen",				res.at("/query/operands/0/wrap/key").asText());
-		assertEquals("voran",				res.at("/query/operands/1/wrap/key").asText());
-		assertEquals("korap:distance",		res.at("/query/distances/0/@type").asText());
-		assertEquals("w",					res.at("/query/distances/0/key").asText());
-		assertEquals(1,						res.at("/query/distances/0/boundary/min").asInt());
-		assertEquals(10,					res.at("/query/distances/0/boundary/max").asInt());
-
-		query = "#ALL(gehen /w1:10 (voran /w1:4 schnell))";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:group",			res.at("/query/@type").asText());
-		assertEquals("operation:sequence",	res.at("/query/operation").asText());
-		assertEquals("korap:distance",		res.at("/query/distances/0/@type").asText());
-		assertEquals("w",					res.at("/query/distances/0/key").asText());
-		assertEquals(1,						res.at("/query/distances/0/boundary/min").asInt());
-		assertEquals(10,					res.at("/query/distances/0/boundary/max").asInt());
-		assertEquals("gehen",				res.at("/query/operands/0/wrap/key").asText());
-		assertEquals("korap:group",			res.at("/query/operands/1/@type").asText());
-		assertEquals("operation:sequence",	res.at("/query/operands/1/operation").asText());
-		assertEquals("korap:distance",		res.at("/query/operands/1/distances/0/@type").asText());
-		assertEquals("w",					res.at("/query/operands/1/distances/0/key").asText());
-		assertEquals(1,						res.at("/query/operands/1/distances/0/boundary/min").asInt());
-		assertEquals(4,						res.at("/query/operands/1/distances/0/boundary/max").asInt());
-		assertEquals("voran",				res.at("/query/operands/1/operands/0/wrap/key").asText());
-		assertEquals("schnell",				res.at("/query/operands/1/operands/1/wrap/key").asText());
-
-
-	}
-
-	@Test
-	public void testOPNHIT() throws JsonProcessingException, IOException {
-		query = "#NHIT(gehen /w1:10 voran)";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:reference",		res.at("/query/@type").asText());
-		assertEquals("operation:focus",		res.at("/query/operation").asText());
-		assertEquals(129,					res.at("/query/classRef/0").asInt());
-		assertEquals("korap:group",			res.at("/query/operands/0/@type").asText());
-		assertEquals("operation:class",		res.at("/query/operands/0/operation").asText());
-		assertEquals("classRefOp:inversion",res.at("/query/operands/0/classRefOp").asText());
-		assertEquals(130,					res.at("/query/operands/0/classIn/0").asInt());
-		assertEquals(131,					res.at("/query/operands/0/classIn/1").asInt());
-		assertEquals(129,					res.at("/query/operands/0/classOut").asInt());
-		assertEquals("korap:group",			res.at("/query/operands/0/operands/0/@type").asText());
-		assertEquals("operation:sequence",	res.at("/query/operands/0/operands/0/operation").asText());
-		assertEquals("korap:distance",		res.at("/query/operands/0/operands/0/distances/0/@type").asText());
-		assertEquals("w",					res.at("/query/operands/0/operands/0/distances/0/key").asText());
-		assertEquals(1,						res.at("/query/operands/0/operands/0/distances/0/boundary/min").asInt());
-		assertEquals(10,					res.at("/query/operands/0/operands/0/distances/0/boundary/max").asInt());
-		assertEquals("korap:group",			res.at("/query/operands/0/operands/0/operands/0/@type").asText());
-		assertEquals("operation:class",		res.at("/query/operands/0/operands/0/operands/0/operation").asText());
-		assertEquals(130,					res.at("/query/operands/0/operands/0/operands/0/classOut").asInt());
-		assertEquals(131,					res.at("/query/operands/0/operands/0/operands/1/classOut").asInt());
-		assertEquals("korap:token",			res.at("/query/operands/0/operands/0/operands/0/operands/0/@type").asText());
-		assertEquals("gehen",				res.at("/query/operands/0/operands/0/operands/0/operands/0/wrap/key").asText());
-		assertEquals("voran",				res.at("/query/operands/0/operands/0/operands/1/operands/0/wrap/key").asText());
-
-		query = "#NHIT(gehen /w1:10 voran /w1:10 Beispiel)";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:reference",		res.at("/query/@type").asText());
-		assertEquals("operation:focus",		res.at("/query/operation").asText());
-		assertEquals(129,					res.at("/query/classRef/0").asInt());
-		assertEquals("korap:group",			res.at("/query/operands/0/@type").asText());
-		assertEquals("operation:class",		res.at("/query/operands/0/operation").asText());
-		assertEquals("classRefOp:inversion",res.at("/query/operands/0/classRefOp").asText());
-		assertEquals(130,					res.at("/query/operands/0/classIn/0").asInt());
-		assertEquals(131,					res.at("/query/operands/0/classIn/1").asInt());
-		assertEquals(129,					res.at("/query/operands/0/classOut").asInt());
-		assertEquals("korap:group",			res.at("/query/operands/0/operands/0/@type").asText());
-		assertEquals("operation:sequence",	res.at("/query/operands/0/operands/0/operation").asText());
-		assertEquals("korap:distance",		res.at("/query/operands/0/operands/0/distances/0/@type").asText());
-		assertEquals("w",					res.at("/query/operands/0/operands/0/distances/0/key").asText());
-		assertEquals(1,						res.at("/query/operands/0/operands/0/distances/0/boundary/min").asInt());
-		assertEquals(10,					res.at("/query/operands/0/operands/0/distances/0/boundary/max").asInt());
-		assertEquals("korap:group",			res.at("/query/operands/0/operands/0/operands/0/@type").asText());
-		assertEquals("operation:class",		res.at("/query/operands/0/operands/0/operands/0/operation").asText());
-		assertEquals(130,					res.at("/query/operands/0/operands/0/operands/0/classOut").asInt());
-		assertEquals(131,					res.at("/query/operands/0/operands/0/operands/1/classOut").asInt());
-		assertEquals("gehen",				res.at("/query/operands/0/operands/0/operands/0/operands/0/wrap/key").asText());
-		assertEquals("operation:focus",		res.at("/query/operands/0/operands/0/operands/1/operands/0/operation").asText());
-		assertEquals(132,					res.at("/query/operands/0/operands/0/operands/1/operands/0/classRef/0").asInt());
-		assertEquals("operation:sequence",	res.at("/query/operands/0/operands/0/operands/1/operands/0/operands/0/operation").asText());
-		assertEquals(132,					res.at("/query/operands/0/operands/0/operands/1/operands/0/operands/0/operands/0/classOut").asInt());
-		assertEquals("voran",				res.at("/query/operands/0/operands/0/operands/1/operands/0/operands/0/operands/0/operands/0/wrap/key").asText());
-		assertEquals(132,					res.at("/query/operands/0/operands/0/operands/1/operands/0/operands/0/operands/1/classOut").asInt());
-		assertEquals("Beispiel",			res.at("/query/operands/0/operands/0/operands/1/operands/0/operands/0/operands/1/operands/0/wrap/key").asText());
-
-	}
-
-	@Test
-	public void testOPBED() throws JsonProcessingException, IOException {
-		query = "#BED(der , sa)";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:reference",				res.at("/query/@type").asText());
-		assertEquals("operation:focus",				res.at("/query/operation").asText());
-		assertEquals(129,							res.at("/query/classRef/0").asInt());
-		assertEquals("korap:group",					res.at("/query/operands/0/@type").asText());
-		assertEquals("operation:position",			res.at("/query/operands/0/operation").asText());
-		assertEquals("frames:startswith",			res.at("/query/operands/0/frames/0").asText());
-		assertEquals("korap:group",					res.at("/query/operands/0/@type").asText());
-		assertEquals("operation:class",				res.at("/query/operands/0/operands/1/operation").asText());
-		assertEquals(129,							res.at("/query/operands/0/operands/1/classOut").asInt());
-		assertEquals("korap:token",					res.at("/query/operands/0/operands/1/operands/0/@type").asText());
-		assertEquals("der",							res.at("/query/operands/0/operands/1/operands/0/wrap/key").asText());
-		assertEquals("korap:span",					res.at("/query/operands/0/operands/0/@type").asText());
-		assertEquals("s",							res.at("/query/operands/0/operands/0/key").asText());
-
-		query = "#BED(der Mann , +pe)";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:reference",				res.at("/query/@type").asText());
-		assertEquals("operation:focus",				res.at("/query/operation").asText());
-		assertEquals(129,							res.at("/query/classRef/0").asInt());
-		assertEquals("korap:group",					res.at("/query/operands/0/@type").asText());
-		assertEquals("operation:position",			res.at("/query/operands/0/operation").asText());
-		assertEquals("frames:matches",				res.at("/query/operands/0/frames/0").asText());
-		assertEquals("korap:reference",				res.at("/query/operands/0/operands/0/@type").asText());
-		assertEquals("operation:focus",				res.at("/query/operands/0/operands/0/operation").asText());
-		assertEquals(-1,							res.at("/query/operands/0/operands/0/spanRef/0").asInt());
-		assertEquals(1,								res.at("/query/operands/0/operands/0/spanRef/1").asInt());
-		assertEquals("korap:span",					res.at("/query/operands/0/operands/0/operands/0/@type").asText());
-		assertEquals("p",							res.at("/query/operands/0/operands/0/operands/0/key").asText());
-		assertEquals("korap:reference",				res.at("/query/operands/0/operands/1/@type").asText());
-		assertEquals("operation:focus",				res.at("/query/operands/0/operands/1/operation").asText());
-		assertEquals(0,								res.at("/query/operands/0/operands/1/spanRef/0").asInt());
-		assertEquals(1,								res.at("/query/operands/0/operands/1/spanRef/1").asInt());
-		assertEquals("korap:group",					res.at("/query/operands/0/operands/1/operands/0/@type").asText());
-		assertEquals("operation:class",				res.at("/query/operands/0/operands/1/operands/0/operation").asText());
-		assertEquals(129,							res.at("/query/operands/0/operands/1/operands/0/classOut").asInt());
-		assertEquals("operation:sequence",			res.at("/query/operands/0/operands/1/operands/0/operands/0/operation").asText());
-		assertEquals("der",							res.at("/query/operands/0/operands/1/operands/0/operands/0/operands/0/wrap/key").asText());
-		assertEquals("Mann",						res.at("/query/operands/0/operands/1/operands/0/operands/0/operands/1/wrap/key").asText());
-
-		query = "#BED(der Mann , sa,-pa)";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:reference",				res.at("/query/@type").asText());
-		assertEquals("operation:focus",				res.at("/query/operation").asText());
-		assertEquals(129,							res.at("/query/classRef/0").asInt());
-		assertEquals("korap:group",					res.at("/query/operands/0/@type").asText());
-		assertEquals("operation:position",			res.at("/query/operands/0/operation").asText());
-		assertEquals("frames:matches",				res.at("/query/operands/0/frames/0").asText());
-
-		assertEquals("korap:group",					res.at("/query/operands/0/operands/0/@type").asText());
-		assertEquals("operation:position",			res.at("/query/operands/0/operands/0/operation").asText());
-		assertEquals("frames:startswith",			res.at("/query/operands/0/operands/0/frames/0").asText());
-		assertEquals("korap:span",					res.at("/query/operands/0/operands/0/operands/0/@type").asText());
-		assertEquals("s",							res.at("/query/operands/0/operands/0/operands/0/key").asText());
-		assertEquals("korap:group",					res.at("/query/operands/0/operands/0/operands/1/@type").asText());
-		assertEquals("operation:class",				res.at("/query/operands/0/operands/0/operands/1/operation").asText());
-		assertEquals(129,							res.at("/query/operands/0/operands/0/operands/1/classOut").asInt());
-		assertEquals("operation:sequence",			res.at("/query/operands/0/operands/0/operands/1/operands/0/operation").asText());
-		assertEquals("der",							res.at("/query/operands/0/operands/0/operands/1/operands/0/operands/0/wrap/key").asText());
-		assertEquals("Mann",						res.at("/query/operands/0/operands/0/operands/1/operands/0/operands/1/wrap/key").asText());
-
-		assertEquals("korap:group",					res.at("/query/operands/0/operands/1/@type").asText());
-		assertEquals("operation:position",			res.at("/query/operands/0/operands/1/operation").asText());
-		assertEquals("frames:startswith",			res.at("/query/operands/0/operands/1/frames/0").asText());
-		assertEquals(true,							res.at("/query/operands/0/operands/1/exclude").asBoolean());
-		assertEquals("korap:span",					res.at("/query/operands/0/operands/1/operands/0/@type").asText());
-		assertEquals("p",							res.at("/query/operands/0/operands/1/operands/0/key").asText());
-		assertEquals("korap:group",					res.at("/query/operands/0/operands/1/operands/1/@type").asText());
-		assertEquals("operation:class",				res.at("/query/operands/0/operands/1/operands/1/operation").asText());
-		assertEquals(130,							res.at("/query/operands/0/operands/1/operands/1/classOut").asInt());
-		assertEquals("operation:sequence",			res.at("/query/operands/0/operands/1/operands/1/operands/0/operation").asText());
-		assertEquals("der",							res.at("/query/operands/0/operands/1/operands/1/operands/0/operands/0/wrap/key").asText());
-		assertEquals("Mann",						res.at("/query/operands/0/operands/1/operands/1/operands/0/operands/1/wrap/key").asText());
-
-	}
-
-	@Test
-	public void testColonSeparatedConditions() throws JsonProcessingException, IOException {
-		query = "der:sa";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:reference",				res.at("/query/@type").asText());
-		assertEquals("operation:focus",				res.at("/query/operation").asText());
-		assertEquals(129,							res.at("/query/classRef/0").asInt());
-		assertEquals("korap:group",					res.at("/query/operands/0/@type").asText());
-		assertEquals("operation:position",			res.at("/query/operands/0/operation").asText());
-		assertEquals("frames:startswith",			res.at("/query/operands/0/frames/0").asText());
-		assertEquals("korap:group",					res.at("/query/operands/0/@type").asText());
-		assertEquals("operation:class",				res.at("/query/operands/0/operands/1/operation").asText());
-		assertEquals(129,							res.at("/query/operands/0/operands/1/classOut").asInt());
-		assertEquals("korap:token",					res.at("/query/operands/0/operands/1/operands/0/@type").asText());
-		assertEquals("der",							res.at("/query/operands/0/operands/1/operands/0/wrap/key").asText());
-		assertEquals("korap:span",					res.at("/query/operands/0/operands/0/@type").asText());
-		assertEquals("s",							res.at("/query/operands/0/operands/0/key").asText());
-
-		query = "der:sa,-pa";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:reference",				res.at("/query/@type").asText());
-		assertEquals("operation:focus",				res.at("/query/operation").asText());
-		assertEquals(129,							res.at("/query/classRef/0").asInt());
-		assertEquals("korap:group",					res.at("/query/operands/0/@type").asText());
-		assertEquals("operation:position",			res.at("/query/operands/0/operation").asText());
-		assertEquals("frames:matches",				res.at("/query/operands/0/frames/0").asText());
-		assertEquals("korap:group",					res.at("/query/operands/0/operands/0/@type").asText());
-		assertEquals("operation:position",			res.at("/query/operands/0/operands/0/operation").asText());
-		assertEquals("frames:startswith",			res.at("/query/operands/0/operands/0/frames/0").asText());
-		assertEquals("korap:span",					res.at("/query/operands/0/operands/0/operands/0/@type").asText());
-		assertEquals("s",							res.at("/query/operands/0/operands/0/operands/0/key").asText());
-		assertEquals("korap:group",					res.at("/query/operands/0/operands/0/operands/1/@type").asText());
-		assertEquals("operation:class",				res.at("/query/operands/0/operands/0/operands/1/operation").asText());
-		assertEquals(129,							res.at("/query/operands/0/operands/0/operands/1/classOut").asInt());
-		assertEquals("der",							res.at("/query/operands/0/operands/0/operands/1/operands/0/wrap/key").asText());
-		assertEquals("korap:group",					res.at("/query/operands/0/operands/1/@type").asText());
-		assertEquals("operation:position",			res.at("/query/operands/0/operands/1/operation").asText());
-		assertEquals("frames:startswith",			res.at("/query/operands/0/operands/1/frames/0").asText());
-		assertEquals(true,							res.at("/query/operands/0/operands/1/exclude").asBoolean());
-		assertEquals("korap:span",					res.at("/query/operands/0/operands/1/operands/0/@type").asText());
-		assertEquals("p",							res.at("/query/operands/0/operands/1/operands/0/key").asText());
-		assertEquals("korap:group",					res.at("/query/operands/0/operands/1/operands/1/@type").asText());
-		assertEquals("operation:class",				res.at("/query/operands/0/operands/1/operands/1/operation").asText());
-		assertEquals(130,							res.at("/query/operands/0/operands/1/operands/1/classOut").asInt());
-		assertEquals("der",							res.at("/query/operands/0/operands/1/operands/1/operands/0/wrap/key").asText());
-
-		query = "der:sa,-pa,+te";
-		qs.setQuery(query, "cosmas2");
-		res = mapper.readTree(qs.toJSON());
-		assertEquals("korap:reference",				res.at("/query/@type").asText());
-		assertEquals("operation:focus",				res.at("/query/operation").asText());
-		assertEquals(129,							res.at("/query/classRef/0").asInt());
-		assertEquals("korap:group",					res.at("/query/operands/0/@type").asText());
-		assertEquals("operation:position",			res.at("/query/operands/0/operation").asText());
-		assertEquals("frames:matches",				res.at("/query/operands/0/frames/0").asText());
-		assertEquals("korap:group",					res.at("/query/operands/0/operands/0/@type").asText());
-		assertEquals("operation:position",			res.at("/query/operands/0/operands/0/operation").asText());
-		assertEquals("frames:startswith",			res.at("/query/operands/0/operands/0/frames/0").asText());
-		assertEquals("korap:span",					res.at("/query/operands/0/operands/0/operands/0/@type").asText());
-		assertEquals("s",							res.at("/query/operands/0/operands/0/operands/0/key").asText());
-		assertEquals("korap:group",					res.at("/query/operands/0/operands/0/operands/1/@type").asText());
-		assertEquals("operation:class",				res.at("/query/operands/0/operands/0/operands/1/operation").asText());
-		assertEquals(129,							res.at("/query/operands/0/operands/0/operands/1/classOut").asInt());
-		assertEquals("der",							res.at("/query/operands/0/operands/0/operands/1/operands/0/wrap/key").asText());
-		assertEquals("korap:reference",				res.at("/query/operands/0/operands/1/@type").asText());
-		assertEquals("operation:focus",				res.at("/query/operands/0/operands/1/operation").asText());
-		assertEquals(130,							res.at("/query/operands/0/operands/1/classRef/0").asInt());
-		assertEquals("korap:group",					res.at("/query/operands/0/operands/1/operands/0/@type").asText());
-		assertEquals("operation:position",			res.at("/query/operands/0/operands/1/operands/0/operation").asText());
-		assertEquals("frames:matches",				res.at("/query/operands/0/operands/1/operands/0/frames/0").asText());
-		assertEquals("korap:group",					res.at("/query/operands/0/operands/1/operands/0/operands/0/@type").asText());
-		assertEquals("operation:position",			res.at("/query/operands/0/operands/1/operands/0/operands/0/operation").asText());
-		assertEquals("frames:startswith",			res.at("/query/operands/0/operands/1/operands/0/operands/0/frames/0").asText());
-		assertEquals(true,							res.at("/query/operands/0/operands/1/operands/0/operands/0/exclude").asBoolean());
-		assertEquals("korap:span",					res.at("/query/operands/0/operands/1/operands/0/operands/0/operands/0/@type").asText());
-		assertEquals("p",							res.at("/query/operands/0/operands/1/operands/0/operands/0/operands/0/key").asText());
-		assertEquals("korap:group",					res.at("/query/operands/0/operands/1/operands/0/operands/0/operands/1/@type").asText());
-		assertEquals("operation:class",				res.at("/query/operands/0/operands/1/operands/0/operands/0/operands/1/operation").asText());
-		assertEquals(130,							res.at("/query/operands/0/operands/1/operands/0/operands/0/operands/1/classOut").asInt());
-		assertEquals("der",							res.at("/query/operands/0/operands/1/operands/0/operands/0/operands/1/operands/0/wrap/key").asText());
-		assertEquals("korap:group",					res.at("/query/operands/0/operands/1/operands/0/operands/1/@type").asText());
-		assertEquals("operation:position",			res.at("/query/operands/0/operands/1/operands/0/operands/1/operation").asText());
-		assertEquals("frames:matches",				res.at("/query/operands/0/operands/1/operands/0/operands/1/frames/0").asText());
-		assertEquals("korap:reference",				res.at("/query/operands/0/operands/1/operands/0/operands/1/operands/0/@type").asText());
-		assertEquals("operation:focus",				res.at("/query/operands/0/operands/1/operands/0/operands/1/operands/0/operation").asText());
-		assertEquals(-1,							res.at("/query/operands/0/operands/1/operands/0/operands/1/operands/0/spanRef/0").asInt());
-		assertEquals(1,								res.at("/query/operands/0/operands/1/operands/0/operands/1/operands/0/spanRef/1").asInt());
-		assertEquals("korap:span",					res.at("/query/operands/0/operands/1/operands/0/operands/1/operands/0/operands/0/@type").asText());
-		assertEquals("t",							res.at("/query/operands/0/operands/1/operands/0/operands/1/operands/0/operands/0/key").asText());
-		assertEquals("korap:reference",				res.at("/query/operands/0/operands/1/operands/0/operands/1/operands/1/@type").asText());
-		assertEquals("operation:focus",				res.at("/query/operands/0/operands/1/operands/0/operands/1/operands/1/operation").asText());
-		assertEquals(0,								res.at("/query/operands/0/operands/1/operands/0/operands/1/operands/1/spanRef/0").asInt());
-		assertEquals(1,								res.at("/query/operands/0/operands/1/operands/0/operands/1/operands/1/spanRef/1").asInt());
-		assertEquals("korap:group",					res.at("/query/operands/0/operands/1/operands/0/operands/1/operands/1/operands/0/@type").asText());
-		assertEquals("operation:class",				res.at("/query/operands/0/operands/1/operands/0/operands/1/operands/1/operands/0/operation").asText());
-		assertEquals(131,							res.at("/query/operands/0/operands/1/operands/0/operands/1/operands/1/operands/0/classOut").asInt());
-		assertEquals("der",							res.at("/query/operands/0/operands/1/operands/0/operands/1/operands/1/operands/0/operands/0/wrap/key").asText());
-	}
-	
-	@Test
-	public void testErrors() throws JsonProcessingException, IOException {
-	    query = "MORPH(tt/p=\"\")";
-        qs.setQuery(query, "cosmas2");
-        res = mapper.readTree(qs.toJSON());
-        assertEquals(true,         res.at("/query/@type").isMissingNode());
-        assertEquals(StatusCodes.INCOMPATIBLE_OPERATOR_AND_OPERAND,          res.at("/errors/0/0").asInt());
-        assertTrue(res.at("/errors/0/1").asText().startsWith("Something went wrong parsing the argument in MORPH()"));
-        
-        query = "MORPH(tt/p=\"foo)";
-        qs.setQuery(query, "cosmas2");
-        res = mapper.readTree(qs.toJSON());
-        assertEquals(true,         res.at("/query/@type").isMissingNode());
-        assertEquals(StatusCodes.MALFORMED_QUERY,          res.at("/errors/0/0").asInt());
-        assertTrue(res.at("/errors/0/1").asText().startsWith("Early closing parenthesis"));
-        
-        query = "MORPH(tt/p=)";
-        qs.setQuery(query, "cosmas2");
-        res = mapper.readTree(qs.toJSON());
-        assertEquals(true,         res.at("/query/@type").isMissingNode());
-        assertEquals(StatusCodes.MALFORMED_QUERY,          res.at("/errors/0/0").asInt());
-        assertTrue(res.at("/errors/0/1").asText().startsWith("Early closing parenthesis"));
-	}
-}
\ No newline at end of file
diff --git a/src/test/java/AnnisQueryProcessorTest.java b/src/test/java/de/ids_mannheim/korap/query/serialize/AnnisQueryProcessorTest.java
similarity index 99%
rename from src/test/java/AnnisQueryProcessorTest.java
rename to src/test/java/de/ids_mannheim/korap/query/serialize/AnnisQueryProcessorTest.java
index fffd806..1c12952 100644
--- a/src/test/java/AnnisQueryProcessorTest.java
+++ b/src/test/java/de/ids_mannheim/korap/query/serialize/AnnisQueryProcessorTest.java
@@ -1,3 +1,4 @@
+package de.ids_mannheim.korap.query.serialize;
 import static org.junit.Assert.*;
 
 import java.io.IOException;
diff --git a/src/test/java/CollectionQueryProcessorTest.java b/src/test/java/de/ids_mannheim/korap/query/serialize/CollectionQueryProcessorTest.java
similarity index 99%
rename from src/test/java/CollectionQueryProcessorTest.java
rename to src/test/java/de/ids_mannheim/korap/query/serialize/CollectionQueryProcessorTest.java
index ebd5555..4a485f6 100644
--- a/src/test/java/CollectionQueryProcessorTest.java
+++ b/src/test/java/de/ids_mannheim/korap/query/serialize/CollectionQueryProcessorTest.java
@@ -1,3 +1,4 @@
+package de.ids_mannheim.korap.query.serialize;
 import static org.junit.Assert.*;
 
 import java.io.IOException;
diff --git a/src/test/java/de/ids_mannheim/korap/query/serialize/Cosmas2QueryProcessorTest.java b/src/test/java/de/ids_mannheim/korap/query/serialize/Cosmas2QueryProcessorTest.java
new file mode 100644
index 0000000..df30e6d
--- /dev/null
+++ b/src/test/java/de/ids_mannheim/korap/query/serialize/Cosmas2QueryProcessorTest.java
@@ -0,0 +1,1179 @@
+package de.ids_mannheim.korap.query.serialize;
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+import java.util.ArrayList;
+
+import org.junit.Test;
+
+import de.ids_mannheim.korap.query.serialize.QuerySerializer;
+import de.ids_mannheim.korap.query.serialize.util.StatusCodes;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+/**
+ * Tests for JSON-LD serialization of Cosmas II queries. 
+ * @author Joachim Bingel (bingel@ids-mannheim.de)
+ * @version 1.0
+ */
+public class Cosmas2QueryProcessorTest {
+
+
+    String query;
+    ArrayList<JsonNode> operands;
+
+    QuerySerializer qs = new QuerySerializer();
+    ObjectMapper mapper = new ObjectMapper();
+    JsonNode res;
+
+    @Test
+    public void testContext() throws JsonProcessingException, IOException {
+        String contextString = "http://ids-mannheim.de/ns/KorAP/json-ld/v0.2/context.jsonld";
+        query = "foo";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals(contextString, res.get("@context").asText());
+    }
+
+
+    @Test
+    public void testSingleToken() throws JsonProcessingException, IOException {
+        query = "der";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:token", 		res.at("/query/@type").asText());
+        assertEquals("korap:term", 			res.at("/query/wrap/@type").asText());
+        assertEquals("der", 				res.at("/query/wrap/key").asText());
+        assertEquals("orth", 				res.at("/query/wrap/layer").asText());
+        assertEquals("match:eq",			res.at("/query/wrap/match").asText());
+
+        query = "&Mann";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:token", 		res.at("/query/@type").asText());
+        assertEquals("korap:term", 			res.at("/query/wrap/@type").asText());
+        assertEquals("Mann", 				res.at("/query/wrap/key").asText());
+        assertEquals("lemma", 				res.at("/query/wrap/layer").asText());
+        assertEquals("match:eq",			res.at("/query/wrap/match").asText());
+    }
+
+
+
+    @Test
+    public void testWildcardToken() throws JsonProcessingException, IOException {
+        query = "*der";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:term", 			res.at("/query/wrap/@type").asText());
+        assertEquals("type:wildcard",		res.at("/query/wrap/type").asText());
+        assertEquals("*der", 				res.at("/query/wrap/key").asText());
+        assertEquals("orth", 				res.at("/query/wrap/layer").asText());
+        assertEquals("match:eq",			res.at("/query/wrap/match").asText());
+
+        query = "*de*?r";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("*de*?r", 				res.at("/query/wrap/key").asText());
+    }
+    //	
+    @Test
+    public void testCaseSensitivityFlag() throws JsonProcessingException, IOException {
+        query = "$deutscher";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:term", 			res.at("/query/wrap/@type").asText());
+        assertEquals("deutscher",			res.at("/query/wrap/key").asText());
+        assertEquals(true,					res.at("/query/wrap/caseInsensitive").asBoolean());
+        assertEquals("orth", 				res.at("/query/wrap/layer").asText());
+        assertEquals("match:eq",			res.at("/query/wrap/match").asText());
+
+        query = "$deutscher Bundestag";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:group",			res.at("/query/@type").asText());
+        assertEquals("operation:sequence",	res.at("/query/operation").asText());
+        assertEquals("korap:term", 			res.at("/query/operands/0/wrap/@type").asText());
+        assertEquals("deutscher",			res.at("/query/operands/0/wrap/key").asText());
+        assertEquals(true,					res.at("/query/operands/0/wrap/caseInsensitive").asBoolean());
+        assertEquals("orth", 				res.at("/query/operands/0/wrap/layer").asText());
+        assertEquals("match:eq",			res.at("/query/operands/0/wrap/match").asText());
+        assertEquals("Bundestag",			res.at("/query/operands/1/wrap/key").asText());
+        assertEquals(true,					res.at("/query/operands/1/wrap/caseInsensitive").isMissingNode());
+    }
+
+    @Test
+    public void testMORPH() throws JsonProcessingException, IOException {
+        query = "MORPH(p=V)";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:token",			res.at("/query/@type").asText());
+        assertEquals("korap:term", 			res.at("/query/wrap/@type").asText());
+        assertEquals("V",					res.at("/query/wrap/key").asText());
+        assertEquals("p",					res.at("/query/wrap/layer").asText());
+        assertEquals("match:eq",			res.at("/query/wrap/match").asText());
+
+        query = "MORPH(V)";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:token",			res.at("/query/@type").asText());
+        assertEquals("korap:term", 			res.at("/query/wrap/@type").asText());
+        assertEquals("V",					res.at("/query/wrap/key").asText());
+        assertEquals("match:eq",			res.at("/query/wrap/match").asText());
+
+        query = "MORPH(tt/p=V)";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:token",			res.at("/query/@type").asText());
+        assertEquals("korap:term", 			res.at("/query/wrap/@type").asText());
+        assertEquals("V",					res.at("/query/wrap/key").asText());
+        assertEquals("p",					res.at("/query/wrap/layer").asText());
+        assertEquals("tt",					res.at("/query/wrap/foundry").asText());
+        assertEquals("match:eq",			res.at("/query/wrap/match").asText());
+
+        query = "MORPH(tt/p=\"V.*\")";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:token",         res.at("/query/@type").asText());
+        assertEquals("korap:term",          res.at("/query/wrap/@type").asText());
+        assertEquals("type:regex",          res.at("/query/wrap/type").asText());
+        assertEquals("V.*",                 res.at("/query/wrap/key").asText());
+        assertEquals("p",                   res.at("/query/wrap/layer").asText());
+        assertEquals("tt",                  res.at("/query/wrap/foundry").asText());
+        assertEquals("match:eq",            res.at("/query/wrap/match").asText());
+
+        query = "MORPH(mate/m=temp:pres)";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:token",			res.at("/query/@type").asText());
+        assertEquals("korap:term", 			res.at("/query/wrap/@type").asText());
+        assertEquals("temp",				res.at("/query/wrap/key").asText());
+        assertEquals("pres",				res.at("/query/wrap/value").asText());
+        assertEquals("m",					res.at("/query/wrap/layer").asText());
+        assertEquals("mate",				res.at("/query/wrap/foundry").asText());
+        assertEquals("match:eq",			res.at("/query/wrap/match").asText());
+
+        query = "MORPH(tt/p=V & mate/m!=temp:pres)";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:token",			res.at("/query/@type").asText());
+        assertEquals("korap:termGroup",		res.at("/query/wrap/@type").asText());
+        assertEquals("V",					res.at("/query/wrap/operands/0/key").asText());
+        assertEquals("p",					res.at("/query/wrap/operands/0/layer").asText());
+        assertEquals("tt",					res.at("/query/wrap/operands/0/foundry").asText());
+        assertEquals("match:eq",			res.at("/query/wrap/operands/0/match").asText());
+        assertEquals("temp",				res.at("/query/wrap/operands/1/key").asText());
+        assertEquals("pres",				res.at("/query/wrap/operands/1/value").asText());
+        assertEquals("m",					res.at("/query/wrap/operands/1/layer").asText());
+        assertEquals("mate",				res.at("/query/wrap/operands/1/foundry").asText());
+        assertEquals("match:ne",			res.at("/query/wrap/operands/1/match").asText());
+    }
+
+    @Test
+    public void testSequence() throws JsonProcessingException, IOException {
+        query = "der Mann";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:group",			res.at("/query/@type").asText());
+        assertEquals("operation:sequence",	res.at("/query/operation").asText());
+        assertEquals("der",					res.at("/query/operands/0/wrap/key").asText());
+        assertEquals("Mann",				res.at("/query/operands/1/wrap/key").asText());
+        assertEquals(true,					res.at("/query/operands/2").isMissingNode());
+
+        query = "der Mann schläft";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:group",			res.at("/query/@type").asText());
+        assertEquals("operation:sequence",	res.at("/query/operation").asText());
+        assertEquals("der",					res.at("/query/operands/0/wrap/key").asText());
+        assertEquals("Mann",				res.at("/query/operands/1/wrap/key").asText());
+        assertEquals("schläft",				res.at("/query/operands/2/wrap/key").asText());
+        assertEquals(true,					res.at("/query/operands/3").isMissingNode());
+
+        query = "der Mann schläft lang";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:group",			res.at("/query/@type").asText());
+        assertEquals("operation:sequence",	res.at("/query/operation").asText());
+        assertEquals("der",					res.at("/query/operands/0/wrap/key").asText());
+        assertEquals("Mann",				res.at("/query/operands/1/wrap/key").asText());
+        assertEquals("schläft",				res.at("/query/operands/2/wrap/key").asText());
+        assertEquals("lang",				res.at("/query/operands/3/wrap/key").asText());
+        assertEquals(true,					res.at("/query/operands/4").isMissingNode());
+
+        query = "der #ELEM(W)";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:group",			res.at("/query/@type").asText());
+        assertEquals("operation:sequence",	res.at("/query/operation").asText());
+        assertEquals("der",					res.at("/query/operands/0/wrap/key").asText());
+        assertEquals("w",					res.at("/query/operands/1/key").asText());
+        assertEquals("korap:span",			res.at("/query/operands/1/@type").asText());
+        assertEquals(true,					res.at("/query/operands/2").isMissingNode());
+
+        query = "der #ELEM(W) Mann";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:group",			res.at("/query/@type").asText());
+        assertEquals("operation:sequence",	res.at("/query/operation").asText());
+        assertEquals("der",					res.at("/query/operands/0/wrap/key").asText());
+        assertEquals("w",					res.at("/query/operands/1/key").asText());
+        assertEquals("korap:span",			res.at("/query/operands/1/@type").asText());
+        assertEquals("Mann",				res.at("/query/operands/2/wrap/key").asText());
+        assertEquals(true,					res.at("/query/operands/3").isMissingNode());
+
+        query = "der MORPH(p=ADJA) Mann";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:group",			res.at("/query/@type").asText());
+        assertEquals("operation:sequence",	res.at("/query/operation").asText());
+        assertEquals("der",					res.at("/query/operands/0/wrap/key").asText());
+        assertEquals("ADJA",				res.at("/query/operands/1/wrap/key").asText());
+        assertEquals("p",					res.at("/query/operands/1/wrap/layer").asText());
+        assertEquals("Mann",				res.at("/query/operands/2/wrap/key").asText());
+        assertEquals(true,					res.at("/query/operands/3").isMissingNode());
+    }
+
+    @Test
+    public void testOPOR() throws JsonProcessingException, IOException {
+        query = "Sonne oder Mond";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:group",			res.at("/query/@type").asText());
+        assertEquals("operation:or",		res.at("/query/operation").asText());
+        assertEquals("Sonne",				res.at("/query/operands/0/wrap/key").asText());
+        assertEquals("Mond",				res.at("/query/operands/1/wrap/key").asText());
+        assertEquals(true,					res.at("/query/operands/2").isMissingNode());
+
+        query = "(Sonne scheint) oder Mond";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:group",			res.at("/query/@type").asText());
+        assertEquals("operation:or",		res.at("/query/operation").asText());
+        assertEquals("korap:group",			res.at("/query/operands/0/@type").asText());
+        assertEquals("operation:sequence",	res.at("/query/operands/0/operation").asText());
+        assertEquals("Sonne",				res.at("/query/operands/0/operands/0/wrap/key").asText());
+        assertEquals("scheint",				res.at("/query/operands/0/operands/1/wrap/key").asText());
+        assertEquals("Mond",				res.at("/query/operands/1/wrap/key").asText());
+        assertEquals(true,					res.at("/query/operands/2").isMissingNode());
+
+        query = "(Sonne scheint) oder (Mond scheint)";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:group",			res.at("/query/@type").asText());
+        assertEquals("operation:or",		res.at("/query/operation").asText());
+        assertEquals("korap:group",			res.at("/query/operands/0/@type").asText());
+        assertEquals("operation:sequence",	res.at("/query/operands/0/operation").asText());
+        assertEquals("korap:group",			res.at("/query/operands/1/@type").asText());
+        assertEquals("operation:sequence",	res.at("/query/operands/1/operation").asText());
+        assertEquals("Sonne",				res.at("/query/operands/0/operands/0/wrap/key").asText());
+        assertEquals("scheint",				res.at("/query/operands/0/operands/1/wrap/key").asText());
+        assertEquals("Mond",				res.at("/query/operands/1/operands/0/wrap/key").asText());
+        assertEquals("scheint",				res.at("/query/operands/1/operands/1/wrap/key").asText());
+        assertEquals(true,					res.at("/query/operands/2").isMissingNode());
+    }
+
+    @Test
+    public void testOPORAND() throws JsonProcessingException, IOException {
+        query = "(Sonne oder Mond) und scheint";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:group",			res.at("/query/@type").asText());
+        assertEquals("operation:sequence",	res.at("/query/operation").asText());
+        assertEquals("cosmas:distance",		res.at("/query/distances/0/@type").asText());
+        assertEquals("t",					res.at("/query/distances/0/key").asText());
+        assertEquals(0,						res.at("/query/distances/0/min").asInt());
+        assertEquals(0,						res.at("/query/distances/0/max").asInt());
+        assertEquals("korap:group",			res.at("/query/operands/0/@type").asText());
+        assertEquals("operation:or",		res.at("/query/operands/0/operation").asText());
+        assertEquals("Sonne",				res.at("/query/operands/0/operands/0/wrap/key").asText());
+        assertEquals("Mond",				res.at("/query/operands/0/operands/1/wrap/key").asText());
+        assertEquals("korap:token",			res.at("/query/operands/1/@type").asText());
+        assertEquals("scheint",				res.at("/query/operands/1/wrap/key").asText());
+
+        query = "scheint und (Sonne oder Mond)";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:group",			res.at("/query/@type").asText());
+        assertEquals("operation:sequence",	res.at("/query/operation").asText());
+        assertEquals("cosmas:distance",		res.at("/query/distances/0/@type").asText());
+        assertEquals("t",					res.at("/query/distances/0/key").asText());
+        assertEquals(0,						res.at("/query/distances/0/min").asInt());
+        assertEquals(0,						res.at("/query/distances/0/max").asInt());
+        assertEquals("korap:token",			res.at("/query/operands/0/@type").asText());
+        assertEquals("scheint",				res.at("/query/operands/0/wrap/key").asText());
+        assertEquals("korap:group",			res.at("/query/operands/1/@type").asText());
+        assertEquals("operation:or",		res.at("/query/operands/1/operation").asText());
+        assertEquals("Sonne",				res.at("/query/operands/1/operands/0/wrap/key").asText());
+        assertEquals("Mond",				res.at("/query/operands/1/operands/1/wrap/key").asText());
+
+        query = "Regen und scheint und (Sonne oder Mond)";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:group",			res.at("/query/@type").asText());
+        assertEquals("operation:sequence",	res.at("/query/operation").asText());
+        assertEquals("cosmas:distance",		res.at("/query/distances/0/@type").asText());
+        assertEquals("t",					res.at("/query/distances/0/key").asText());
+        assertEquals(0,						res.at("/query/distances/0/min").asInt());
+        assertEquals(0,						res.at("/query/distances/0/max").asInt());
+        assertEquals("korap:token",			res.at("/query/operands/0/@type").asText());
+        assertEquals("Regen",				res.at("/query/operands/0/wrap/key").asText());
+        assertEquals("korap:group",			res.at("/query/@type").asText());
+        assertEquals("operation:sequence",	res.at("/query/operation").asText());
+        assertEquals("cosmas:distance",		res.at("/query/operands/1/distances/0/@type").asText());
+        assertEquals("t",					res.at("/query/operands/1/distances/0/key").asText());
+        assertEquals(0,						res.at("/query/operands/1/distances/0/min").asInt());
+        assertEquals(0,						res.at("/query/operands/1/distances/0/max").asInt());
+        assertEquals("scheint",				res.at("/query/operands/1/operands/0/wrap/key").asText());
+        assertEquals("korap:group",			res.at("/query/operands/1/operands/1/@type").asText());
+        assertEquals("operation:or",		res.at("/query/operands/1/operands/1/operation").asText());
+        assertEquals("Sonne",				res.at("/query/operands/1/operands/1/operands/0/wrap/key").asText());
+        assertEquals("Mond",				res.at("/query/operands/1/operands/1/operands/1/wrap/key").asText());
+    }
+
+    @Test
+    public void testOPNOT() throws JsonProcessingException, IOException {
+        query = "Sonne nicht Mond";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:group",			res.at("/query/@type").asText());
+        assertEquals("operation:sequence",	res.at("/query/operation").asText());
+        assertEquals("cosmas:distance",		res.at("/query/distances/0/@type").asText());
+        assertEquals("t",					res.at("/query/distances/0/key").asText());
+        assertEquals(0,						res.at("/query/distances/0/min").asInt());
+        assertEquals(0,						res.at("/query/distances/0/max").asInt());
+        assertEquals(true,					res.at("/query/distances/0/exclude").asBoolean());
+        assertEquals("korap:token",			res.at("/query/operands/0/@type").asText());
+        assertEquals("Sonne",				res.at("/query/operands/0/wrap/key").asText());
+        assertEquals("Mond",				res.at("/query/operands/1/wrap/key").asText());
+
+        query = "Sonne nicht Mond nicht Sterne";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:group",			res.at("/query/@type").asText());
+        assertEquals("operation:sequence",	res.at("/query/operation").asText());
+        assertEquals("cosmas:distance",		res.at("/query/distances/0/@type").asText());
+        assertEquals("t",					res.at("/query/distances/0/key").asText());
+        assertEquals(0,						res.at("/query/distances/0/min").asInt());
+        assertEquals(0,						res.at("/query/distances/0/max").asInt());
+        assertEquals(true,					res.at("/query/distances/0/exclude").asBoolean());
+        assertEquals("korap:token",			res.at("/query/operands/0/@type").asText());
+        assertEquals("Sonne",				res.at("/query/operands/0/wrap/key").asText());
+        assertEquals("korap:group",			res.at("/query/operands/1/@type").asText());
+        assertEquals("operation:sequence",	res.at("/query/operands/1/operation").asText());
+        assertEquals("cosmas:distance",		res.at("/query/operands/1/distances/0/@type").asText());
+        assertEquals("t",					res.at("/query/operands/1/distances/0/key").asText());
+        assertEquals(0,						res.at("/query/operands/1/distances/0/min").asInt());
+        assertEquals(0,						res.at("/query/operands/1/distances/0/max").asInt());
+        assertEquals(true,					res.at("/query/operands/1/distances/0/exclude").asBoolean());
+        assertEquals("Mond",				res.at("/query/operands/1/operands/0/wrap/key").asText());
+        assertEquals("Sterne",				res.at("/query/operands/1/operands/1/wrap/key").asText());
+
+        query = "(Sonne nicht Mond) nicht Sterne";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:group",			res.at("/query/@type").asText());
+        assertEquals("operation:sequence",	res.at("/query/operation").asText());
+        assertEquals("cosmas:distance",		res.at("/query/distances/0/@type").asText());
+        assertEquals("t",					res.at("/query/distances/0/key").asText());
+        assertEquals(0,						res.at("/query/distances/0/min").asInt());
+        assertEquals(0,						res.at("/query/distances/0/max").asInt());
+        assertEquals(true,					res.at("/query/distances/0/exclude").asBoolean());
+        assertEquals("korap:group",			res.at("/query/operands/0/@type").asText());
+        assertEquals("operation:sequence",	res.at("/query/operands/0/operation").asText());
+        assertEquals("cosmas:distance",		res.at("/query/operands/0/distances/0/@type").asText());
+        assertEquals("t",					res.at("/query/operands/0/distances/0/key").asText());
+        assertEquals(0,						res.at("/query/operands/0/distances/0/min").asInt());
+        assertEquals(0,						res.at("/query/operands/0/distances/0/max").asInt());
+        assertEquals(true,					res.at("/query/operands/0/distances/0/exclude").asBoolean());
+        assertEquals("Sonne",				res.at("/query/operands/0/operands/0/wrap/key").asText());
+        assertEquals("Mond",				res.at("/query/operands/0/operands/1/wrap/key").asText());
+        assertEquals("korap:token",			res.at("/query/operands/1/@type").asText());
+        assertEquals("Sterne",				res.at("/query/operands/1/wrap/key").asText());
+    }
+
+    @Test
+    public void testOPPROX() throws JsonProcessingException, IOException {
+        query = "Sonne /+w1:4 Mond";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:reference",		res.at("/query/@type").asText());
+        assertEquals("operation:focus",		res.at("/query/operation").asText());
+        assertEquals(129,					res.at("/query/classRef/0").asInt());
+        assertEquals("korap:group",			res.at("/query/operands/0/@type").asText());
+        assertEquals("operation:sequence",	res.at("/query/operands/0/operation").asText());
+        assertEquals("korap:distance",		res.at("/query/operands/0/distances/0/@type").asText());
+        assertEquals("w",					res.at("/query/operands/0/distances/0/key").asText());
+        assertEquals(1,						res.at("/query/operands/0/distances/0/boundary/min").asInt());
+        assertEquals(4,						res.at("/query/operands/0/distances/0/boundary/max").asInt());
+        assertEquals(true,					res.at("/query/operands/0/inOrder").asBoolean());
+        assertEquals("korap:group",			res.at("/query/operands/0/operands/0/@type").asText());
+        assertEquals("operation:class",		res.at("/query/operands/0/operands/0/operation").asText());
+        assertEquals(129,					res.at("/query/operands/0/operands/0/classOut").asInt());
+        assertEquals(129,					res.at("/query/operands/0/operands/1/classOut").asInt());
+        assertEquals("korap:token",			res.at("/query/operands/0/operands/0/operands/0/@type").asText());
+        assertEquals("Sonne",				res.at("/query/operands/0/operands/0/operands/0/wrap/key").asText());
+        assertEquals("Mond",				res.at("/query/operands/0/operands/1/operands/0/wrap/key").asText());
+
+        query = "Sonne /+w1:4,s0,p1:3 Mond";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:reference",		res.at("/query/@type").asText());
+        assertEquals("operation:focus",		res.at("/query/operation").asText());
+        assertEquals(129,					res.at("/query/classRef/0").asInt());
+        assertEquals("korap:group",			res.at("/query/operands/0/@type").asText());
+        assertEquals("operation:sequence",	res.at("/query/operands/0/operation").asText());
+        assertEquals("korap:distance",		res.at("/query/operands/0/distances/0/@type").asText());
+        assertEquals("w",					res.at("/query/operands/0/distances/0/key").asText());
+        assertEquals(1,						res.at("/query/operands/0/distances/0/boundary/min").asInt());
+        assertEquals(4,						res.at("/query/operands/0/distances/0/boundary/max").asInt());
+        assertEquals("s",					res.at("/query/operands/0/distances/1/key").asText());
+        assertEquals(0,						res.at("/query/operands/0/distances/1/boundary/min").asInt());
+        assertEquals("p",					res.at("/query/operands/0/distances/2/key").asText());
+        assertEquals(1,						res.at("/query/operands/0/distances/2/boundary/min").asInt());
+        assertEquals(3,						res.at("/query/operands/0/distances/2/boundary/max").asInt());
+        assertEquals(true,					res.at("/query/operands/0/inOrder").asBoolean());
+        assertEquals("korap:group",			res.at("/query/operands/0/operands/0/@type").asText());
+        assertEquals("operation:class",		res.at("/query/operands/0/operands/0/operation").asText());
+        assertEquals(129,					res.at("/query/operands/0/operands/0/classOut").asInt());
+        assertEquals(129,					res.at("/query/operands/0/operands/1/classOut").asInt());
+        assertEquals("korap:token",			res.at("/query/operands/0/operands/0/operands/0/@type").asText());
+        assertEquals("Sonne",				res.at("/query/operands/0/operands/0/operands/0/wrap/key").asText());
+        assertEquals("Mond",				res.at("/query/operands/0/operands/1/operands/0/wrap/key").asText());
+
+        query = "Sonne /+w4 Mond";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:distance",		res.at("/query/operands/0/distances/0/@type").asText());
+        assertEquals("w",					res.at("/query/operands/0/distances/0/key").asText());
+        assertEquals(0,						res.at("/query/operands/0/distances/0/boundary/min").asInt());
+        assertEquals(4,						res.at("/query/operands/0/distances/0/boundary/max").asInt());
+
+        query = "Sonne /-w4 Mond";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:distance",		res.at("/query/operands/0/distances/0/@type").asText());
+        assertEquals("w",					res.at("/query/operands/0/distances/0/key").asText());
+        assertEquals(0,						res.at("/query/operands/0/distances/0/boundary/min").asInt());
+        assertEquals(4,						res.at("/query/operands/0/distances/0/boundary/max").asInt());
+        assertEquals("Mond",				res.at("/query/operands/0/operands/0/operands/0/wrap/key").asText());
+        assertEquals("Sonne",				res.at("/query/operands/0/operands/1/operands/0/wrap/key").asText());
+
+        query = "Sonne /w4 Mond";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:distance",		res.at("/query/operands/0/distances/0/@type").asText());
+        assertEquals("w",					res.at("/query/operands/0/distances/0/key").asText());
+        assertEquals(0,						res.at("/query/operands/0/distances/0/boundary/min").asInt());
+        assertEquals(4,						res.at("/query/operands/0/distances/0/boundary/max").asInt());
+        assertEquals("Sonne",				res.at("/query/operands/0/operands/0/operands/0/wrap/key").asText());
+        assertEquals("Mond",				res.at("/query/operands/0/operands/1/operands/0/wrap/key").asText());
+        assertEquals(false,					res.at("/query/operands/0/inOrder").asBoolean());
+    }
+
+    @Test
+    public void testOPPROXNested() throws JsonProcessingException, IOException {	
+        query = "Sonne /+w1:4 Mond /+w1:7 Sterne";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:reference",		res.at("/query/@type").asText());
+        assertEquals("operation:focus",		res.at("/query/operation").asText());
+        assertEquals(129,					res.at("/query/classRef/0").asInt());
+        assertEquals("korap:group",			res.at("/query/operands/0/@type").asText());
+        assertEquals("operation:sequence",	res.at("/query/operands/0/operation").asText());
+        assertEquals("korap:distance",		res.at("/query/operands/0/distances/0/@type").asText());
+        assertEquals("w",					res.at("/query/operands/0/distances/0/key").asText());
+        assertEquals(1,						res.at("/query/operands/0/distances/0/boundary/min").asInt());
+        assertEquals(4,						res.at("/query/operands/0/distances/0/boundary/max").asInt());
+        assertEquals(true,					res.at("/query/operands/0/inOrder").asBoolean());
+        assertEquals("korap:group",			res.at("/query/operands/0/operands/0/@type").asText());
+        assertEquals("operation:class",		res.at("/query/operands/0/operands/0/operation").asText());
+        assertEquals(129,					res.at("/query/operands/0/operands/0/classOut").asInt());
+        assertEquals("Sonne",				res.at("/query/operands/0/operands/0/operands/0/wrap/key").asText());
+        assertEquals(129,					res.at("/query/operands/0/operands/1/classOut").asInt());
+        assertEquals("korap:reference",		res.at("/query/operands/0/operands/1/operands/0/@type").asText());
+        assertEquals(130,					res.at("/query/operands/0/operands/1/operands/0/classRef/0").asInt());
+        assertEquals("operation:focus",		res.at("/query/operands/0/operands/1/operands/0/operation").asText());
+        assertEquals("operation:sequence",	res.at("/query/operands/0/operands/1/operands/0/operands/0/operation").asText());
+        assertEquals("w",					res.at("/query/operands/0/operands/1/operands/0/operands/0/distances/0/key").asText());
+        assertEquals(1,						res.at("/query/operands/0/operands/1/operands/0/operands/0/distances/0/boundary/min").asInt());
+        assertEquals(7,						res.at("/query/operands/0/operands/1/operands/0/operands/0/distances/0/boundary/max").asInt());
+        assertEquals(130,					res.at("/query/operands/0/operands/1/operands/0/operands/0/operands/0/classOut").asInt());
+        assertEquals("Mond",				res.at("/query/operands/0/operands/1/operands/0/operands/0/operands/0/operands/0/wrap/key").asText());
+        assertEquals(130,					res.at("/query/operands/0/operands/1/operands/0/operands/0/operands/1/classOut").asInt());
+        assertEquals("Sterne",				res.at("/query/operands/0/operands/1/operands/0/operands/0/operands/1/operands/0/wrap/key").asText());
+
+        query = "Sonne /+w1:4 Mond /-w1:7 Sterne";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("Sonne",				res.at("/query/operands/0/operands/0/operands/0/wrap/key").asText());
+        assertEquals("Sterne",				res.at("/query/operands/0/operands/1/operands/0/operands/0/operands/0/operands/0/wrap/key").asText());
+        assertEquals("Mond",				res.at("/query/operands/0/operands/1/operands/0/operands/0/operands/1/operands/0/wrap/key").asText());
+
+        query = "Sonne /-w4 Mond /+w2 Sterne";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:reference",		res.at("/query/@type").asText());
+        assertEquals("operation:focus",		res.at("/query/operation").asText());
+        assertEquals(129,					res.at("/query/classRef/0").asInt());
+        assertEquals("korap:group",			res.at("/query/operands/0/@type").asText());
+        assertEquals("operation:sequence",	res.at("/query/operands/0/operation").asText());
+        assertEquals("korap:distance",		res.at("/query/operands/0/distances/0/@type").asText());
+        assertEquals("w",					res.at("/query/operands/0/distances/0/key").asText());
+        assertEquals(0,						res.at("/query/operands/0/distances/0/boundary/min").asInt());
+        assertEquals(4,						res.at("/query/operands/0/distances/0/boundary/max").asInt());
+        assertEquals(true,					res.at("/query/operands/0/inOrder").asBoolean());
+        assertEquals("korap:group",			res.at("/query/operands/0/operands/1/@type").asText());
+        assertEquals("operation:class",		res.at("/query/operands/0/operands/1/operation").asText());
+        assertEquals(129,					res.at("/query/operands/0/operands/1/classOut").asInt());
+        assertEquals("Sonne",				res.at("/query/operands/0/operands/1/operands/0/wrap/key").asText());
+        assertEquals(129,					res.at("/query/operands/0/operands/0/classOut").asInt());
+        assertEquals("korap:reference",		res.at("/query/operands/0/operands/0/operands/0/@type").asText());
+        assertEquals(130,					res.at("/query/operands/0/operands/0/operands/0/classRef/0").asInt());
+        assertEquals("operation:focus",		res.at("/query/operands/0/operands/0/operands/0/operation").asText());
+        assertEquals("operation:sequence",	res.at("/query/operands/0/operands/0/operands/0/operands/0/operation").asText());
+        assertEquals("w",					res.at("/query/operands/0/operands/0/operands/0/operands/0/distances/0/key").asText());
+        assertEquals(0,						res.at("/query/operands/0/operands/0/operands/0/operands/0/distances/0/boundary/min").asInt());
+        assertEquals(2,						res.at("/query/operands/0/operands/0/operands/0/operands/0/distances/0/boundary/max").asInt());
+        assertEquals(130,					res.at("/query/operands/0/operands/0/operands/0/operands/0/operands/0/classOut").asInt());
+        assertEquals("Mond",				res.at("/query/operands/0/operands/0/operands/0/operands/0/operands/0/operands/0/wrap/key").asText());
+        assertEquals(130,					res.at("/query/operands/0/operands/0/operands/0/operands/0/operands/1/classOut").asInt());
+        assertEquals("Sterne",				res.at("/query/operands/0/operands/0/operands/0/operands/0/operands/1/operands/0/wrap/key").asText());
+
+    }
+
+    @Test
+    public void testOPIN() throws JsonProcessingException, IOException {
+        query = "wegen #IN <s>";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:reference",				res.at("/query/@type").asText());
+        assertEquals("operation:focus",				res.at("/query/operation").asText());
+        assertEquals(131,							res.at("/query/classRef/0").asInt());
+        assertEquals("korap:group",					res.at("/query/operands/0/@type").asText());
+        assertEquals("operation:class",				res.at("/query/operands/0/operation").asText());
+        assertEquals("classRefCheck:includes",		res.at("/query/operands/0/classRefCheck/0").asText());
+        assertEquals("korap:group",					res.at("/query/operands/0/operands/0/@type").asText());
+        assertEquals("operation:position",			res.at("/query/operands/0/operands/0/operation").asText());
+        assertEquals(true,							res.at("/query/operands/0/operands/0/frames/0").isMissingNode());
+        assertEquals(129,							res.at("/query/operands/0/classIn/0").asInt());
+        assertEquals(130,							res.at("/query/operands/0/classIn/1").asInt());
+        assertEquals(131,                           res.at("/query/operands/0/classOut").asInt());
+        assertEquals("korap:group",					res.at("/query/operands/0/operands/0/@type").asText());
+        assertEquals("operation:class",				res.at("/query/operands/0/operands/0/operands/0/operation").asText());
+        assertEquals(129,							res.at("/query/operands/0/operands/0/operands/0/classOut").asInt());
+        assertEquals("korap:span",					res.at("/query/operands/0/operands/0/operands/0/operands/0/@type").asText());
+        assertEquals("s",							res.at("/query/operands/0/operands/0/operands/0/operands/0/key").asText());
+        assertEquals("korap:group",					res.at("/query/operands/0/operands/0/operands/1/@type").asText());
+        assertEquals("operation:class",				res.at("/query/operands/0/operands/0/operands/1/operation").asText());
+        assertEquals(130,							res.at("/query/operands/0/operands/0/operands/1/classOut").asInt());
+        assertEquals("korap:token",					res.at("/query/operands/0/operands/0/operands/1/operands/0/@type").asText());
+        assertEquals("wegen",						res.at("/query/operands/0/operands/0/operands/1/operands/0/wrap/key").asText());
+
+        query = "wegen #IN(L) <s>";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("classRefCheck:includes",		res.at("/query/operands/0/classRefCheck/0").asText());
+        assertEquals("frames:startswith",			res.at("/query/operands/0/operands/0/frames/0").asText());
+        assertEquals(true,							res.at("/query/operands/0/operands/0/frames/1").isMissingNode());
+
+        query = "wegen #IN(F) <s>";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("classRefCheck:includes",		res.at("/query/operands/0/classRefCheck/0").asText());
+        assertEquals("frames:matches",				res.at("/query/operands/0/operands/0/frames/0").asText());
+        assertEquals(true,							res.at("/query/operands/0/operands/0/frames/1").isMissingNode());
+
+        query = "wegen #IN(FI) <s>";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("classRefCheck:unequals",		res.at("/query/operands/0/classRefCheck/0").asText());
+        assertEquals("classRefCheck:includes",		res.at("/query/operands/0/classRefCheck/1").asText());
+        assertEquals("frames:matches",				res.at("/query/operands/0/operands/0/frames/0").asText());
+        assertEquals(true,							res.at("/query/operands/0/operands/0/frames/1").isMissingNode());
+
+        query = "wegen #IN(FE) <s>";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("classRefCheck:equals",		res.at("/query/operands/0/classRefCheck/0").asText());
+        assertEquals("frames:matches",				res.at("/query/operands/0/operands/0/frames/0").asText());
+        assertEquals(true,							res.at("/query/operands/0/operands/0/frames/1").isMissingNode());
+
+        query = "wegen #IN(%, L) <s>";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("classRefCheck:includes",		res.at("/query/operands/0/classRefCheck/0").asText());
+        assertEquals("frames:startswith",			res.at("/query/operands/0/operands/0/frames/0").asText());
+        assertEquals(true,							res.at("/query/operands/0/operands/0/frames/1").isMissingNode());
+        assertEquals(true,							res.at("/query/operands/0/operands/0/exclude").asBoolean());
+
+        query = "wegen #IN(FE,%,MIN) <s>";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("classRefCheck:equals",		res.at("/query/operands/0/classRefCheck/0").asText());
+        assertEquals("frames:matches",				res.at("/query/operands/0/operands/0/frames/0").asText());
+        assertEquals(true,							res.at("/query/operands/0/operands/0/exclude").asBoolean());
+
+        query = "wegen #IN(FE,ALL,%,MIN) <s>";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("operation:class",             res.at("/query/operation").asText());
+        assertEquals("classRefOp:delete",           res.at("/query/classRefOp").asText());
+        assertEquals(131,                           res.at("/query/classIn/0").asInt());
+        assertEquals("classRefCheck:equals",		res.at("/query/operands/0/classRefCheck/0").asText());
+        assertEquals("frames:matches",				res.at("/query/operands/0/operands/0/frames/0").asText());
+        assertEquals(true,							res.at("/query/operands/0/operands/0/exclude").asBoolean());
+
+        query = "wegen #IN(FE,ALL,%,MAX) <s>";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("operation:merge",             res.at("/query/operation").asText());
+        assertEquals("operation:class",             res.at("/query/operands/0/operation").asText());
+        assertEquals("classRefOp:delete",           res.at("/query/operands/0/classRefOp").asText());
+        assertEquals(131,                           res.at("/query/operands/0/classIn/0").asInt());
+        assertEquals("classRefCheck:equals",        res.at("/query/operands/0/operands/0/classRefCheck/0").asText());
+        assertEquals("frames:matches",              res.at("/query/operands/0/operands/0/operands/0/frames/0").asText());
+        assertEquals(true,                          res.at("/query/operands/0/operands/0/operands/0/exclude").asBoolean());
+    }
+
+    @Test
+    public void testOPOV() throws JsonProcessingException, IOException {
+        query = "wegen #OV <s>";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:reference",				res.at("/query/@type").asText());
+        assertEquals("operation:focus",				res.at("/query/operation").asText());
+        assertEquals(131,							res.at("/query/classRef/0").asInt());
+        assertEquals("korap:group",					res.at("/query/operands/0/@type").asText());
+        assertEquals("operation:class",				res.at("/query/operands/0/operation").asText());
+        assertEquals("classRefCheck:intersects",	res.at("/query/operands/0/classRefCheck/0").asText());
+        //		assertEquals("classRefOp:merge",            res.at("/query/operands/0/classRefOp").asText());
+        assertEquals(131,                           res.at("/query/operands/0/classOut").asInt());
+        assertEquals(129,                           res.at("/query/operands/0/classIn/0").asInt());
+        assertEquals(130,                           res.at("/query/operands/0/classIn/1").asInt());
+        assertEquals("korap:group",					res.at("/query/operands/0/operands/0/@type").asText());
+        assertEquals("operation:position",			res.at("/query/operands/0/operands/0/operation").asText());
+        assertEquals(true,							res.at("/query/operands/0/operands/0/frames/0").isMissingNode());
+        assertEquals("korap:group",					res.at("/query/operands/0/operands/0/@type").asText());
+        assertEquals("operation:class",				res.at("/query/operands/0/operands/0/operands/0/operation").asText());
+        assertEquals(129,							res.at("/query/operands/0/operands/0/operands/0/classOut").asInt());
+        assertEquals("korap:span",					res.at("/query/operands/0/operands/0/operands/0/operands/0/@type").asText());
+        assertEquals("s",							res.at("/query/operands/0/operands/0/operands/0/operands/0/key").asText());
+        assertEquals("korap:group",					res.at("/query/operands/0/operands/0/operands/1/@type").asText());
+        assertEquals("operation:class",				res.at("/query/operands/0/operands/0/operands/1/operation").asText());
+        assertEquals(130,							res.at("/query/operands/0/operands/0/operands/1/classOut").asInt());
+        assertEquals("korap:token",					res.at("/query/operands/0/operands/0/operands/1/operands/0/@type").asText());
+        assertEquals("wegen",						res.at("/query/operands/0/operands/0/operands/1/operands/0/wrap/key").asText());
+
+        query = "wegen #OV(L) <s>";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("classRefCheck:intersects",	res.at("/query/operands/0/classRefCheck/0").asText());
+        assertEquals("frames:startswith",			res.at("/query/operands/0/operands/0/frames/0").asText());
+        assertEquals("frames:overlapsLeft",			res.at("/query/operands/0/operands/0/frames/1").asText());
+
+        query = "wegen #OV(F) <s>";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("classRefCheck:intersects",	res.at("/query/operands/0/classRefCheck/0").asText());
+        assertEquals("frames:matches",				res.at("/query/operands/0/operands/0/frames/0").asText());
+        assertEquals(true,							res.at("/query/operands/0/operands/0/frames/1").isMissingNode());
+
+        query = "wegen #OV(FI) <s>";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("classRefCheck:unequals",		res.at("/query/operands/0/classRefCheck/0").asText());
+        assertEquals("frames:matches",				res.at("/query/operands/0/operands/0/frames/0").asText());
+
+        query = "wegen #OV(FE) <s>";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("classRefCheck:equals",		res.at("/query/operands/0/classRefCheck/0").asText());
+        assertEquals("frames:matches",				res.at("/query/operands/0/operands/0/frames/0").asText());
+    }
+
+
+    @Test
+    public void testBEG_END() throws JsonProcessingException, IOException {
+        query = "#BEG(der /w3:5 Mann)";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:reference",		res.at("/query/@type").asText());
+        assertEquals("operation:focus",		res.at("/query/operation").asText());
+        assertEquals(0,						res.at("/query/spanRef/0").asInt());
+        assertEquals(1,						res.at("/query/spanRef/1").asInt());
+        assertEquals("korap:group",			res.at("/query/operands/0/@type").asText());
+        assertEquals("operation:sequence",	res.at("/query/operands/0/operation").asText());
+        assertEquals("korap:distance",		res.at("/query/operands/0/distances/0/@type").asText());
+        assertEquals("w",					res.at("/query/operands/0/distances/0/key").asText());
+        assertEquals(3,						res.at("/query/operands/0/distances/0/boundary/min").asInt());
+        assertEquals(5,						res.at("/query/operands/0/distances/0/boundary/max").asInt());
+        assertEquals(false,					res.at("/query/operands/0/inOrder").asBoolean());
+        assertEquals("korap:token",			res.at("/query/operands/0/operands/0/@type").asText());
+        assertEquals("der",					res.at("/query/operands/0/operands/0/wrap/key").asText());
+        assertEquals("Mann",				res.at("/query/operands/0/operands/1/wrap/key").asText());
+
+        query = "#BEG(der /w3:5 Mann) /+w10 kommt";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:reference",		res.at("/query/@type").asText());
+        assertEquals("operation:focus",		res.at("/query/operation").asText());
+        assertEquals(129,					res.at("/query/classRef/0").asInt());
+        assertEquals("korap:group",			res.at("/query/operands/0/@type").asText());
+        assertEquals("operation:sequence",	res.at("/query/operands/0/operation").asText());
+        assertEquals("korap:distance",		res.at("/query/operands/0/distances/0/@type").asText());
+        assertEquals("w",					res.at("/query/operands/0/distances/0/key").asText());
+        assertEquals(0,						res.at("/query/operands/0/distances/0/boundary/min").asInt());
+        assertEquals(10,					res.at("/query/operands/0/distances/0/boundary/max").asInt());
+        assertEquals(true,					res.at("/query/operands/0/inOrder").asBoolean());
+        assertEquals("korap:group",			res.at("/query/operands/0/operands/0/@type").asText());
+        assertEquals("operation:class",		res.at("/query/operands/0/operands/0/operation").asText());
+        assertEquals(129,					res.at("/query/operands/0/operands/0/classOut").asInt());
+        assertEquals("korap:reference",		res.at("/query/operands/0/operands/0/operands/0/@type").asText());
+        assertEquals("operation:focus",		res.at("/query/operands/0/operands/0/operands/0/operation").asText());
+        assertEquals(0,						res.at("/query/operands/0/operands/0/operands/0/spanRef/0").asInt());
+        assertEquals(1,						res.at("/query/operands/0/operands/0/operands/0/spanRef/1").asInt());
+        assertEquals("korap:group",			res.at("/query/operands/0/operands/0/operands/0/operands/0/@type").asText());
+        assertEquals("operation:sequence",	res.at("/query/operands/0/operands/0/operands/0/operands/0/operation").asText());
+        assertEquals("korap:distance",		res.at("/query/operands/0/operands/0/operands/0/operands/0/distances/0/@type").asText());
+        assertEquals("w",					res.at("/query/operands/0/operands/0/operands/0/operands/0/distances/0/key").asText());
+        assertEquals(3,						res.at("/query/operands/0/operands/0/operands/0/operands/0/distances/0/boundary/min").asInt());
+        assertEquals(5,						res.at("/query/operands/0/operands/0/operands/0/operands/0/distances/0/boundary/max").asInt());
+        assertEquals(false,					res.at("/query/operands/0/operands/0/operands/0/operands/0/inOrder").asBoolean());
+        assertEquals("korap:token",			res.at("/query/operands/0/operands/0/operands/0/operands/0/operands/0/@type").asText());
+        assertEquals("der",					res.at("/query/operands/0/operands/0/operands/0/operands/0/operands/0/wrap/key").asText());
+        assertEquals("Mann",				res.at("/query/operands/0/operands/0/operands/0/operands/0/operands/1/wrap/key").asText());
+        assertEquals("operation:class",		res.at("/query/operands/0/operands/1/operation").asText());
+        assertEquals(129,					res.at("/query/operands/0/operands/1/classOut").asInt());
+        assertEquals("korap:token",			res.at("/query/operands/0/operands/1/operands/0/@type").asText());
+        assertEquals("kommt",				res.at("/query/operands/0/operands/1/operands/0/wrap/key").asText());
+
+        query = "kommt /+w10 #BEG(der /w3:5 Mann)";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:reference",		res.at("/query/@type").asText());
+        assertEquals("operation:focus",		res.at("/query/operation").asText());
+        assertEquals(129,					res.at("/query/classRef/0").asInt());
+        assertEquals("korap:group",			res.at("/query/operands/0/@type").asText());
+        assertEquals("operation:sequence",	res.at("/query/operands/0/operation").asText());
+        assertEquals("korap:distance",		res.at("/query/operands/0/distances/0/@type").asText());
+        assertEquals("w",					res.at("/query/operands/0/distances/0/key").asText());
+        assertEquals(0,						res.at("/query/operands/0/distances/0/boundary/min").asInt());
+        assertEquals(10,					res.at("/query/operands/0/distances/0/boundary/max").asInt());
+        assertEquals(true,					res.at("/query/operands/0/inOrder").asBoolean());
+        assertEquals("korap:group",			res.at("/query/operands/0/operands/1/@type").asText());
+        assertEquals("operation:class",		res.at("/query/operands/0/operands/1/operation").asText());
+        assertEquals(129,					res.at("/query/operands/0/operands/1/classOut").asInt());
+        assertEquals("korap:reference",		res.at("/query/operands/0/operands/1/operands/0/@type").asText());
+        assertEquals("operation:focus",		res.at("/query/operands/0/operands/1/operands/0/operation").asText());
+        assertEquals(0,						res.at("/query/operands/0/operands/1/operands/0/spanRef/0").asInt());
+        assertEquals(1,						res.at("/query/operands/0/operands/1/operands/0/spanRef/1").asInt());
+        assertEquals("korap:group",			res.at("/query/operands/0/operands/1/operands/0/operands/0/@type").asText());
+        assertEquals("operation:sequence",	res.at("/query/operands/0/operands/1/operands/0/operands/0/operation").asText());
+        assertEquals("korap:distance",		res.at("/query/operands/0/operands/1/operands/0/operands/0/distances/0/@type").asText());
+        assertEquals("w",					res.at("/query/operands/0/operands/1/operands/0/operands/0/distances/0/key").asText());
+        assertEquals(3,						res.at("/query/operands/0/operands/1/operands/0/operands/0/distances/0/boundary/min").asInt());
+        assertEquals(5,						res.at("/query/operands/0/operands/1/operands/0/operands/0/distances/0/boundary/max").asInt());
+        assertEquals(false,					res.at("/query/operands/0/operands/1/operands/0/operands/0/inOrder").asBoolean());
+        assertEquals("korap:token",			res.at("/query/operands/0/operands/1/operands/0/operands/0/operands/0/@type").asText());
+        assertEquals("der",					res.at("/query/operands/0/operands/1/operands/0/operands/0/operands/0/wrap/key").asText());
+        assertEquals("Mann",				res.at("/query/operands/0/operands/1/operands/0/operands/0/operands/1/wrap/key").asText());
+        assertEquals("operation:class",		res.at("/query/operands/0/operands/0/operation").asText());
+        assertEquals(129,					res.at("/query/operands/0/operands/0/classOut").asInt());
+        assertEquals("korap:token",			res.at("/query/operands/0/operands/0/operands/0/@type").asText());
+        assertEquals("kommt",				res.at("/query/operands/0/operands/0/operands/0/wrap/key").asText());
+
+        query = "#END(der /w3:5 Mann)";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:reference",		res.at("/query/@type").asText());
+        assertEquals("operation:focus",		res.at("/query/operation").asText());
+        assertEquals(-1,					res.at("/query/spanRef/0").asInt());
+        assertEquals(1,						res.at("/query/spanRef/1").asInt());
+        assertEquals("korap:group",			res.at("/query/operands/0/@type").asText());
+        assertEquals("operation:sequence",	res.at("/query/operands/0/operation").asText());
+        assertEquals("korap:distance",		res.at("/query/operands/0/distances/0/@type").asText());
+        assertEquals("w",					res.at("/query/operands/0/distances/0/key").asText());
+        assertEquals(3,						res.at("/query/operands/0/distances/0/boundary/min").asInt());
+        assertEquals(5,						res.at("/query/operands/0/distances/0/boundary/max").asInt());
+        assertEquals(false,					res.at("/query/operands/0/inOrder").asBoolean());
+        assertEquals("korap:token",			res.at("/query/operands/0/operands/0/@type").asText());
+        assertEquals("der",					res.at("/query/operands/0/operands/0/wrap/key").asText());
+        assertEquals("Mann",				res.at("/query/operands/0/operands/1/wrap/key").asText());
+    }
+
+    @Test
+    public void testELEM() throws JsonProcessingException, IOException {
+        query = "#ELEM(S)";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:span",		res.at("/query/@type").asText());
+        assertEquals("s",				res.at("/query/key").asText());
+
+        query = "#ELEM(W ANA=N)";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:span",		res.at("/query/@type").asText());
+        assertEquals("w",				res.at("/query/key").asText());
+        assertEquals("korap:term",		res.at("/query/attr/@type").asText());
+        assertEquals("N",				res.at("/query/attr/key").asText());
+        assertEquals("p",				res.at("/query/attr/layer").asText());
+        assertEquals("match:eq",		res.at("/query/attr/match").asText());
+
+        query = "#ELEM(W ANA != 'N V')";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:span",		res.at("/query/@type").asText());
+        assertEquals("w",				res.at("/query/key").asText());
+        assertEquals("korap:termGroup",	res.at("/query/attr/@type").asText());
+        assertEquals("relation:and",	res.at("/query/attr/relation").asText());
+        assertEquals("korap:term",		res.at("/query/attr/operands/0/@type").asText());
+        assertEquals("N",				res.at("/query/attr/operands/0/key").asText());
+        assertEquals("p",				res.at("/query/attr/operands/0/layer").asText());
+        assertEquals("match:ne",		res.at("/query/attr/operands/0/match").asText());
+        assertEquals("korap:term",		res.at("/query/attr/operands/1/@type").asText());
+        assertEquals("V",				res.at("/query/attr/operands/1/key").asText());
+        assertEquals("p",				res.at("/query/attr/operands/1/layer").asText());
+        assertEquals("match:ne",		res.at("/query/attr/operands/1/match").asText());
+
+        query = "#ELEM(W ANA != 'N A V' Genre = Sport)";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:span",		res.at("/query/@type").asText());
+        assertEquals("w",				res.at("/query/key").asText());
+        assertEquals("korap:termGroup",	res.at("/query/attr/@type").asText());
+        assertEquals("relation:and",	res.at("/query/attr/relation").asText());
+        assertEquals("korap:termGroup",	res.at("/query/attr/operands/0/@type").asText());
+        assertEquals("relation:and",	res.at("/query/attr/operands/0/relation").asText());
+        assertEquals("N",				res.at("/query/attr/operands/0/operands/0/key").asText());
+        assertEquals("A",				res.at("/query/attr/operands/0/operands/1/key").asText());
+        assertEquals("V",				res.at("/query/attr/operands/0/operands/2/key").asText());
+        assertEquals("Genre",			res.at("/query/attr/operands/1/layer").asText());
+        assertEquals("Sport",			res.at("/query/attr/operands/1/key").asText());
+
+        query = "#ELEM(W ANA != 'N A V' Genre != 'Sport Politik')";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:span",		res.at("/query/@type").asText());
+        assertEquals("w",				res.at("/query/key").asText());
+        assertEquals("korap:termGroup",	res.at("/query/attr/@type").asText());
+        assertEquals("relation:and",	res.at("/query/attr/relation").asText());
+        assertEquals("korap:termGroup",	res.at("/query/attr/operands/0/@type").asText());
+        assertEquals("relation:and",	res.at("/query/attr/operands/0/relation").asText());
+        assertEquals("korap:termGroup",	res.at("/query/attr/operands/1/@type").asText());
+        assertEquals("relation:and",	res.at("/query/attr/operands/1/relation").asText());
+        assertEquals("N",				res.at("/query/attr/operands/0/operands/0/key").asText());
+        assertEquals("A",				res.at("/query/attr/operands/0/operands/1/key").asText());
+        assertEquals("V",				res.at("/query/attr/operands/0/operands/2/key").asText());
+        assertEquals("match:ne",		res.at("/query/attr/operands/0/operands/2/match").asText());
+        assertEquals("Genre",			res.at("/query/attr/operands/1/operands/0/layer").asText());
+        assertEquals("Sport",			res.at("/query/attr/operands/1/operands/0/key").asText());
+        assertEquals("Genre",			res.at("/query/attr/operands/1/operands/1/layer").asText());
+        assertEquals("Politik",			res.at("/query/attr/operands/1/operands/1/key").asText());
+        assertEquals("match:ne",		res.at("/query/attr/operands/1/operands/1/match").asText());
+    }
+    @Test
+    public void testOPALL() throws JsonProcessingException, IOException {
+        query = "#ALL(gehen /w1:10 voran)";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:group",			res.at("/query/@type").asText());
+        assertEquals("operation:sequence",	res.at("/query/operation").asText());
+        assertEquals("gehen",				res.at("/query/operands/0/wrap/key").asText());
+        assertEquals("voran",				res.at("/query/operands/1/wrap/key").asText());
+        assertEquals("korap:distance",		res.at("/query/distances/0/@type").asText());
+        assertEquals("w",					res.at("/query/distances/0/key").asText());
+        assertEquals(1,						res.at("/query/distances/0/boundary/min").asInt());
+        assertEquals(10,					res.at("/query/distances/0/boundary/max").asInt());
+
+        query = "#ALL(gehen /w1:10 (voran /w1:4 schnell))";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:group",			res.at("/query/@type").asText());
+        assertEquals("operation:sequence",	res.at("/query/operation").asText());
+        assertEquals("korap:distance",		res.at("/query/distances/0/@type").asText());
+        assertEquals("w",					res.at("/query/distances/0/key").asText());
+        assertEquals(1,						res.at("/query/distances/0/boundary/min").asInt());
+        assertEquals(10,					res.at("/query/distances/0/boundary/max").asInt());
+        assertEquals("gehen",				res.at("/query/operands/0/wrap/key").asText());
+        assertEquals("korap:group",			res.at("/query/operands/1/@type").asText());
+        assertEquals("operation:sequence",	res.at("/query/operands/1/operation").asText());
+        assertEquals("korap:distance",		res.at("/query/operands/1/distances/0/@type").asText());
+        assertEquals("w",					res.at("/query/operands/1/distances/0/key").asText());
+        assertEquals(1,						res.at("/query/operands/1/distances/0/boundary/min").asInt());
+        assertEquals(4,						res.at("/query/operands/1/distances/0/boundary/max").asInt());
+        assertEquals("voran",				res.at("/query/operands/1/operands/0/wrap/key").asText());
+        assertEquals("schnell",				res.at("/query/operands/1/operands/1/wrap/key").asText());
+
+
+    }
+
+    @Test
+    public void testOPNHIT() throws JsonProcessingException, IOException {
+        query = "#NHIT(gehen /w1:10 voran)";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:reference",		res.at("/query/@type").asText());
+        assertEquals("operation:focus",		res.at("/query/operation").asText());
+        assertEquals(129,					res.at("/query/classRef/0").asInt());
+        assertEquals("korap:group",			res.at("/query/operands/0/@type").asText());
+        assertEquals("operation:class",		res.at("/query/operands/0/operation").asText());
+        assertEquals("classRefOp:inversion",res.at("/query/operands/0/classRefOp").asText());
+        assertEquals(130,					res.at("/query/operands/0/classIn/0").asInt());
+        assertEquals(131,					res.at("/query/operands/0/classIn/1").asInt());
+        assertEquals(129,					res.at("/query/operands/0/classOut").asInt());
+        assertEquals("korap:group",			res.at("/query/operands/0/operands/0/@type").asText());
+        assertEquals("operation:sequence",	res.at("/query/operands/0/operands/0/operation").asText());
+        assertEquals("korap:distance",		res.at("/query/operands/0/operands/0/distances/0/@type").asText());
+        assertEquals("w",					res.at("/query/operands/0/operands/0/distances/0/key").asText());
+        assertEquals(1,						res.at("/query/operands/0/operands/0/distances/0/boundary/min").asInt());
+        assertEquals(10,					res.at("/query/operands/0/operands/0/distances/0/boundary/max").asInt());
+        assertEquals("korap:group",			res.at("/query/operands/0/operands/0/operands/0/@type").asText());
+        assertEquals("operation:class",		res.at("/query/operands/0/operands/0/operands/0/operation").asText());
+        assertEquals(130,					res.at("/query/operands/0/operands/0/operands/0/classOut").asInt());
+        assertEquals(131,					res.at("/query/operands/0/operands/0/operands/1/classOut").asInt());
+        assertEquals("korap:token",			res.at("/query/operands/0/operands/0/operands/0/operands/0/@type").asText());
+        assertEquals("gehen",				res.at("/query/operands/0/operands/0/operands/0/operands/0/wrap/key").asText());
+        assertEquals("voran",				res.at("/query/operands/0/operands/0/operands/1/operands/0/wrap/key").asText());
+
+        query = "#NHIT(gehen /w1:10 voran /w1:10 Beispiel)";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:reference",		res.at("/query/@type").asText());
+        assertEquals("operation:focus",		res.at("/query/operation").asText());
+        assertEquals(129,					res.at("/query/classRef/0").asInt());
+        assertEquals("korap:group",			res.at("/query/operands/0/@type").asText());
+        assertEquals("operation:class",		res.at("/query/operands/0/operation").asText());
+        assertEquals("classRefOp:inversion",res.at("/query/operands/0/classRefOp").asText());
+        assertEquals(130,					res.at("/query/operands/0/classIn/0").asInt());
+        assertEquals(131,					res.at("/query/operands/0/classIn/1").asInt());
+        assertEquals(129,					res.at("/query/operands/0/classOut").asInt());
+        assertEquals("korap:group",			res.at("/query/operands/0/operands/0/@type").asText());
+        assertEquals("operation:sequence",	res.at("/query/operands/0/operands/0/operation").asText());
+        assertEquals("korap:distance",		res.at("/query/operands/0/operands/0/distances/0/@type").asText());
+        assertEquals("w",					res.at("/query/operands/0/operands/0/distances/0/key").asText());
+        assertEquals(1,						res.at("/query/operands/0/operands/0/distances/0/boundary/min").asInt());
+        assertEquals(10,					res.at("/query/operands/0/operands/0/distances/0/boundary/max").asInt());
+        assertEquals("korap:group",			res.at("/query/operands/0/operands/0/operands/0/@type").asText());
+        assertEquals("operation:class",		res.at("/query/operands/0/operands/0/operands/0/operation").asText());
+        assertEquals(130,					res.at("/query/operands/0/operands/0/operands/0/classOut").asInt());
+        assertEquals(131,					res.at("/query/operands/0/operands/0/operands/1/classOut").asInt());
+        assertEquals("gehen",				res.at("/query/operands/0/operands/0/operands/0/operands/0/wrap/key").asText());
+        assertEquals("operation:focus",		res.at("/query/operands/0/operands/0/operands/1/operands/0/operation").asText());
+        assertEquals(132,					res.at("/query/operands/0/operands/0/operands/1/operands/0/classRef/0").asInt());
+        assertEquals("operation:sequence",	res.at("/query/operands/0/operands/0/operands/1/operands/0/operands/0/operation").asText());
+        assertEquals(132,					res.at("/query/operands/0/operands/0/operands/1/operands/0/operands/0/operands/0/classOut").asInt());
+        assertEquals("voran",				res.at("/query/operands/0/operands/0/operands/1/operands/0/operands/0/operands/0/operands/0/wrap/key").asText());
+        assertEquals(132,					res.at("/query/operands/0/operands/0/operands/1/operands/0/operands/0/operands/1/classOut").asInt());
+        assertEquals("Beispiel",			res.at("/query/operands/0/operands/0/operands/1/operands/0/operands/0/operands/1/operands/0/wrap/key").asText());
+
+    }
+
+    @Test
+    public void testOPBED() throws JsonProcessingException, IOException {
+        query = "#BED(der , sa)";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:reference",				res.at("/query/@type").asText());
+        assertEquals("operation:focus",				res.at("/query/operation").asText());
+        assertEquals(129,							res.at("/query/classRef/0").asInt());
+        assertEquals("korap:group",					res.at("/query/operands/0/@type").asText());
+        assertEquals("operation:position",			res.at("/query/operands/0/operation").asText());
+        assertEquals("frames:startswith",			res.at("/query/operands/0/frames/0").asText());
+        assertEquals("korap:group",					res.at("/query/operands/0/@type").asText());
+        assertEquals("operation:class",				res.at("/query/operands/0/operands/1/operation").asText());
+        assertEquals(129,							res.at("/query/operands/0/operands/1/classOut").asInt());
+        assertEquals("korap:token",					res.at("/query/operands/0/operands/1/operands/0/@type").asText());
+        assertEquals("der",							res.at("/query/operands/0/operands/1/operands/0/wrap/key").asText());
+        assertEquals("korap:span",					res.at("/query/operands/0/operands/0/@type").asText());
+        assertEquals("s",							res.at("/query/operands/0/operands/0/key").asText());
+
+        query = "#BED(der Mann , +pe)";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:reference",				res.at("/query/@type").asText());
+        assertEquals("operation:focus",				res.at("/query/operation").asText());
+        assertEquals(129,							res.at("/query/classRef/0").asInt());
+        assertEquals("korap:group",					res.at("/query/operands/0/@type").asText());
+        assertEquals("operation:position",			res.at("/query/operands/0/operation").asText());
+        assertEquals("frames:matches",				res.at("/query/operands/0/frames/0").asText());
+        assertEquals("korap:reference",				res.at("/query/operands/0/operands/0/@type").asText());
+        assertEquals("operation:focus",				res.at("/query/operands/0/operands/0/operation").asText());
+        assertEquals(-1,							res.at("/query/operands/0/operands/0/spanRef/0").asInt());
+        assertEquals(1,								res.at("/query/operands/0/operands/0/spanRef/1").asInt());
+        assertEquals("korap:span",					res.at("/query/operands/0/operands/0/operands/0/@type").asText());
+        assertEquals("p",							res.at("/query/operands/0/operands/0/operands/0/key").asText());
+        assertEquals("korap:reference",				res.at("/query/operands/0/operands/1/@type").asText());
+        assertEquals("operation:focus",				res.at("/query/operands/0/operands/1/operation").asText());
+        assertEquals(0,								res.at("/query/operands/0/operands/1/spanRef/0").asInt());
+        assertEquals(1,								res.at("/query/operands/0/operands/1/spanRef/1").asInt());
+        assertEquals("korap:group",					res.at("/query/operands/0/operands/1/operands/0/@type").asText());
+        assertEquals("operation:class",				res.at("/query/operands/0/operands/1/operands/0/operation").asText());
+        assertEquals(129,							res.at("/query/operands/0/operands/1/operands/0/classOut").asInt());
+        assertEquals("operation:sequence",			res.at("/query/operands/0/operands/1/operands/0/operands/0/operation").asText());
+        assertEquals("der",							res.at("/query/operands/0/operands/1/operands/0/operands/0/operands/0/wrap/key").asText());
+        assertEquals("Mann",						res.at("/query/operands/0/operands/1/operands/0/operands/0/operands/1/wrap/key").asText());
+
+        query = "#BED(der Mann , sa,-pa)";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:reference",				res.at("/query/@type").asText());
+        assertEquals("operation:focus",				res.at("/query/operation").asText());
+        assertEquals(129,							res.at("/query/classRef/0").asInt());
+        assertEquals("korap:group",					res.at("/query/operands/0/@type").asText());
+        assertEquals("operation:position",			res.at("/query/operands/0/operation").asText());
+        assertEquals("frames:matches",				res.at("/query/operands/0/frames/0").asText());
+
+        assertEquals("korap:group",					res.at("/query/operands/0/operands/0/@type").asText());
+        assertEquals("operation:position",			res.at("/query/operands/0/operands/0/operation").asText());
+        assertEquals("frames:startswith",			res.at("/query/operands/0/operands/0/frames/0").asText());
+        assertEquals("korap:span",					res.at("/query/operands/0/operands/0/operands/0/@type").asText());
+        assertEquals("s",							res.at("/query/operands/0/operands/0/operands/0/key").asText());
+        assertEquals("korap:group",					res.at("/query/operands/0/operands/0/operands/1/@type").asText());
+        assertEquals("operation:class",				res.at("/query/operands/0/operands/0/operands/1/operation").asText());
+        assertEquals(129,							res.at("/query/operands/0/operands/0/operands/1/classOut").asInt());
+        assertEquals("operation:sequence",			res.at("/query/operands/0/operands/0/operands/1/operands/0/operation").asText());
+        assertEquals("der",							res.at("/query/operands/0/operands/0/operands/1/operands/0/operands/0/wrap/key").asText());
+        assertEquals("Mann",						res.at("/query/operands/0/operands/0/operands/1/operands/0/operands/1/wrap/key").asText());
+
+        assertEquals("korap:group",					res.at("/query/operands/0/operands/1/@type").asText());
+        assertEquals("operation:position",			res.at("/query/operands/0/operands/1/operation").asText());
+        assertEquals("frames:startswith",			res.at("/query/operands/0/operands/1/frames/0").asText());
+        assertEquals(true,							res.at("/query/operands/0/operands/1/exclude").asBoolean());
+        assertEquals("korap:span",					res.at("/query/operands/0/operands/1/operands/0/@type").asText());
+        assertEquals("p",							res.at("/query/operands/0/operands/1/operands/0/key").asText());
+        assertEquals("korap:group",					res.at("/query/operands/0/operands/1/operands/1/@type").asText());
+        assertEquals("operation:class",				res.at("/query/operands/0/operands/1/operands/1/operation").asText());
+        assertEquals(130,							res.at("/query/operands/0/operands/1/operands/1/classOut").asInt());
+        assertEquals("operation:sequence",			res.at("/query/operands/0/operands/1/operands/1/operands/0/operation").asText());
+        assertEquals("der",							res.at("/query/operands/0/operands/1/operands/1/operands/0/operands/0/wrap/key").asText());
+        assertEquals("Mann",						res.at("/query/operands/0/operands/1/operands/1/operands/0/operands/1/wrap/key").asText());
+
+    }
+
+    @Test
+    public void testColonSeparatedConditions() throws JsonProcessingException, IOException {
+        query = "der:sa";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:reference",				res.at("/query/@type").asText());
+        assertEquals("operation:focus",				res.at("/query/operation").asText());
+        assertEquals(129,							res.at("/query/classRef/0").asInt());
+        assertEquals("korap:group",					res.at("/query/operands/0/@type").asText());
+        assertEquals("operation:position",			res.at("/query/operands/0/operation").asText());
+        assertEquals("frames:startswith",			res.at("/query/operands/0/frames/0").asText());
+        assertEquals("korap:group",					res.at("/query/operands/0/@type").asText());
+        assertEquals("operation:class",				res.at("/query/operands/0/operands/1/operation").asText());
+        assertEquals(129,							res.at("/query/operands/0/operands/1/classOut").asInt());
+        assertEquals("korap:token",					res.at("/query/operands/0/operands/1/operands/0/@type").asText());
+        assertEquals("der",							res.at("/query/operands/0/operands/1/operands/0/wrap/key").asText());
+        assertEquals("korap:span",					res.at("/query/operands/0/operands/0/@type").asText());
+        assertEquals("s",							res.at("/query/operands/0/operands/0/key").asText());
+
+        query = "der:sa,-pa";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:reference",				res.at("/query/@type").asText());
+        assertEquals("operation:focus",				res.at("/query/operation").asText());
+        assertEquals(129,							res.at("/query/classRef/0").asInt());
+        assertEquals("korap:group",					res.at("/query/operands/0/@type").asText());
+        assertEquals("operation:position",			res.at("/query/operands/0/operation").asText());
+        assertEquals("frames:matches",				res.at("/query/operands/0/frames/0").asText());
+        assertEquals("korap:group",					res.at("/query/operands/0/operands/0/@type").asText());
+        assertEquals("operation:position",			res.at("/query/operands/0/operands/0/operation").asText());
+        assertEquals("frames:startswith",			res.at("/query/operands/0/operands/0/frames/0").asText());
+        assertEquals("korap:span",					res.at("/query/operands/0/operands/0/operands/0/@type").asText());
+        assertEquals("s",							res.at("/query/operands/0/operands/0/operands/0/key").asText());
+        assertEquals("korap:group",					res.at("/query/operands/0/operands/0/operands/1/@type").asText());
+        assertEquals("operation:class",				res.at("/query/operands/0/operands/0/operands/1/operation").asText());
+        assertEquals(129,							res.at("/query/operands/0/operands/0/operands/1/classOut").asInt());
+        assertEquals("der",							res.at("/query/operands/0/operands/0/operands/1/operands/0/wrap/key").asText());
+        assertEquals("korap:group",					res.at("/query/operands/0/operands/1/@type").asText());
+        assertEquals("operation:position",			res.at("/query/operands/0/operands/1/operation").asText());
+        assertEquals("frames:startswith",			res.at("/query/operands/0/operands/1/frames/0").asText());
+        assertEquals(true,							res.at("/query/operands/0/operands/1/exclude").asBoolean());
+        assertEquals("korap:span",					res.at("/query/operands/0/operands/1/operands/0/@type").asText());
+        assertEquals("p",							res.at("/query/operands/0/operands/1/operands/0/key").asText());
+        assertEquals("korap:group",					res.at("/query/operands/0/operands/1/operands/1/@type").asText());
+        assertEquals("operation:class",				res.at("/query/operands/0/operands/1/operands/1/operation").asText());
+        assertEquals(130,							res.at("/query/operands/0/operands/1/operands/1/classOut").asInt());
+        assertEquals("der",							res.at("/query/operands/0/operands/1/operands/1/operands/0/wrap/key").asText());
+
+        query = "der:sa,-pa,+te";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals("korap:reference",				res.at("/query/@type").asText());
+        assertEquals("operation:focus",				res.at("/query/operation").asText());
+        assertEquals(129,							res.at("/query/classRef/0").asInt());
+        assertEquals("korap:group",					res.at("/query/operands/0/@type").asText());
+        assertEquals("operation:position",			res.at("/query/operands/0/operation").asText());
+        assertEquals("frames:matches",				res.at("/query/operands/0/frames/0").asText());
+        assertEquals("korap:group",					res.at("/query/operands/0/operands/0/@type").asText());
+        assertEquals("operation:position",			res.at("/query/operands/0/operands/0/operation").asText());
+        assertEquals("frames:startswith",			res.at("/query/operands/0/operands/0/frames/0").asText());
+        assertEquals("korap:span",					res.at("/query/operands/0/operands/0/operands/0/@type").asText());
+        assertEquals("s",							res.at("/query/operands/0/operands/0/operands/0/key").asText());
+        assertEquals("korap:group",					res.at("/query/operands/0/operands/0/operands/1/@type").asText());
+        assertEquals("operation:class",				res.at("/query/operands/0/operands/0/operands/1/operation").asText());
+        assertEquals(129,							res.at("/query/operands/0/operands/0/operands/1/classOut").asInt());
+        assertEquals("der",							res.at("/query/operands/0/operands/0/operands/1/operands/0/wrap/key").asText());
+        assertEquals("korap:reference",				res.at("/query/operands/0/operands/1/@type").asText());
+        assertEquals("operation:focus",				res.at("/query/operands/0/operands/1/operation").asText());
+        assertEquals(130,							res.at("/query/operands/0/operands/1/classRef/0").asInt());
+        assertEquals("korap:group",					res.at("/query/operands/0/operands/1/operands/0/@type").asText());
+        assertEquals("operation:position",			res.at("/query/operands/0/operands/1/operands/0/operation").asText());
+        assertEquals("frames:matches",				res.at("/query/operands/0/operands/1/operands/0/frames/0").asText());
+        assertEquals("korap:group",					res.at("/query/operands/0/operands/1/operands/0/operands/0/@type").asText());
+        assertEquals("operation:position",			res.at("/query/operands/0/operands/1/operands/0/operands/0/operation").asText());
+        assertEquals("frames:startswith",			res.at("/query/operands/0/operands/1/operands/0/operands/0/frames/0").asText());
+        assertEquals(true,							res.at("/query/operands/0/operands/1/operands/0/operands/0/exclude").asBoolean());
+        assertEquals("korap:span",					res.at("/query/operands/0/operands/1/operands/0/operands/0/operands/0/@type").asText());
+        assertEquals("p",							res.at("/query/operands/0/operands/1/operands/0/operands/0/operands/0/key").asText());
+        assertEquals("korap:group",					res.at("/query/operands/0/operands/1/operands/0/operands/0/operands/1/@type").asText());
+        assertEquals("operation:class",				res.at("/query/operands/0/operands/1/operands/0/operands/0/operands/1/operation").asText());
+        assertEquals(130,							res.at("/query/operands/0/operands/1/operands/0/operands/0/operands/1/classOut").asInt());
+        assertEquals("der",							res.at("/query/operands/0/operands/1/operands/0/operands/0/operands/1/operands/0/wrap/key").asText());
+        assertEquals("korap:group",					res.at("/query/operands/0/operands/1/operands/0/operands/1/@type").asText());
+        assertEquals("operation:position",			res.at("/query/operands/0/operands/1/operands/0/operands/1/operation").asText());
+        assertEquals("frames:matches",				res.at("/query/operands/0/operands/1/operands/0/operands/1/frames/0").asText());
+        assertEquals("korap:reference",				res.at("/query/operands/0/operands/1/operands/0/operands/1/operands/0/@type").asText());
+        assertEquals("operation:focus",				res.at("/query/operands/0/operands/1/operands/0/operands/1/operands/0/operation").asText());
+        assertEquals(-1,							res.at("/query/operands/0/operands/1/operands/0/operands/1/operands/0/spanRef/0").asInt());
+        assertEquals(1,								res.at("/query/operands/0/operands/1/operands/0/operands/1/operands/0/spanRef/1").asInt());
+        assertEquals("korap:span",					res.at("/query/operands/0/operands/1/operands/0/operands/1/operands/0/operands/0/@type").asText());
+        assertEquals("t",							res.at("/query/operands/0/operands/1/operands/0/operands/1/operands/0/operands/0/key").asText());
+        assertEquals("korap:reference",				res.at("/query/operands/0/operands/1/operands/0/operands/1/operands/1/@type").asText());
+        assertEquals("operation:focus",				res.at("/query/operands/0/operands/1/operands/0/operands/1/operands/1/operation").asText());
+        assertEquals(0,								res.at("/query/operands/0/operands/1/operands/0/operands/1/operands/1/spanRef/0").asInt());
+        assertEquals(1,								res.at("/query/operands/0/operands/1/operands/0/operands/1/operands/1/spanRef/1").asInt());
+        assertEquals("korap:group",					res.at("/query/operands/0/operands/1/operands/0/operands/1/operands/1/operands/0/@type").asText());
+        assertEquals("operation:class",				res.at("/query/operands/0/operands/1/operands/0/operands/1/operands/1/operands/0/operation").asText());
+        assertEquals(131,							res.at("/query/operands/0/operands/1/operands/0/operands/1/operands/1/operands/0/classOut").asInt());
+        assertEquals("der",							res.at("/query/operands/0/operands/1/operands/0/operands/1/operands/1/operands/0/operands/0/wrap/key").asText());
+    }
+
+    @Test
+    public void testErrors() throws JsonProcessingException, IOException {
+        query = "MORPH(tt/p=\"\")";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals(true,         res.at("/query/@type").isMissingNode());
+        assertEquals(StatusCodes.INCOMPATIBLE_OPERATOR_AND_OPERAND,          res.at("/errors/0/0").asInt());
+        assertTrue(res.at("/errors/0/1").asText().startsWith("Something went wrong parsing the argument in MORPH()"));
+
+        query = "MORPH(tt/p=\"foo)";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals(true,         res.at("/query/@type").isMissingNode());
+        assertEquals(StatusCodes.MALFORMED_QUERY,          res.at("/errors/0/0").asInt());
+        assertTrue(res.at("/errors/0/1").asText().startsWith("Early closing parenthesis"));
+
+        query = "MORPH(tt/p=)";
+        qs.setQuery(query, "cosmas2");
+        res = mapper.readTree(qs.toJSON());
+        assertEquals(true,         res.at("/query/@type").isMissingNode());
+        assertEquals(StatusCodes.MALFORMED_QUERY,          res.at("/errors/0/0").asInt());
+        assertTrue(res.at("/errors/0/1").asText().startsWith("Early closing parenthesis"));
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/CqlQueryProcessorTest.java b/src/test/java/de/ids_mannheim/korap/query/serialize/CqlQueryProcessorTest.java
similarity index 99%
rename from src/test/java/CqlQueryProcessorTest.java
rename to src/test/java/de/ids_mannheim/korap/query/serialize/CqlQueryProcessorTest.java
index 91917f1..99dbe7e 100644
--- a/src/test/java/CqlQueryProcessorTest.java
+++ b/src/test/java/de/ids_mannheim/korap/query/serialize/CqlQueryProcessorTest.java
@@ -1,3 +1,4 @@
+package de.ids_mannheim.korap.query.serialize;
 import static org.junit.Assert.assertEquals;
 
 import java.io.IOException;
diff --git a/src/test/java/PoliqarpPlusQueryProcessorTest.java b/src/test/java/de/ids_mannheim/korap/query/serialize/PoliqarpPlusQueryProcessorTest.java
similarity index 99%
rename from src/test/java/PoliqarpPlusQueryProcessorTest.java
rename to src/test/java/de/ids_mannheim/korap/query/serialize/PoliqarpPlusQueryProcessorTest.java
index 97d5c8d..2466f5b 100644
--- a/src/test/java/PoliqarpPlusQueryProcessorTest.java
+++ b/src/test/java/de/ids_mannheim/korap/query/serialize/PoliqarpPlusQueryProcessorTest.java
@@ -1,3 +1,4 @@
+package de.ids_mannheim.korap.query.serialize;
 import static org.junit.Assert.*;
 
 import java.io.IOException;