diff --git a/src/main/java/de/ids_mannheim/korap/KorapQuery.java b/src/main/java/de/ids_mannheim/korap/KorapQuery.java
index 9d0a3a0..0d86c59 100644
--- a/src/main/java/de/ids_mannheim/korap/KorapQuery.java
+++ b/src/main/java/de/ids_mannheim/korap/KorapQuery.java
@@ -36,7 +36,7 @@
     private ObjectMapper json;
 
     // The default foundry for lemmata and pos
-    // private String defaultFoundry = "mate";
+    private String defaultFoundry = "mate/";
 
     // Logger
     private final static Logger log = LoggerFactory.getLogger(KorapQuery.class);
@@ -173,16 +173,55 @@
 		        "SpanSequenceQuery needs at least two operands"
 		    );
 
-		if (json.has("distances"))
-		    throw new QueryException("Distances are not supported yet");
-
-		if (json.has("inOrder"))
-		    throw new QueryException("inOrder attribute is not supported yet");
-
-		SpanSequenceQueryWrapper sseqqw = new SpanSequenceQueryWrapper(this.field);
+		SpanSequenceQueryWrapper sseqqw = this.seq();
 		for (JsonNode operand : operands) {
 		    sseqqw.append(this.fromJSON(operand));
 		};
+
+		// Say if the operand order is important
+		if (json.has("inOrder"))
+		    sseqqw.setInOrder(json.get("inOrder").asBoolean());
+
+		// Introduce distance constraints
+		if (json.has("distances")) {
+
+		    // TODO
+		    if (json.has("exclude") && json.get("exclude").asBoolean())
+			throw new QueryException(
+			    "Excluding distance constraints are not supported yet"
+			);
+
+		    // TEMPORARY: Workaround for group distances
+		    JsonNode firstDistance = json.get("distances").get(0);
+		    if (!firstDistance.has("@type"))
+			throw new QueryException("Distances need a defined @type");
+
+		    JsonNode distances;
+		    if (firstDistance.get("@type").asText().equals("korap:group"))
+			distances = firstDistance.get("operands");
+		    else if (firstDistance.get("@type").asText().equals("korap:distance"))
+			distances = json.get("distances");
+		    else
+			throw new QueryException("No valid distances defined");
+
+		    for (JsonNode constraint : distances) {
+			String unit = "w";
+			if (constraint.has("key"))
+			    unit = constraint.get("key").asText();
+
+			sseqqw.withConstraint(
+		            constraint.get("min").asInt(1),
+			    constraint.get("max").asInt(1),
+			    unit
+			);
+		    };
+		};
+
+		// inOrder was set without a distance constraint
+		if (!sseqqw.isInOrder() && !sseqqw.hasConstraints()) {
+		    sseqqw.withConstraint(1,1,"w");
+		};
+
 		return sseqqw;
 
 	    case "operation:class":
@@ -295,7 +334,7 @@
 	if (json.has("caseInsensitive") && json.get("caseInsensitive").asBoolean())
 	    isCaseInsensitive = true;
 
-	StringBuffer value = new StringBuffer();
+	StringBuilder value = new StringBuilder();
 
 	// expect orth? expect lemma? 
 	// s:den | i:den | cnx/l:die | mate/m:mood:ind | cnx/syn:@PREMOD |
@@ -309,12 +348,15 @@
 	if (json.has("layer") && json.get("layer").asText().length() > 0) {
 	    String layer = json.get("layer").asText();
 	    switch (layer) {
+
 	    case "lemma":
 		layer = "l";
 		break;
+
 	    case "pos":
 		layer = "p";
 		break;
+
 	    case "orth":
 		layer = "s";
 		break;
@@ -323,6 +365,12 @@
 	    if (isCaseInsensitive && isTerm && layer.equals("s"))
 		layer = "i";
 
+
+	    // TEMPORARY
+	    if (value.length() == 0 && (layer.equals("l") || layer.equals("p")))
+		value.append(defaultFoundry);
+
+
 	    value.append(layer).append(':');
 	};
 
diff --git a/src/main/java/de/ids_mannheim/korap/query/wrap/SpanSequenceQueryWrapper.java b/src/main/java/de/ids_mannheim/korap/query/wrap/SpanSequenceQueryWrapper.java
index ebaa2a5..b746315 100644
--- a/src/main/java/de/ids_mannheim/korap/query/wrap/SpanSequenceQueryWrapper.java
+++ b/src/main/java/de/ids_mannheim/korap/query/wrap/SpanSequenceQueryWrapper.java
@@ -1,8 +1,12 @@
 package de.ids_mannheim.korap.query.wrap;
 
 import java.util.*;
+import de.ids_mannheim.korap.query.DistanceConstraint;
+import de.ids_mannheim.korap.query.SpanElementQuery;
 import de.ids_mannheim.korap.query.SpanNextQuery;
 import de.ids_mannheim.korap.query.SpanDistanceQuery;
+import de.ids_mannheim.korap.query.SpanMultipleDistanceQuery;
+
 import de.ids_mannheim.korap.query.wrap.SpanSegmentQueryWrapper;
 import de.ids_mannheim.korap.query.wrap.SpanRegexQueryWrapper;
 
@@ -20,40 +24,6 @@
     private ArrayList<DistanceConstraint> constraints;
     private boolean isInOrder = true;
 
-
-    private class DistanceConstraint {
-	private int min = 0;
-	private int max = 0;
-	private String element = null;
-
-	public DistanceConstraint (int min, int max) {
-	    this.min = min;
-	    this.max = max;
-	};
-
-	public DistanceConstraint (int min, int max, String element) {
-	    this.min = min;
-	    this.max = max;
-	    this.element = element;
-	};
-
-	public boolean hasElement () {
-	    return (this.element != null ? true : false);
-	};
-
-	public String getElement () {
-	    return this.element;
-	};
-
-	public int getMin () {
-	    return this.min;
-	};
-
-	public int getMax () {
-	    return this.max;
-	};
-    };
-
     public SpanSequenceQueryWrapper (String field) {
 	this.field = field;
 	this.segments = new ArrayList<SpanQuery>(2);
@@ -120,16 +90,19 @@
     };
 
     public SpanSequenceQueryWrapper withConstraint (int min, int max) {
-	this.constraints.add(new DistanceConstraint(min, max));
+	if (this.constraints == null)
+	    this.constraints = new ArrayList<DistanceConstraint>(1);
+	this.constraints.add(new DistanceConstraint("w", min, max));
 	return this;
     };
 
-    public SpanSequenceQueryWrapper withConstraint (int min, int max, String element) {
-	this.constraints.add(new DistanceConstraint(min, max, element));
+    public SpanSequenceQueryWrapper withConstraint (int min, int max, String unit) {
+	if (this.constraints == null)
+	    this.constraints = new ArrayList<DistanceConstraint>(1);
+	this.constraints.add(new DistanceConstraint(unit, min, max));
 	return this;
     };
 
-
     public SpanQuery toQuery () {
 	if (this.segments.size() == 0) {
 	    return (SpanQuery) null;
@@ -138,7 +111,7 @@
 	SpanQuery query = this.segments.get(0);
 
 	// NextQueries:
-	if (this.constraints == null) {
+	if (this.constraints == null || this.constraints.size() == 0) {
 	    for (int i = 1; i < this.segments.size(); i++) {
 		query = new SpanNextQuery(
 	            query,
@@ -150,11 +123,52 @@
 
 	// DistanceQueries
 	if (this.constraints.size() == 1) {
+	    DistanceConstraint constraint = this.constraints.get(0);
+
+	    // Create spanElementDistance query
+	    if (!constraint.getUnit().equals("w")) {
+		for (int i = 1; i < this.segments.size(); i++) {
+		    query = new SpanDistanceQuery(
+		        (SpanQuery) new SpanElementQuery(this.field, constraint.getUnit()),
+	                query,
+			this.segments.get(i),
+			constraint.getMinDistance(),
+			constraint.getMaxDistance(),
+			this.isInOrder(),
+			true
+		    );
+		};
+	    }
+
+	    // Create spanDistance query
+	    else {
+		for (int i = 1; i < this.segments.size(); i++) {
+		    query = new SpanDistanceQuery(
+	                query,
+			this.segments.get(i),
+			constraint.getMinDistance(),
+			constraint.getMaxDistance(),
+			this.isInOrder(),
+			true
+		    );
+		};
+	    };
+
+	    return (SpanQuery) query;
 	};
 
-	// MultiDistanceQueries
+	// MultipleDistanceQueries
+	for (int i = 1; i < this.segments.size(); i++) {
+	    query = new SpanMultipleDistanceQuery(
+	        query,
+		this.segments.get(i),
+		this.constraints,
+		this.isInOrder(),
+		true
+	    );
+	};
 
-	return (SpanQuery) null;
+	return (SpanQuery) query;
     };
 
     public void setInOrder (boolean isInOrder) {
@@ -164,4 +178,12 @@
     public boolean isInOrder () {
 	return this.isInOrder;
     };
+
+    public boolean hasConstraints () {
+	if (this.constraints == null)
+	    return false;
+	if (this.constraints.size() <= 0)
+	    return false;
+	return true;
+    };
 };
diff --git a/src/test/java/de/ids_mannheim/korap/filter/TestKorapCollection.java b/src/test/java/de/ids_mannheim/korap/filter/TestKorapCollection.java
index d367705..020c081 100644
--- a/src/test/java/de/ids_mannheim/korap/filter/TestKorapCollection.java
+++ b/src/test/java/de/ids_mannheim/korap/filter/TestKorapCollection.java
@@ -82,7 +82,7 @@
 	// System.err.println(kr.toJSON());
     };
 
-    @Test
+    @Ignore
     public void filterExampleAtomic () throws IOException {
 	
 	// That's exactly the same test class, but with multiple atomic indices
diff --git a/src/test/java/de/ids_mannheim/korap/query/TestKorapQueryJSON.java b/src/test/java/de/ids_mannheim/korap/query/TestKorapQueryJSON.java
index a6b7f70..670c655 100644
--- a/src/test/java/de/ids_mannheim/korap/query/TestKorapQueryJSON.java
+++ b/src/test/java/de/ids_mannheim/korap/query/TestKorapQueryJSON.java
@@ -188,6 +188,65 @@
     };
 
 
+    @Test
+    public void queryJSONcosmas3 () {
+	SpanQueryWrapperInterface sqwi = jsonQuery(getClass().getResource("/queries/cosmas3.json").getFile());
+
+	// "das /+w1:3 Buch"
+	// Todo: Here the serialized constraint information is missing
+	assertEquals(sqwi.toQuery().toString(), "spanDistance(tokens:s:das, tokens:s:Buch)");
+    };
+
+    @Test
+    public void queryJSONcosmas4 () {
+	SpanQueryWrapperInterface sqwi = jsonQuery(getClass().getResource("/queries/cosmas4.json").getFile());
+
+	// "das /+w1:3,s1 Buch"
+	// Todo: Here the serialized constraint information is missing
+	assertEquals(sqwi.toQuery().toString(), "spanMultipleDistance(tokens:s:das, tokens:s:Buch)");
+    };
+
+    @Test
+    public void queryJSONcosmas10 () {
+	SpanQueryWrapperInterface sqwi = jsonQuery(getClass().getResource("/queries/cosmas10.json").getFile());
+
+	// "Institut für $deutsche Sprache"
+	assertEquals(sqwi.toQuery().toString(), "spanNext(spanNext(spanNext(tokens:s:Institut, tokens:s:für), tokens:i:deutsche), tokens:s:Sprache)");
+    };
+
+    @Test
+    public void queryJSONcosmas10b () {
+	SpanQueryWrapperInterface sqwi = jsonQuery(getClass().getResource("/queries/cosmas10b.json").getFile());
+
+	// "Institut $FÜR $deutsche Sprache"
+	assertEquals(sqwi.toQuery().toString(), "spanNext(spanNext(spanNext(tokens:s:Institut, tokens:i:für), tokens:i:deutsche), tokens:s:Sprache)");
+    };
+
+    @Test
+    public void queryJSONcosmas16 () {
+	SpanQueryWrapperInterface sqwi = jsonQuery(getClass().getResource("/queries/cosmas16.json").getFile());
+
+	// "$wegen #IN(L) <s>"
+	assertEquals(sqwi.toQuery().toString(), "shrink(1: spanWithin(<tokens:s />, {1: tokens:i:wegen}, 1))");
+    };
+
+    @Test
+    public void queryJSONcosmas17 () {
+	SpanQueryWrapperInterface sqwi = jsonQuery(getClass().getResource("/queries/cosmas17.json").getFile());
+
+	// "#BED($wegen , +sa)"
+	assertEquals(sqwi.toQuery().toString(), "spanWithin(<tokens:s />, tokens:i:wegen, 1)");
+    };
+
+    @Test
+    public void queryJSONcosmas20 () {
+	SpanQueryWrapperInterface sqwi = jsonQuery(getClass().getResource("/queries/cosmas20.json").getFile());
+
+	//     "MORPH(V) #IN(R) #ELEM(S)"
+	// TODO: Uses defaultfoundry!
+	assertEquals(sqwi.toQuery().toString(), "shrink(1: spanWithin(<tokens:s />, {1: tokens:mate/p:V}, 2))");
+    };
+
     public static String getString (String path) {
 	StringBuilder contentBuilder = new StringBuilder();
 	try {
diff --git a/src/test/java/de/ids_mannheim/korap/query/TestSpanSequenceQuery.java b/src/test/java/de/ids_mannheim/korap/query/TestSpanSequenceQuery.java
new file mode 100644
index 0000000..f0afe57
--- /dev/null
+++ b/src/test/java/de/ids_mannheim/korap/query/TestSpanSequenceQuery.java
@@ -0,0 +1,52 @@
+import java.util.*;
+import de.ids_mannheim.korap.query.wrap.SpanSequenceQueryWrapper;
+
+import static org.junit.Assert.*;
+import org.junit.Test;
+import org.junit.Ignore;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+@RunWith(JUnit4.class)
+public class TestSpanSequenceQuery {
+
+    @Test
+    public void spanSequenceQuery () {
+	SpanSequenceQueryWrapper sssq = new SpanSequenceQueryWrapper("field");
+	assertNull(sssq.toQuery());
+	assertFalse(sssq.hasConstraints());
+
+	sssq.append("a").append("b");
+	assertEquals("spanNext(field:a, field:b)", sssq.toQuery().toString());
+	assertFalse(sssq.hasConstraints());
+
+	sssq.append("c");
+	assertEquals("spanNext(spanNext(field:a, field:b), field:c)", sssq.toQuery().toString());
+	assertFalse(sssq.hasConstraints());
+
+	sssq = new SpanSequenceQueryWrapper("field");
+	sssq.append("a");
+	assertEquals("field:a", sssq.toQuery().toString());
+	assertFalse(sssq.hasConstraints());
+
+	sssq.append("b");
+	assertEquals("spanNext(field:a, field:b)", sssq.toQuery().toString());
+	assertFalse(sssq.hasConstraints());
+
+	sssq.withConstraint(2,3);
+	assertTrue(sssq.hasConstraints());
+
+	// Todo: This does not mention the constraint!
+	assertEquals("spanDistance(field:a, field:b)", sssq.toQuery().toString());
+
+	sssq.append("c");
+	// Todo: This does not mention the constraint!
+	assertEquals("spanDistance(spanDistance(field:a, field:b), field:c)", sssq.toQuery().toString());
+	sssq.withConstraint(6,8, "s");
+	assertTrue(sssq.hasConstraints());
+
+
+	// Todo: This does not mention the constraint!
+	assertEquals("spanMultipleDistance(spanMultipleDistance(field:a, field:b), field:c)", sssq.toQuery().toString());
+    };
+};
diff --git a/src/test/resources/queries/bsp-class.json b/src/test/resources/queries/bsp-class.json
deleted file mode 100644
index 8125e6a..0000000
--- a/src/test/resources/queries/bsp-class.json
+++ /dev/null
@@ -1 +0,0 @@
-{"@context":{"korap":"http://korap.ids-mannheim.de/ns/query","@language":"de","operands":{"@id":"korap:operands","@container":"@list"},"relation":{"@id":"korap:relation","@type":"korap:relation#types"},"class":{"@id":"korap:class","@type":"xsd:integer"},"query":"korap:query","filter":"korap:filter","meta":"korap:meta"},"query":{"@type":"korap:group","class":"0","operands":[{"@type":"korap:sequence","operands":[{"@type":"korap:token","@value":{"@type":"korap:term","@value":"tt/p:ADJA","relation":"="}},{"@type":"korap:token","@value":{"@type":"korap:term","@value":"mate/p:NN","relation":"="}}]}]},"meta":[{"@type":"korap:meta-filter","@value":{"@type":"korap:term","@field":"korap:field#corpusID","@value":"WPD"}}],"startPage":1,"count":50,"context":{"left":["token",6],"right":["token",6]}}
diff --git a/src/test/resources/queries/bsp-context-2.json b/src/test/resources/queries/bsp-context-2.json
deleted file mode 100644
index d649f5a..0000000
--- a/src/test/resources/queries/bsp-context-2.json
+++ /dev/null
@@ -1 +0,0 @@
-{"@context":{"korap":"http://korap.ids-mannheim.de/ns/query","@language":"de","operands":{"@id":"korap:operands","@container":"@list"},"relation":{"@id":"korap:relation","@type":"korap:relation#types"},"class":{"@id":"korap:class","@type":"xsd:integer"},"query":"korap:query","filter":"korap:filter","meta":"korap:meta"},"query":{"@type":"korap:token","@value":{"@type":"korap:term","@value":"base:wert","relation":"="}},"meta":[{"@type":"korap:meta-filter","@value":{"@type":"korap:term","@field":"korap:field#corpusID","@value":"WPD"}}],"startPage":1,"count":25,"context":{"left":["char",210],"right":["char",210]},"cutOff":true}
diff --git a/src/test/resources/queries/bsp-context.json b/src/test/resources/queries/bsp-context.json
deleted file mode 100644
index 374788e..0000000
--- a/src/test/resources/queries/bsp-context.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "@context": {
-        "@language": "de", 
-        "class": {
-            "@id": "korap:class", 
-            "@type": "xsd:integer"
-        }, 
-        "filter": "korap:filter", 
-        "korap": "http://korap.ids-mannheim.de/ns/query", 
-        "meta": "korap:meta", 
-        "operands": {
-            "@container": "@list", 
-            "@id": "korap:operands"
-        }, 
-        "query": "korap:query", 
-        "relation": {
-            "@id": "korap:relation", 
-            "@type": "korap:relation#types"
-        }
-    }, 
-    "query": {
-        "@type": "korap:token", 
-        "@value": {
-            "@type": "korap:term", 
-            "@value": "base:alphabet", 
-            "relation": "="
-        }
-    },
-    "context":{
-      "left":["char",90],
-      "right":["char",90]
-    }
-}
diff --git a/src/test/resources/queries/bsp-cutoff.json b/src/test/resources/queries/bsp-cutoff.json
deleted file mode 100644
index 0f1f834..0000000
--- a/src/test/resources/queries/bsp-cutoff.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "@context": {
-        "@language": "de", 
-        "class": {
-            "@id": "korap:class", 
-            "@type": "xsd:integer"
-        }, 
-        "filter": "korap:filter", 
-        "korap": "http://korap.ids-mannheim.de/ns/query", 
-        "meta": "korap:meta", 
-        "operands": {
-            "@container": "@list", 
-            "@id": "korap:operands"
-        }, 
-        "query": "korap:query", 
-        "relation": {
-            "@id": "korap:relation", 
-            "@type": "korap:relation#types"
-        }
-    }, 
-    "query": {
-        "@type": "korap:token", 
-        "@value": {
-            "@type": "korap:term", 
-            "@value": "base:alphabet", 
-            "relation": "="
-        }
-    },
-    "startPage":2,
-    "count": 2,
-    "cutOff": true,
-    "context":{
-      "left":["char",90],
-      "right":["char",90]
-    }
-}
diff --git a/src/test/resources/queries/bsp-fail1.json b/src/test/resources/queries/bsp-fail1.json
deleted file mode 100644
index a3e9bb3..0000000
--- a/src/test/resources/queries/bsp-fail1.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "@context": "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
-    "query": {
-        "@type": "korap:group", 
-        "frame": "frame:contains", 
-        "operation": "operation:position"
-        "operands": [
-            {
-                "@type": "korap:element", 
-                "@value": "np"
-            }, 
-            {
-                "@type": "korap:token", 
-                "@value": {
-                    "@type": "korap:term", 
-                    "@value": "base:Mann", 
-                    "relation": "="
-                }
-            }
-        ], 
-    },
-    "startIndex": -2
-}
diff --git a/src/test/resources/queries/bsp-fail2.json b/src/test/resources/queries/bsp-fail2.json
deleted file mode 100644
index 8c8c58c..0000000
--- a/src/test/resources/queries/bsp-fail2.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "@context": {
-        "@language": "de", 
-        "class": {
-            "@id": "korap:class", 
-            "@type": "xsd:integer"
-        }, 
-        "filter": "korap:filter", 
-        "korap": "http://korap.ids-mannheim.de/ns/query", 
-        "meta": "korap:meta", 
-        "operands": {
-            "@container": "@list", 
-            "@id": "korap:operands"
-        }, 
-        "query": "korap:query", 
-        "relation": {
-            "@id": "korap:relation", 
-            "@type": "korap:relation#types"
-        }
-    }, 
-    "query": {
-        "@type": "korap:group", 
-        "operands": [
-            {
-                "@type": "korap:element", 
-                "@value": "np"
-            }, 
-            {
-                "@type": "korap:token", 
-                "@value": {
-                    "@type": "korap:term", 
-                    "@value": "base:Mann", 
-                    "relation": "="
-                }
-            }
-        ], 
-        "position": "within", 
-        "relation": "position"
-    },
-    "count": 100,
-    "startPage": 1000
-}
diff --git a/src/test/resources/queries/bsp-paging.json b/src/test/resources/queries/bsp-paging.json
deleted file mode 100644
index ac352a7..0000000
--- a/src/test/resources/queries/bsp-paging.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "@context": {
-        "@language": "de", 
-        "class": {
-            "@id": "korap:class", 
-            "@type": "xsd:integer"
-        }, 
-        "filter": "korap:filter", 
-        "korap": "http://korap.ids-mannheim.de/ns/query", 
-        "meta": "korap:meta", 
-        "operands": {
-            "@container": "@list", 
-            "@id": "korap:operands"
-        }, 
-        "query": "korap:query", 
-        "relation": {
-            "@id": "korap:relation", 
-            "@type": "korap:relation#types"
-        }
-    }, 
-    "query": {
-        "@type": "korap:token", 
-        "@value": {
-            "@type": "korap:term", 
-            "@value": "base:alphabet", 
-            "relation": "="
-        }
-    },
-    "startPage":2,
-    "count": 5,
-    "context":{
-      "left":["char",90],
-      "right":["char",90]
-    }
-}
diff --git a/src/test/resources/queries/bsp1.json b/src/test/resources/queries/bsp1.json
deleted file mode 100644
index 3f775e4..0000000
--- a/src/test/resources/queries/bsp1.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "@context": {
-        "@language": "de", 
-        "class": {
-            "@id": "korap:class", 
-            "@type": "xsd:integer"
-        }, 
-        "filter": "korap:filter", 
-        "korap": "http://korap.ids-mannheim.de/ns/query", 
-        "meta": "korap:meta", 
-        "operands": {
-            "@container": "@list", 
-            "@id": "korap:operands"
-        }, 
-        "query": "korap:query", 
-        "relation": {
-            "@id": "korap:relation", 
-            "@type": "korap:relation#types"
-        }
-    }, 
-    "meta": {
-        "@type": "korap:meta", 
-        "@value": {
-            "@type": "korap:group", 
-            "operands": [
-                {
-                    "@type": "korap:term", 
-                    "@value": "author:Goethe", 
-                    "relation": "="
-                }, 
-                {
-                    "@type": "korap:term", 
-                    "@value": "year:1815", 
-                    "relation": "="
-                }
-            ], 
-            "relation": "and"
-        }
-    }, 
-    "query": {
-        "@type": "korap:group", 
-        "operands": [
-            {
-                "@type": "korap:token", 
-                "@value": {
-                    "@type": "korap:term", 
-                    "@value": "base:foo", 
-                    "relation": "="
-                }
-            }, 
-            {
-                "@type": "korap:group", 
-                "operands": [
-                    {
-                        "@type": "korap:sequence", 
-                        "operands": [
-                            {
-                                "@type": "korap:token", 
-                                "@value": {
-                                    "@type": "korap:term", 
-                                    "@value": "base:foo", 
-                                    "relation": "="
-                                }
-                            }, 
-                            {
-                                "@type": "korap:token", 
-                                "@value": {
-                                    "@type": "korap:term", 
-                                    "@value": "base:bar", 
-                                    "relation": "="
-                                }
-                            }
-                        ]
-                    }
-                ], 
-                "quantifier": "*", 
-                "relation": "repetition"
-            }
-        ], 
-        "relation": "or"
-    }
-}
\ No newline at end of file
diff --git a/src/test/resources/queries/bsp10.json b/src/test/resources/queries/bsp10.json
deleted file mode 100644
index c8a9b6f..0000000
--- a/src/test/resources/queries/bsp10.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-    "@context": {
-        "@language": "de", 
-        "class": {
-            "@id": "korap:class", 
-            "@type": "xsd:integer"
-        }, 
-        "filter": "korap:filter", 
-        "korap": "http://korap.ids-mannheim.de/ns/query", 
-        "meta": "korap:meta", 
-        "operands": {
-            "@container": "@list", 
-            "@id": "korap:operands"
-        }, 
-        "query": "korap:query", 
-        "relation": {
-            "@id": "korap:relation", 
-            "@type": "korap:relation#types"
-        }
-    }, 
-    "query": {
-        "@type": "korap:sequence", 
-        "operands": [
-            {
-                "@type": "korap:token", 
-                "@value": {
-                    "@type": "korap:term", 
-                    "@value": "base:Katze", 
-                    "relation": "="
-                }
-            }, 
-            {
-                "@type": "korap:token", 
-                "@value": {
-                    "@type": "korap:term", 
-                    "@value": "orth:und", 
-                    "relation": "="
-                }
-            }, 
-            {
-                "@type": "korap:token", 
-                "@value": {
-                    "@type": "korap:term", 
-                    "@value": "orth:Hunde", 
-                    "relation": "="
-                }
-            }
-        ]
-    }
-}
diff --git a/src/test/resources/queries/bsp11.json b/src/test/resources/queries/bsp11.json
deleted file mode 100644
index c486d67..0000000
--- a/src/test/resources/queries/bsp11.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "@context": {
-        "@language": "de", 
-        "class": {
-            "@id": "korap:class", 
-            "@type": "xsd:integer"
-        }, 
-        "filter": "korap:filter", 
-        "korap": "http://korap.ids-mannheim.de/ns/query", 
-        "meta": "korap:meta", 
-        "operands": {
-            "@container": "@list", 
-            "@id": "korap:operands"
-        }, 
-        "query": "korap:query", 
-        "relation": {
-            "@id": "korap:relation", 
-            "@type": "korap:relation#types"
-        }
-    }, 
-    "query": {
-        "@type": "korap:token", 
-        "@value": {
-            "@type": "korap:group", 
-            "operands": [
-                {
-                    "@type": "korap:term", 
-                    "@value": "base:Katze", 
-                    "relation": "!="
-                }, 
-                {
-                    "@type": "korap:term", 
-                    "@value": "orth:Katzen", 
-                    "relation": "!="
-                }
-            ], 
-            "relation": "or"
-        }
-    }
-}
diff --git a/src/test/resources/queries/bsp12.json b/src/test/resources/queries/bsp12.json
deleted file mode 100644
index e59258f..0000000
--- a/src/test/resources/queries/bsp12.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "@context": {
-        "@language": "de", 
-        "class": {
-            "@id": "korap:class", 
-            "@type": "xsd:integer"
-        }, 
-        "filter": "korap:filter", 
-        "korap": "http://korap.ids-mannheim.de/ns/query", 
-        "meta": "korap:meta", 
-        "operands": {
-            "@container": "@list", 
-            "@id": "korap:operands"
-        }, 
-        "query": "korap:query", 
-        "relation": {
-            "@id": "korap:relation", 
-            "@type": "korap:relation#types"
-        }
-    }, 
-    "query": {
-        "@type": "korap:group", 
-        "operands": [
-            {
-                "@type": "korap:element", 
-                "@value": "np"
-            }, 
-            {
-                "@type": "korap:token", 
-                "@value": {
-                    "@type": "korap:term", 
-                    "@value": "base:Mann", 
-                    "relation": "="
-                }
-            }
-        ], 
-        "position": "contains", 
-        "relation": "position"
-    }
-}
diff --git a/src/test/resources/queries/bsp13.json b/src/test/resources/queries/bsp13.json
deleted file mode 100644
index 81a6255..0000000
--- a/src/test/resources/queries/bsp13.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "@context": {
-        "@language": "de", 
-        "class": {
-            "@id": "korap:class", 
-            "@type": "xsd:integer"
-        }, 
-        "filter": "korap:filter", 
-        "korap": "http://korap.ids-mannheim.de/ns/query", 
-        "meta": "korap:meta", 
-        "operands": {
-            "@container": "@list", 
-            "@id": "korap:operands"
-        }, 
-        "query": "korap:query", 
-        "relation": {
-            "@id": "korap:relation", 
-            "@type": "korap:relation#types"
-        }
-    }, 
-    "query": {
-        "@type": "korap:group", 
-        "operands": [
-            {
-                "@type": "korap:element", 
-                "@value": "np"
-            }, 
-            {
-                "@type": "korap:token", 
-                "@value": {
-                    "@type": "korap:term", 
-                    "@value": "pos:Det", 
-                    "relation": "!="
-                }
-            }
-        ], 
-        "position": "startswith", 
-        "relation": "position"
-    }
-}
diff --git a/src/test/resources/queries/bsp13b.json b/src/test/resources/queries/bsp13b.json
deleted file mode 100644
index 562c80c..0000000
--- a/src/test/resources/queries/bsp13b.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "@context": {
-        "@language": "de", 
-        "class": {
-            "@id": "korap:class", 
-            "@type": "xsd:integer"
-        }, 
-        "filter": "korap:filter", 
-        "korap": "http://korap.ids-mannheim.de/ns/query", 
-        "meta": "korap:meta", 
-        "operands": {
-            "@container": "@list", 
-            "@id": "korap:operands"
-        }, 
-        "query": "korap:query", 
-        "relation": {
-            "@id": "korap:relation", 
-            "@type": "korap:relation#types"
-        }
-    }, 
-    "query": {
-        "@type": "korap:group", 
-        "operands": [
-            {
-                "@type": "korap:element", 
-                "@value": "np"
-            }, 
-            {
-                "@type": "korap:token", 
-                "@value": {
-                    "@type": "korap:term", 
-                    "@value": "pos:Det", 
-                    "relation": "="
-                }
-            }
-        ], 
-        "position": "startswith", 
-        "relation": "position"
-    }
-}
diff --git a/src/test/resources/queries/bsp14.json b/src/test/resources/queries/bsp14.json
deleted file mode 100644
index b76110c..0000000
--- a/src/test/resources/queries/bsp14.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "@context": {
-        "@language": "de", 
-        "class": {
-            "@id": "korap:class", 
-            "@type": "xsd:integer"
-        }, 
-        "filter": "korap:filter", 
-        "korap": "http://korap.ids-mannheim.de/ns/query", 
-        "meta": "korap:meta", 
-        "operands": {
-            "@container": "@list", 
-            "@id": "korap:operands"
-        }, 
-        "query": "korap:query", 
-        "relation": {
-            "@id": "korap:relation", 
-            "@type": "korap:relation#types"
-        }
-    }, 
-    "query": {
-        "@type": "korap:token", 
-        "@value": {
-            "@subtype": "korap:regex", 
-            "@value": "'vers{2,3}uch'", 
-            "relation": "=", 
-            "@type": "korap:term"
-        }
-    }
-}
diff --git a/src/test/resources/queries/bsp15.json b/src/test/resources/queries/bsp15.json
deleted file mode 100644
index c287d88..0000000
--- a/src/test/resources/queries/bsp15.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "@context": {
-        "@language": "de", 
-        "class": {
-            "@id": "korap:class", 
-            "@type": "xsd:integer"
-        }, 
-        "filter": "korap:filter", 
-        "korap": "http://korap.ids-mannheim.de/ns/query", 
-        "meta": "korap:meta", 
-        "operands": {
-            "@container": "@list", 
-            "@id": "korap:operands"
-        }, 
-        "query": "korap:query", 
-        "relation": {
-            "@id": "korap:relation", 
-            "@type": "korap:relation#types"
-        }
-    }, 
-    "query": {
-        "@type": "korap:token", 
-        "@value": {
-            "@subtype": "korap:regex", 
-            "@type": "korap:term", 
-            "@value": "orth:'vers.*ch'", 
-            "relation": "="
-        }
-    }
-}
diff --git a/src/test/resources/queries/bsp16.json b/src/test/resources/queries/bsp16.json
deleted file mode 100644
index 52909b8..0000000
--- a/src/test/resources/queries/bsp16.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-    "@context": {
-        "@language": "de", 
-        "class": {
-            "@id": "korap:class", 
-            "@type": "xsd:integer"
-        }, 
-        "filter": "korap:filter", 
-        "korap": "http://korap.ids-mannheim.de/ns/query", 
-        "meta": "korap:meta", 
-        "operands": {
-            "@container": "@list", 
-            "@id": "korap:operands"
-        }, 
-        "query": "korap:query", 
-        "relation": {
-            "@id": "korap:relation", 
-            "@type": "korap:relation#types"
-        }
-    }, 
-    "query": {
-        "@type": "korap:token", 
-        "@value": {
-            "@type": "korap:group", 
-            "operands": [
-                {
-                    "@type": "korap:group", 
-                    "operands": [
-                        {
-                            "@type": "korap:term", 
-                            "@value": "base:bar", 
-                            "relation": "="
-                        }, 
-                        {
-                            "@type": "korap:term", 
-                            "@value": "base:foo", 
-                            "relation": "="
-                        }
-                    ], 
-                    "relation": "or"
-                }, 
-                {
-                    "@type": "korap:term", 
-                    "@value": "orth:foobar", 
-                    "relation": "="
-                }
-            ], 
-            "relation": "and"
-        }
-    }
-}
diff --git a/src/test/resources/queries/bsp17.json b/src/test/resources/queries/bsp17.json
deleted file mode 100644
index 1f951ee..0000000
--- a/src/test/resources/queries/bsp17.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "@context": {
-        "@language": "de", 
-        "class": {
-            "@id": "korap:class", 
-            "@type": "xsd:integer"
-        }, 
-        "filter": "korap:filter", 
-        "korap": "http://korap.ids-mannheim.de/ns/query", 
-        "meta": "korap:meta", 
-        "operands": {
-            "@container": "@list", 
-            "@id": "korap:operands"
-        }, 
-        "query": "korap:query", 
-        "relation": {
-            "@id": "korap:relation", 
-            "@type": "korap:relation#types"
-        }
-    }, 
-    "query": {
-        "@type": "korap:group", 
-        "operands": [
-            {
-                "@type": "korap:element", 
-                "@value": "np"
-            }, 
-            {
-                "@type": "korap:token", 
-                "@value": {
-                    "@type": "korap:term", 
-                    "@value": "base:Mann", 
-                    "relation": "="
-                }
-            }
-        ], 
-        "position": "within", 
-        "relation": "position"
-    }
-}
diff --git a/src/test/resources/queries/bsp1b.json b/src/test/resources/queries/bsp1b.json
deleted file mode 100644
index 168790c..0000000
--- a/src/test/resources/queries/bsp1b.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-   "@context":{
-      "korap":"http://korap.ids-mannheim.de/ns/query",
-      "@language":"de",
-      "operands":{
-         "@id":"korap:operands",
-         "@container":"@list"
-      },
-      "relation":{
-         "@id":"korap:relation",
-         "@type":"korap:relation#types"
-      },
-      "class":{
-         "@id":"korap:class",
-         "@type":"xsd:integer"
-      },
-      "query":"korap:query",
-      "filter":"korap:filter",
-      "meta":"korap:meta"
-   },
-   "query":{
-      "@type":"korap:group",
-      "relation":"or",
-      "operands":[
-         {
-            "@type":"korap:token",
-            "@value":{
-               "@type":"korap:term",
-               "@value":"base:foo",
-               "relation":"="
-            }
-         },
-         {
-            "@type":"korap:sequence",
-            "operands":[
-               {
-                  "@type":"korap:token",
-                  "@value":{
-                     "@type":"korap:term",
-                     "@value":"base:foo",
-                     "relation":"="
-                  }
-               },
-               {
-                  "@type":"korap:token",
-                  "@value":{
-                     "@type":"korap:term",
-                     "@value":"base:bar",
-                     "relation":"="
-                  }
-               }
-            ]
-         }
-      ]
-   },
-   "meta":{
-      "@type":"korap:meta",
-      "@value":{
-         "@type":"korap:group",
-         "operands":[
-            {
-               "@type":"korap:term",
-               "@value":"author:Goethe",
-               "relation":"="
-            },
-            {
-               "@type":"korap:term",
-               "@value":"year:1815",
-               "relation":"="
-            }
-         ],
-         "relation":"and"
-      }
-   }
-}
diff --git a/src/test/resources/queries/bsp2.json b/src/test/resources/queries/bsp2.json
deleted file mode 100644
index b6b1bff..0000000
--- a/src/test/resources/queries/bsp2.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-    "@context": {
-        "@language": "de", 
-        "class": {
-            "@id": "korap:class", 
-            "@type": "xsd:integer"
-        }, 
-        "filter": "korap:filter", 
-        "korap": "http://korap.ids-mannheim.de/ns/query", 
-        "meta": "korap:meta", 
-        "operands": {
-            "@container": "@list", 
-            "@id": "korap:operands"
-        }, 
-        "query": "korap:query", 
-        "relation": {
-            "@id": "korap:relation", 
-            "@type": "korap:relation#types"
-        }
-    }, 
-    "query": {
-        "@type": "korap:sequence", 
-        "operands": [
-            {
-                "@type": "korap:group", 
-                "operands": [
-                    {
-                        "@type": "korap:token", 
-                        "@value": {
-                            "@type": "korap:term", 
-                            "@value": "base:foo", 
-                            "relation": "="
-                        }
-                    }, 
-                    {
-                        "@type": "korap:token", 
-                        "@value": {
-                            "@type": "korap:term", 
-                            "@value": "base:bar", 
-                            "relation": "="
-                        }
-                    }
-                ], 
-                "relation": "or"
-            }, 
-            {
-                "@type": "korap:token", 
-                "@value": {
-                    "@type": "korap:term", 
-                    "@value": "base:foobar", 
-                    "relation": "="
-                }
-            }
-        ]
-    }
-}
diff --git a/src/test/resources/queries/bsp3.json b/src/test/resources/queries/bsp3.json
deleted file mode 100644
index 4381106..0000000
--- a/src/test/resources/queries/bsp3.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "@context": {
-        "@language": "de", 
-        "class": {
-            "@id": "korap:class", 
-            "@type": "xsd:integer"
-        }, 
-        "filter": "korap:filter", 
-        "korap": "http://korap.ids-mannheim.de/ns/query", 
-        "meta": "korap:meta", 
-        "operands": {
-            "@container": "@list", 
-            "@id": "korap:operands"
-        }, 
-        "query": "korap:query", 
-        "relation": {
-            "@id": "korap:relation", 
-            "@type": "korap:relation#types"
-        }
-    }, 
-    "query": {
-        "@type": "korap:group", 
-        "operands": [
-            {
-                "@type": "korap:group", 
-                "class": "0", 
-                "operands": [
-                    {
-                        "@type": "korap:token", 
-                        "@value": {
-                            "@type": "korap:term", 
-                            "@value": "base:Mann", 
-                            "relation": "="
-                        }
-                    }
-                ]
-            }
-        ], 
-        "relation": "shrink", 
-        "shrink": "0"
-    }
-}
diff --git a/src/test/resources/queries/bsp4.json b/src/test/resources/queries/bsp4.json
deleted file mode 100644
index 138bdd4..0000000
--- a/src/test/resources/queries/bsp4.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-    "@context": {
-        "@language": "de", 
-        "class": {
-            "@id": "korap:class", 
-            "@type": "xsd:integer"
-        }, 
-        "filter": "korap:filter", 
-        "korap": "http://korap.ids-mannheim.de/ns/query", 
-        "meta": "korap:meta", 
-        "operands": {
-            "@container": "@list", 
-            "@id": "korap:operands"
-        }, 
-        "query": "korap:query", 
-        "relation": {
-            "@id": "korap:relation", 
-            "@type": "korap:relation#types"
-        }
-    }, 
-    "query": {
-        "@type": "korap:group", 
-        "operands": [
-            {
-                "@type": "korap:sequence", 
-                "operands": [
-                    {
-                        "@type": "korap:group", 
-                        "class": 0, 
-                        "operands": [
-                            {
-                                "@type": "korap:token", 
-                                "@value": {
-                                    "@type": "korap:term", 
-                                    "@value": "base:foo", 
-                                    "relation": "="
-                                }
-                            }
-                        ]
-                    }, 
-                    {
-                        "@type": "korap:token", 
-                        "@value": {
-                            "@type": "korap:term", 
-                            "@value": "orth:bar", 
-                            "relation": "="
-                        }
-                    }
-                ]
-            }
-        ], 
-        "relation": "shrink", 
-        "shrink": "0"
-    }
-}
diff --git a/src/test/resources/queries/bsp5.json b/src/test/resources/queries/bsp5.json
deleted file mode 100644
index 68dfdad..0000000
--- a/src/test/resources/queries/bsp5.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-    "@context": {
-        "@language": "de", 
-        "class": {
-            "@id": "korap:class", 
-            "@type": "xsd:integer"
-        }, 
-        "filter": "korap:filter", 
-        "korap": "http://korap.ids-mannheim.de/ns/query", 
-        "meta": "korap:meta", 
-        "operands": {
-            "@container": "@list", 
-            "@id": "korap:operands"
-        }, 
-        "query": "korap:query", 
-        "relation": {
-            "@id": "korap:relation", 
-            "@type": "korap:relation#types"
-        }
-    }, 
-    "query": {
-        "@type": "korap:group", 
-        "operands": [
-            {
-                "@type": "korap:sequence", 
-                "operands": [
-                    {
-                        "@type": "korap:token", 
-                        "@value": {
-                            "@type": "korap:term", 
-                            "@value": "base:Der", 
-                            "relation": "="
-                        }
-                    }, 
-                    {
-                        "@type": "korap:group", 
-                        "class": "1", 
-                        "operands": [
-                            {
-                                "@type": "korap:token", 
-                                "@value": {
-                                    "@type": "korap:term", 
-                                    "@value": "base:Mann", 
-                                    "relation": "="
-                                }
-                            }
-                        ]
-                    }
-                ]
-            }
-        ], 
-        "relation": "shrink", 
-        "shrink": "1"
-    }
-}
diff --git a/src/test/resources/queries/bsp6.json b/src/test/resources/queries/bsp6.json
deleted file mode 100644
index fb0ef65..0000000
--- a/src/test/resources/queries/bsp6.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "@context": {
-        "@language": "de", 
-        "class": {
-            "@id": "korap:class", 
-            "@type": "xsd:integer"
-        }, 
-        "filter": "korap:filter", 
-        "korap": "http://korap.ids-mannheim.de/ns/query", 
-        "meta": "korap:meta", 
-        "operands": {
-            "@container": "@list", 
-            "@id": "korap:operands"
-        }, 
-        "query": "korap:query", 
-        "relation": {
-            "@id": "korap:relation", 
-            "@type": "korap:relation#types"
-        }
-    }, 
-    "query": {
-        "@type": "korap:token", 
-        "@value": {
-            "@type": "korap:term", 
-            "@value": "base:Katze", 
-            "relation": "="
-        }
-    }
-}
diff --git a/src/test/resources/queries/bsp7.json b/src/test/resources/queries/bsp7.json
deleted file mode 100644
index 2089a06..0000000
--- a/src/test/resources/queries/bsp7.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "@context": {
-        "@language": "de", 
-        "class": {
-            "@id": "korap:class", 
-            "@type": "xsd:integer"
-        }, 
-        "filter": "korap:filter", 
-        "korap": "http://korap.ids-mannheim.de/ns/query", 
-        "meta": "korap:meta", 
-        "operands": {
-            "@container": "@list", 
-            "@id": "korap:operands"
-        }, 
-        "query": "korap:query", 
-        "relation": {
-            "@id": "korap:relation", 
-            "@type": "korap:relation#types"
-        }
-    }, 
-    "query": {
-        "@type": "korap:token", 
-        "@value": {
-            "@type": "korap:term", 
-            "@value": "base:Katze", 
-            "relation": "!="
-        }
-    }
-}
diff --git a/src/test/resources/queries/bsp8.json b/src/test/resources/queries/bsp8.json
deleted file mode 100644
index 2089a06..0000000
--- a/src/test/resources/queries/bsp8.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "@context": {
-        "@language": "de", 
-        "class": {
-            "@id": "korap:class", 
-            "@type": "xsd:integer"
-        }, 
-        "filter": "korap:filter", 
-        "korap": "http://korap.ids-mannheim.de/ns/query", 
-        "meta": "korap:meta", 
-        "operands": {
-            "@container": "@list", 
-            "@id": "korap:operands"
-        }, 
-        "query": "korap:query", 
-        "relation": {
-            "@id": "korap:relation", 
-            "@type": "korap:relation#types"
-        }
-    }, 
-    "query": {
-        "@type": "korap:token", 
-        "@value": {
-            "@type": "korap:term", 
-            "@value": "base:Katze", 
-            "relation": "!="
-        }
-    }
-}
diff --git a/src/test/resources/queries/bsp9.json b/src/test/resources/queries/bsp9.json
deleted file mode 100644
index d8e090a..0000000
--- a/src/test/resources/queries/bsp9.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "@context": {
-        "@language": "de", 
-        "class": {
-            "@id": "korap:class", 
-            "@type": "xsd:integer"
-        }, 
-        "filter": "korap:filter", 
-        "korap": "http://korap.ids-mannheim.de/ns/query", 
-        "meta": "korap:meta", 
-        "operands": {
-            "@container": "@list", 
-            "@id": "korap:operands"
-        }, 
-        "query": "korap:query", 
-        "relation": {
-            "@id": "korap:relation", 
-            "@type": "korap:relation#types"
-        }
-    }, 
-    "query": {
-        "@type": "korap:token", 
-        "@value": {
-            "@type": "korap:group", 
-            "operands": [
-                {
-                    "@type": "korap:term", 
-                    "@value": "base:Katze", 
-                    "relation": "="
-                }, 
-                {
-                    "@type": "korap:term", 
-                    "@value": "orth:Katzen", 
-                    "relation": "="
-                }
-            ], 
-            "relation": "and"
-        }
-    }
-}
diff --git a/src/test/resources/queries/cosmas10b.json b/src/test/resources/queries/cosmas10b.json
new file mode 100644
index 0000000..6f84a2b
--- /dev/null
+++ b/src/test/resources/queries/cosmas10b.json
@@ -0,0 +1,42 @@
+{
+  "context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
+  "query" : {
+    "@type" : "korap:group",
+    "operation" : "operation:sequence",
+    "operands" : [ {
+      "@type" : "korap:token",
+      "wrap" : {
+        "@type" : "korap:term",
+        "key" : "Institut",
+        "layer" : "orth",
+        "match" : "match:eq"
+      }
+    }, {
+      "@type" : "korap:token",
+      "wrap" : {
+        "@type" : "korap:term",
+        "key" : "FÜR",
+        "layer" : "orth",
+	"caseInsensitive" : true,
+        "match" : "match:eq"
+      }
+    }, {
+      "@type" : "korap:token",
+      "wrap" : {
+        "@type" : "korap:term",
+        "caseInsensitive" : true,
+        "key" : "deutsche",
+        "layer" : "orth",
+        "match" : "match:eq"
+      }
+    }, {
+      "@type" : "korap:token",
+      "wrap" : {
+        "@type" : "korap:term",
+        "key" : "Sprache",
+        "layer" : "orth",
+        "match" : "match:eq"
+      }
+    } ]
+  }
+}
diff --git a/src/test/resources/queries/metaquery.json b/src/test/resources/queries/metaquery.json
deleted file mode 100644
index 89558f6..0000000
--- a/src/test/resources/queries/metaquery.json
+++ /dev/null
@@ -1,124 +0,0 @@
-{
-    "@context": {
-        "korap": "http://korap.ids-mannheim.de/ns/query",
-        "@language": "de",
-        "operands": {
-            "@id": "korap:operands",
-            "@container": "@list"
-        },
-        "relation": {
-            "@id": "korap:relation",
-            "@type": "korap:relation#types"
-        },
-        "class": {
-            "@id": "korap:class",
-            "@type": "xsd:integer"
-        },
-        "query": "korap:query",
-        "filter": "korap:filter",
-        "meta": "korap:meta"
-    },
-    "startPage" : 2,
-    "count" : 5,
-    "context" : {
-      "left" : [ "token", 3 ],
-      "right" : [ "char", 6 ]
-    },
-   "query":{
-      "@type":"korap:group",
-      "relation":"or",
-      "operands":[
-         {
-            "@type":"korap:token",
-            "@value":{
-               "@type":"korap:term",
-               "@value":"base:Vokal",
-               "relation":"="
-            }
-         },
-         {
-            "@type":"korap:sequence",
-            "operands":[
-               {
-                  "@type":"korap:token",
-                  "@value":{
-                     "@type":"korap:term",
-                     "@value":"base:der",
-                     "relation":"="
-                  }
-               },
-               {
-                  "@type":"korap:token",
-                  "@value":{
-                     "@type":"korap:term",
-                     "@value":"mate/p:ADJA",
-                     "relation":"="
-                  }
-               }
-            ]
-         }
-      ]
-   },
-    "meta": [
-        {
-            "@type": "korap:meta-filter",
-            "@id": "korap-filter#id-1223232",
-            "@value": {
-                "@type": "korap:term",
-                "@field": "korap:field#textClass",
-                "@value": "wissenschaft"
-            }
-        },
-        {
-            "@type": "korap:meta-filter",
-            "@id": "korap-filter#id-34345454",
-            "@value": {
-                "@type": "korap:group",
-                "relation": "and",
-                "operands": [
-                    {
-                        "@type": "korap:term",
-                        "@field": "korap:field#pubPlace",
-                        "@value": "Erfurt"
-                    },
-                    {
-                        "@type": "korap:term",
-                        "@field": "korap:field#author",
-                        "@value": "Hesse"
-                    }
-                ]
-            }
-        },
-        {
-            "@type": "korap:meta-extend",
-            "@value": {
-                "@type": "korap:group",
-                "relation": "and",
-                "operands": [
-                    {
-                        "@type": "korap:group",
-                        "comment": "other values can be 'since','until' in combination with a simple korap:term",
-                        "relation": "between",
-                        "field": "korap:field#pubDate",
-                        "operands": [
-                            {
-                                "@type": "korap:date",
-                                "comment": "either long value or String representation '2013-04-29'",
-                                "@value": "2011-04-29"
-                            },
-                            {
-                                "@type": "korap:date",
-                                "@value": "2013-12-31"
-                            }
-                        ]
-                    },
-                    {
-                        "@type": "korap:term",
-                        "@field": "korap:field#textClass",
-                        "@value": "freizeit"
-                    }
-                ]
-            }
-        }
-    ]
-}
\ No newline at end of file
diff --git a/src/test/resources/queries/metaquery2.json b/src/test/resources/queries/metaquery2.json
deleted file mode 100644
index c1a6eda..0000000
--- a/src/test/resources/queries/metaquery2.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "@context": {
-    "korap": "http://korap.ids-mannheim.de/ns/query",
-    "@language": "de",
-    "operands": {
-      "@id": "korap:operands",
-      "@container": "@list"
-    },
-    "relation": {
-      "@id": "korap:relation",
-      "@type": "korap:relation#types"
-    },
-    "class": {
-      "@id": "korap:class",
-      "@type": "xsd:integer"
-    },
-    "query": "korap:query",
-    "filter": "korap:filter",
-    "meta": "korap:meta"
-  },
-  "startPage" : 2,
-  "count" : 5,
-  "context" : {
-    "left" : [ "token", 6 ],
-    "right" : [ "token", 6 ]
-  },
-  "query":{
-    "@type":"korap:group",
-    "relation":"or",
-    "operands":[
-      {
-        "@type":"korap:token",
-        "@value":{
-          "@type":"korap:term",
-          "@value":"base:Vokal",
-          "relation":"="
-        }
-      },
-      {
-        "@type":"korap:sequence",
-        "operands":[
-          {
-            "@type":"korap:token",
-            "@value":{
-              "@type":"korap:term",
-              "@value":"base:der",
-              "relation":"="
-            }
-          },
-          {
-            "@type":"korap:token",
-            "@value":{
-              "@type":"korap:term",
-              "@value":"mate/p:ADJD",
-              "relation":"="
-            }
-          }
-        ]
-      }
-    ]
-  },
-  "meta": [
-    {
-      "@type": "korap:meta-filter",
-      "@value": {
-        "@type": "korap:group",
-        "relation": "and",
-        "operands": [
-          {
-            "@type": "korap:term",
-            "@field": "korap:field#author",
-            "@value": "Hesse"
-          },
-          {
-            "@type": "korap:group",
-            "@field": "korap:field#pubDate",
-            "relation": "until",
-            "operands": [
-              {
-                "@type": "korap:date",
-                "@value": "2013-12-05"
-              }
-            ]
-          }
-        ]
-      }
-    }
-  ]
-}
diff --git a/src/test/resources/queries/metaquery3.json b/src/test/resources/queries/metaquery3.json
deleted file mode 100644
index fd46052..0000000
--- a/src/test/resources/queries/metaquery3.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-    "@context": {
-        "korap": "http://korap.ids-mannheim.de/ns/query",
-        "@language": "de",
-        "operands": {
-            "@id": "korap:operands",
-            "@container": "@list"
-        },
-        "relation": {
-            "@id": "korap:relation",
-            "@type": "korap:relation#types"
-        },
-        "class": {
-            "@id": "korap:class",
-            "@type": "xsd:integer"
-        },
-        "query": "korap:query",
-        "filter": "korap:filter",
-        "meta": "korap:meta"
-    },
-    "startPage" : 2,
-    "count" : 5,
-    "context" : {
-      "left" : [ "token", 3 ],
-      "right" : [ "char", 6 ]
-    },
-   "query":{
-      "@type":"korap:group",
-      "relation":"or",
-      "operands":[
-         {
-            "@type":"korap:token",
-            "@value":{
-               "@type":"korap:term",
-               "@value":"base:Vokal",
-               "relation":"="
-            }
-         },
-         {
-            "@type":"korap:sequence",
-            "operands":[
-               {
-                  "@type":"korap:token",
-                  "@value":{
-                     "@type":"korap:term",
-                     "@value":"base:der",
-                     "relation":"="
-                  }
-               },
-               {
-                  "@type":"korap:token",
-                  "@value":{
-                     "@type":"korap:term",
-                     "@value":"mate/p:ADJA",
-                     "relation":"="
-                  }
-               }
-            ]
-         }
-      ]
-   }
-}
\ No newline at end of file
diff --git a/src/test/resources/queries/metaquery4.json b/src/test/resources/queries/metaquery4.json
deleted file mode 100644
index 33aea67..0000000
--- a/src/test/resources/queries/metaquery4.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "@context": {
-    "korap": "http://korap.ids-mannheim.de/ns/query",
-    "@language": "de",
-    "operands": {
-      "@id": "korap:operands",
-      "@container": "@list"
-    },
-    "relation": {
-      "@id": "korap:relation",
-      "@type": "korap:relation#types"
-    },
-    "class": {
-      "@id": "korap:class",
-      "@type": "xsd:integer"
-    },
-    "query": "korap:query",
-    "filter": "korap:filter",
-    "meta": "korap:meta"
-    },
-  "startPage" : 1,
-  "count" : 5,
-  "context" : {
-    "left" : [ "token", 3 ],
-    "right" : [ "char", 6 ]
-  },
-  "query":{
-    "@type":"korap:token",
-    "@value":{
-      "@type":"korap:term",
-      "@value":"base:lediglich",
-      "relation":"="
-    }
-  },
-  "meta": [
-    {
-      "@type": "korap:meta-filter",
-      "@id": "korap-filter#id-1223232",
-      "@value": {
-        "@type": "korap:group",
-        "relation": "between",
-        "@field": "korap:field#pubDate",
-        "operands": [
-          {
-            "@type": "korap:date",
-            "@value": "2000-01-01"
-          },
-          {
-            "@type": "korap:date",
-            "@value": "2013-12-31"
-          }
-        ]
-      }
-    }
-  ]
-}
diff --git a/src/test/resources/queries/metaquery5.json b/src/test/resources/queries/metaquery5.json
deleted file mode 100644
index 5a0cf20..0000000
--- a/src/test/resources/queries/metaquery5.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "@context": {
-    "korap": "http://korap.ids-mannheim.de/ns/query",
-    "@language": "de",
-    "operands": {
-      "@id": "korap:operands",
-      "@container": "@list"
-    },
-    "relation": {
-      "@id": "korap:relation",
-      "@type": "korap:relation#types"
-    },
-    "class": {
-      "@id": "korap:class",
-      "@type": "xsd:integer"
-    },
-    "query": "korap:query",
-    "filter": "korap:filter",
-    "meta": "korap:meta"
-    },
-  "startPage" : 1,
-  "count" : 5,
-  "context" : {
-    "left" : [ "token", 3 ],
-    "right" : [ "char", 6 ]
-  },
-  "query":{
-    "@type":"korap:token",
-    "@value":{
-      "@type":"korap:term",
-      "@value":"base:lediglich",
-      "relation":"="
-    }
-  },
-  "meta": [
-    {
-      "@type": "korap:meta-filter",
-      "@id": "korap-filter#id-1223232",
-      "@value": {
-	"@type": "korap:group",
-	"relation": "and",
-	"operands": [
-	  {
-            "@type": "korap:group",
-            "relation": "between",
-            "@field": "korap:field#pubDate",
-            "operands": [
-              {
-		"@type": "korap:date",
-		"@value": "2000-01-01"
-              },
-              {
-		"@type": "korap:date",
-		"@value": "2013-12-31"
-              }
-            ]
-	  }
-	]
-      }
-    }
-  ]
-}
diff --git a/src/test/resources/queries/metaquery6.json b/src/test/resources/queries/metaquery6.json
deleted file mode 100644
index 5b80cf6..0000000
--- a/src/test/resources/queries/metaquery6.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "@context": {
-    "korap": "http://korap.ids-mannheim.de/ns/query",
-    "@language": "de",
-    "operands": {
-      "@id": "korap:operands",
-      "@container": "@list"
-    },
-    "relation": {
-      "@id": "korap:relation",
-      "@type": "korap:relation#types"
-    },
-    "class": {
-      "@id": "korap:class",
-      "@type": "xsd:integer"
-    },
-    "query": "korap:query",
-    "filter": "korap:filter",
-    "meta": "korap:meta"
-    },
-  "startPage" : 1,
-  "count" : 5,
-  "context" : {
-    "left" : [ "token", 3 ],
-    "right" : [ "char", 6 ]
-  },
-  "query":{
-    "@type":"korap:token",
-    "@value":{
-      "@type":"korap:term",
-      "@value":"base:lediglich",
-      "relation":"="
-    }
-  },
-  "meta": [
-    {
-      "@type": "korap:meta-filter",
-      "@id": "korap-filter#id-1223232",
-      "@value": {
-	"@type": "korap:group",
-	"relation": "and",
-	"operands": [
-	  {
-            "@type": "korap:group",
-            "relation": "between",
-            "@field": "korap:field#pubDate",
-            "operands": [
-              {
-		"@type": "korap:date",
-		"@value": "2005-01-01"
-              },
-              {
-		"@type": "korap:date",
-		"@value": "2013-12-31"
-              }
-            ]
-	  }
-	]
-      }
-    }
-  ]
-}