diff --git a/examples/bsp1.json b/examples/bsp1.json
deleted file mode 100644
index 0a085ff..0000000
--- a/examples/bsp1.json
+++ /dev/null
@@ -1 +0,0 @@
-{"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":"Der","layer":"orth","match":"match:eq"}},{"@type":"korap:token","wrap":{"@type":"korap:term","key":"Mann","layer":"orth","match":"match:eq"}}]}}
\ No newline at end of file
diff --git a/examples/bsp2.json b/examples/bsp2.json
deleted file mode 100644
index 78a60d8..0000000
--- a/examples/bsp2.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-   "context":"http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
-   "query":{
-      "@type":"korap:group",
-      "operation":"operation:sequence",
-      "inOrder":true,
-      "distances":[
-         {
-            "@type":"korap:distance",
-            "key":"w",
-            "min":1,
-            "max":3
-         }
-      ],
-      "operands":[
-         {
-            "@type":"korap:token",
-            "wrap":{
-               "@type":"korap:term",
-               "key":"Der",
-               "layer":"orth",
-               "match":"match:eq"
-            }
-         },
-         {
-            "@type":"korap:token",
-            "wrap":{
-               "@type":"korap:term",
-               "key":"Mann",
-               "layer":"orth",
-               "match":"match:eq"
-            }
-         }
-      ]
-   }
-}
\ No newline at end of file
diff --git a/examples/bsp3.json b/examples/bsp3.json
deleted file mode 100644
index 760a75a..0000000
--- a/examples/bsp3.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-   "context":"http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
-   "query":{
-      "@type":"korap:group",
-      "operation":"operation:sequence",
-      "inOrder":true,
-      "distances":[
-         {
-            "@type":"korap:group",
-            "operation":"operation:and",
-            "operands":[
-               {
-                  "@type":"korap:distance",
-                  "key":"w",
-                  "min":1,
-                  "max":3
-               },
-               {
-                  "@type":"korap:distance",
-                  "key":"s",
-                  "min":1,
-                  "max":1
-               }
-            ]
-         }
-      ],
-      "operands":[
-         {
-            "@type":"korap:token",
-            "wrap":{
-               "@type":"korap:term",
-               "key":"Der",
-               "layer":"orth",
-               "match":"match:eq"
-            }
-         },
-         {
-            "@type":"korap:token",
-            "wrap":{
-               "@type":"korap:term",
-               "key":"Mann",
-               "layer":"orth",
-               "match":"match:eq"
-            }
-         }
-      ]
-   }
-}
\ No newline at end of file
diff --git a/examples/bsp4.json b/examples/bsp4.json
deleted file mode 100644
index 4eb25c8..0000000
--- a/examples/bsp4.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-   "context":"http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
-   "query":{
-      "@type":"korap:group",
-      "operation":"operation:sequence",
-      "inOrder":true,
-      "distances":[
-         {
-            "@type":"korap:distance",
-            "key":"w",
-            "min":0,
-            "max":5
-         }
-      ],
-      "operands":[
-         {
-            "@type":"korap:group",
-            "operation":"operation:sequence",
-            "inOrder":true,
-            "distances":[
-               {
-                  "@type":"korap:group",
-                  "operation":"operation:and",
-                  "operands":[
-                     {
-                        "@type":"korap:distance",
-                        "key":"w",
-                        "min":1,
-                        "max":3
-                     },
-                     {
-                        "@type":"korap:distance",
-                        "key":"s",
-                        "min":1,
-                        "max":1
-                     }
-                  ]
-               }
-            ],
-            "operands":[
-               {
-                  "@type":"korap:token",
-                  "wrap":{
-                     "@type":"korap:term",
-                     "key":"Der",
-                     "layer":"orth",
-                     "match":"match:eq"
-                  }
-               },
-               {
-                  "@type":"korap:token",
-                  "wrap":{
-                     "@type":"korap:term",
-                     "key":"Mann",
-                     "layer":"orth",
-                     "match":"match:eq"
-                  }
-               }
-            ]
-         },
-         {
-            "@type":"korap:token",
-            "wrap":{
-               "@type":"korap:term",
-               "key":"geht",
-               "layer":"orth",
-               "match":"match:eq"
-            }
-         }
-      ]
-   }
-}
\ No newline at end of file
diff --git a/examples/bsp5.json b/examples/bsp5.json
deleted file mode 100644
index 8e156cf..0000000
--- a/examples/bsp5.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-   "context":"http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
-   "query":{
-      "@type":"korap:group",
-      "operation":"operation:sequence",
-      "inOrder":true,
-      "distances":[
-         {
-            "@type":"korap:distance",
-            "key":"w",
-            "min":0,
-            "max":5
-         }
-      ],
-      "operands":[
-         {
-            "@type":"korap:token",
-            "wrap":{
-               "@type":"korap:term",
-               "key":"geht",
-               "layer":"orth",
-               "match":"match:eq"
-            }
-         },
-         {
-            "@type":"korap:group",
-            "operation":"operation:sequence",
-            "inOrder":true,
-            "distances":[
-               {
-                  "@type":"korap:group",
-                  "operation":"operation:and",
-                  "operands":[
-                     {
-                        "@type":"korap:distance",
-                        "key":"w",
-                        "min":1,
-                        "max":3
-                     },
-                     {
-                        "@type":"korap:distance",
-                        "key":"s",
-                        "min":1,
-                        "max":1
-                     }
-                  ]
-               }
-            ],
-            "operands":[
-               {
-                  "@type":"korap:token",
-                  "wrap":{
-                     "@type":"korap:term",
-                     "key":"Der",
-                     "layer":"orth",
-                     "match":"match:eq"
-                  }
-               },
-               {
-                  "@type":"korap:token",
-                  "wrap":{
-                     "@type":"korap:term",
-                     "key":"Mann",
-                     "layer":"orth",
-                     "match":"match:eq"
-                  }
-               }
-            ]
-         }
-      ]
-   }
-}
\ No newline at end of file
diff --git a/examples/bsp6.json b/examples/bsp6.json
deleted file mode 100644
index a1741e9..0000000
--- a/examples/bsp6.json
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-   "context":"http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
-   "query":{
-      "@type":"korap:group",
-      "operation":"operation:sequence",
-      "inOrder":true,
-      "distances":[
-         {
-            "@type":"korap:distance",
-            "key":"w",
-            "min":0,
-            "max":5
-         }
-      ],
-      "operands":[
-         {
-            "@type":"korap:group",
-            "operation":"operation:sequence",
-            "inOrder":true,
-            "distances":[
-               {
-                  "@type":"korap:group",
-                  "operation":"operation:and",
-                  "operands":[
-                     {
-                        "@type":"korap:distance",
-                        "key":"w",
-                        "min":1,
-                        "max":3
-                     },
-                     {
-                        "@type":"korap:distance",
-                        "key":"s",
-                        "min":1,
-                        "max":1
-                     }
-                  ]
-               }
-            ],
-            "operands":[
-               {
-                  "@type":"korap:token",
-                  "wrap":{
-                     "@type":"korap:term",
-                     "key":"Der",
-                     "layer":"orth",
-                     "match":"match:eq"
-                  }
-               },
-               {
-                  "@type":"korap:token",
-                  "wrap":{
-                     "@type":"korap:term",
-                     "key":"Mann",
-                     "layer":"orth",
-                     "match":"match:eq"
-                  }
-               }
-            ]
-         },
-         {
-            "@type":"korap:group",
-            "operation":"operation:sequence",
-            "operands":[
-               {
-                  "@type":"korap:token",
-                  "wrap":{
-                     "@type":"korap:term",
-                     "key":"geht",
-                     "layer":"orth",
-                     "match":"match:eq"
-                  }
-               },
-               {
-                  "@type":"korap:token",
-                  "wrap":{
-                     "@type":"korap:term",
-                     "key":"weg",
-                     "layer":"orth",
-                     "match":"match:eq"
-                  }
-               }
-            ]
-         }
-      ]
-   }
-}
\ No newline at end of file
diff --git a/examples/cosmas2_1.json b/examples/cosmas2_1.json
deleted file mode 100644
index 42cf066..0000000
--- a/examples/cosmas2_1.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
-  "query" : {
-    "@type" : "korap:token",
-    "wrap" : {
-      "@type" : "korap:term",
-      "key" : "Buch",
-      "layer" : "orth",
-      "match" : "match:eq"
-    }
-  }
-}
\ No newline at end of file
diff --git a/examples/cosmas2_10.json b/examples/cosmas2_10.json
deleted file mode 100644
index ae4dd0a..0000000
--- a/examples/cosmas2_10.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "@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",
-        "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"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/examples/cosmas2_11.json b/examples/cosmas2_11.json
deleted file mode 100644
index 43d37d1..0000000
--- a/examples/cosmas2_11.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "@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",
-        "match" : "match:eq"
-      }
-    }, {
-      "@type" : "korap:token",
-      "wrap" : {
-        "@type" : "korap:term",
-        "key" : "deutsch",
-        "layer" : "lemma",
-        "match" : "match:eq"
-      }
-    }, {
-      "@type" : "korap:token",
-      "wrap" : {
-        "@type" : "korap:term",
-        "key" : "Sprache",
-        "layer" : "orth",
-        "match" : "match:eq"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/examples/cosmas2_12.json b/examples/cosmas2_12.json
deleted file mode 100644
index 4031774..0000000
--- a/examples/cosmas2_12.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
-  "query" : {
-    "@type" : "korap:group",
-    "operation" : "operation:sequence",
-    "inOrder" : true,
-    "distances" : [ {
-      "@type" : "korap:distance",
-      "key" : "w",
-      "min" : 0,
-      "max" : 2
-    } ],
-    "operands" : [ {
-      "@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",
-          "match" : "match:eq"
-        }
-      } ]
-    }, {
-      "@type" : "korap:token",
-      "wrap" : {
-        "@type" : "korap:term",
-        "key" : "Sprache",
-        "layer" : "orth",
-        "match" : "match:eq"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/examples/cosmas2_13.json b/examples/cosmas2_13.json
deleted file mode 100644
index 52bf24a..0000000
--- a/examples/cosmas2_13.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
-  "query" : {
-    "@type" : "korap:group",
-    "operation" : "operation:sequence",
-    "inOrder" : true,
-    "distances" : [ {
-      "@type" : "korap:distance",
-      "key" : "w",
-      "min" : 0,
-      "max" : 1,
-      "exclude" : true
-    } ],
-    "operands" : [ {
-      "@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",
-          "match" : "match:eq"
-        }
-      } ]
-    }, {
-      "@type" : "korap:group",
-      "operation" : "operation:sequence",
-      "operands" : [ {
-        "@type" : "korap:token",
-        "wrap" : {
-          "@type" : "korap:term",
-          "key" : "deutsche",
-          "layer" : "orth",
-          "match" : "match:eq"
-        }
-      }, {
-        "@type" : "korap:token",
-        "wrap" : {
-          "@type" : "korap:term",
-          "key" : "Sprache",
-          "layer" : "orth",
-          "match" : "match:eq"
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/examples/cosmas2_14.json b/examples/cosmas2_14.json
deleted file mode 100644
index bb80964..0000000
--- a/examples/cosmas2_14.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "@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",
-        "match" : "match:eq"
-      }
-    }, {
-      "@type" : "korap:token",
-      "wrap" : {
-        "@type" : "korap:term",
-        "key" : "A",
-        "layer" : "pos",
-        "match" : "match:eq"
-      }
-    }, {
-      "@type" : "korap:token",
-      "wrap" : {
-        "@type" : "korap:term",
-        "key" : "Sprache",
-        "layer" : "orth",
-        "match" : "match:eq"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/examples/cosmas2_15.json b/examples/cosmas2_15.json
deleted file mode 100644
index 1980eba..0000000
--- a/examples/cosmas2_15.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
-  "query" : {
-    "@type" : "korap:group",
-    "operation" : "operation:submatch",
-    "classRef" : [ 1 ],
-    "operands" : [ {
-      "@type" : "korap:group",
-      "operation" : "operation:position",
-      "frame" : "frame:startswith",
-      "operands" : [ {
-        "@type" : "korap:span",
-        "key" : "s"
-      }, {
-        "@type" : "korap:group",
-        "operation" : "operation:class",
-        "class" : 1,
-        "operands" : [ {
-          "@type" : "korap:token",
-          "wrap" : {
-            "@type" : "korap:term",
-            "key" : "wegen",
-            "layer" : "orth",
-            "match" : "match:eq"
-          }
-        } ]
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/examples/cosmas2_16.json b/examples/cosmas2_16.json
deleted file mode 100644
index 15303f4..0000000
--- a/examples/cosmas2_16.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
-  "query" : {
-    "@type" : "korap:group",
-    "operation" : "operation:submatch",
-    "classRef" : [ 1 ],
-    "operands" : [ {
-      "@type" : "korap:group",
-      "operation" : "operation:position",
-      "frame" : "frame:startswith",
-      "operands" : [ {
-        "@type" : "korap:span",
-        "key" : "s"
-      }, {
-        "@type" : "korap:group",
-        "operation" : "operation:class",
-        "class" : 1,
-        "operands" : [ {
-          "@type" : "korap:token",
-          "wrap" : {
-            "@type" : "korap:term",
-            "caseInsensitive" : true,
-            "key" : "wegen",
-            "layer" : "orth",
-            "match" : "match:eq"
-          }
-        } ]
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/examples/cosmas2_17.json b/examples/cosmas2_17.json
deleted file mode 100644
index 15303f4..0000000
--- a/examples/cosmas2_17.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
-  "query" : {
-    "@type" : "korap:group",
-    "operation" : "operation:submatch",
-    "classRef" : [ 1 ],
-    "operands" : [ {
-      "@type" : "korap:group",
-      "operation" : "operation:position",
-      "frame" : "frame:startswith",
-      "operands" : [ {
-        "@type" : "korap:span",
-        "key" : "s"
-      }, {
-        "@type" : "korap:group",
-        "operation" : "operation:class",
-        "class" : 1,
-        "operands" : [ {
-          "@type" : "korap:token",
-          "wrap" : {
-            "@type" : "korap:term",
-            "caseInsensitive" : true,
-            "key" : "wegen",
-            "layer" : "orth",
-            "match" : "match:eq"
-          }
-        } ]
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/examples/cosmas2_18.json b/examples/cosmas2_18.json
deleted file mode 100644
index 944a465..0000000
--- a/examples/cosmas2_18.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
-  "query" : {
-    "@type" : "korap:group",
-    "operation" : "operation:submatch",
-    "spanRef" : [ 0, 1 ],
-    "operands" : [ {
-      "@type" : "korap:span",
-      "key" : "s"
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/examples/cosmas2_19.json b/examples/cosmas2_19.json
deleted file mode 100644
index 3f8fc30..0000000
--- a/examples/cosmas2_19.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
-  "query" : {
-    "@type" : "korap:group",
-    "operation" : "operation:submatch",
-    "classRef" : [ 1 ],
-    "operands" : [ {
-      "@type" : "korap:group",
-      "operation" : "operation:position",
-      "frame" : "frame:startswith",
-      "operands" : [ {
-        "@type" : "korap:span",
-        "key" : "s"
-      }, {
-        "@type" : "korap:group",
-        "operation" : "operation:class",
-        "class" : 1,
-        "operands" : [ {
-          "@type" : "korap:token",
-          "wrap" : {
-            "@type" : "korap:term",
-            "key" : "V",
-            "layer" : "pos",
-            "match" : "match:eq"
-          }
-        } ]
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/examples/cosmas2_2.json b/examples/cosmas2_2.json
deleted file mode 100644
index b8d6267..0000000
--- a/examples/cosmas2_2.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "@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" : "das",
-        "layer" : "orth",
-        "match" : "match:eq"
-      }
-    }, {
-      "@type" : "korap:token",
-      "wrap" : {
-        "@type" : "korap:term",
-        "key" : "Buch",
-        "layer" : "orth",
-        "match" : "match:eq"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/examples/cosmas2_20.json b/examples/cosmas2_20.json
deleted file mode 100644
index 991689f..0000000
--- a/examples/cosmas2_20.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
-  "query" : {
-    "@type" : "korap:group",
-    "operation" : "operation:submatch",
-    "classRef" : [ 1 ],
-    "operands" : [ {
-      "@type" : "korap:group",
-      "operation" : "operation:position",
-      "frame" : "frame:endswith",
-      "operands" : [ {
-        "@type" : "korap:span",
-        "key" : "s"
-      }, {
-        "@type" : "korap:group",
-        "operation" : "operation:class",
-        "class" : 1,
-        "operands" : [ {
-          "@type" : "korap:token",
-          "wrap" : {
-            "@type" : "korap:term",
-            "key" : "V",
-            "layer" : "pos",
-            "match" : "match:eq"
-          }
-        } ]
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/examples/cosmas2_3.json b/examples/cosmas2_3.json
deleted file mode 100644
index f43b829..0000000
--- a/examples/cosmas2_3.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
-  "query" : {
-    "@type" : "korap:group",
-    "operation" : "operation:sequence",
-    "inOrder" : true,
-    "distances" : [ {
-      "@type" : "korap:distance",
-      "key" : "w",
-      "min" : 1,
-      "max" : 3
-    } ],
-    "operands" : [ {
-      "@type" : "korap:token",
-      "wrap" : {
-        "@type" : "korap:term",
-        "key" : "das",
-        "layer" : "orth",
-        "match" : "match:eq"
-      }
-    }, {
-      "@type" : "korap:token",
-      "wrap" : {
-        "@type" : "korap:term",
-        "key" : "Buch",
-        "layer" : "orth",
-        "match" : "match:eq"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/examples/cosmas2_4.json b/examples/cosmas2_4.json
deleted file mode 100644
index 9e010c5..0000000
--- a/examples/cosmas2_4.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
-  "query" : {
-    "@type" : "korap:group",
-    "operation" : "operation:sequence",
-    "inOrder" : true,
-    "distances" : [ {
-      "@type" : "korap:distance",
-      "key" : "w",
-      "min" : 1,
-      "max" : 3
-    }, {
-      "@type" : "korap:distance",
-      "key" : "s",
-      "min" : 0,
-      "max" : 1
-    } ],
-    "operands" : [ {
-      "@type" : "korap:token",
-      "wrap" : {
-        "@type" : "korap:term",
-        "key" : "das",
-        "layer" : "orth",
-        "match" : "match:eq"
-      }
-    }, {
-      "@type" : "korap:token",
-      "wrap" : {
-        "@type" : "korap:term",
-        "key" : "Buch",
-        "layer" : "orth",
-        "match" : "match:eq"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/examples/cosmas2_5.json b/examples/cosmas2_5.json
deleted file mode 100644
index a96845d..0000000
--- a/examples/cosmas2_5.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
-  "query" : {
-    "@type" : "korap:group",
-    "operation" : "operation:sequence",
-    "inOrder" : true,
-    "distances" : [ {
-      "@type" : "korap:distance",
-      "key" : "w",
-      "min" : 0,
-      "max" : 5
-    } ],
-    "operands" : [ {
-      "@type" : "korap:group",
-      "operation" : "operation:sequence",
-      "inOrder" : true,
-      "distances" : [ {
-        "@type" : "korap:distance",
-        "key" : "w",
-        "min" : 1,
-        "max" : 3
-      }, {
-        "@type" : "korap:distance",
-        "key" : "s",
-        "min" : 0,
-        "max" : 1
-      } ],
-      "operands" : [ {
-        "@type" : "korap:token",
-        "wrap" : {
-          "@type" : "korap:term",
-          "key" : "das",
-          "layer" : "orth",
-          "match" : "match:eq"
-        }
-      }, {
-        "@type" : "korap:token",
-        "wrap" : {
-          "@type" : "korap:term",
-          "key" : "Buch",
-          "layer" : "orth",
-          "match" : "match:eq"
-        }
-      } ]
-    }, {
-      "@type" : "korap:token",
-      "wrap" : {
-        "@type" : "korap:term",
-        "key" : "Tisch",
-        "layer" : "orth",
-        "match" : "match:eq"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/examples/cosmas2_6.json b/examples/cosmas2_6.json
deleted file mode 100644
index 06a9726..0000000
--- a/examples/cosmas2_6.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
-  "query" : {
-    "@type" : "korap:group",
-    "operation" : "operation:sequence",
-    "inOrder" : true,
-    "distances" : [ {
-      "@type" : "korap:distance",
-      "key" : "w",
-      "min" : 0,
-      "max" : 5
-    } ],
-    "operands" : [ {
-      "@type" : "korap:token",
-      "wrap" : {
-        "@type" : "korap:term",
-        "key" : "Tisch",
-        "layer" : "orth",
-        "match" : "match:eq"
-      }
-    }, {
-      "@type" : "korap:group",
-      "operation" : "operation:sequence",
-      "inOrder" : true,
-      "distances" : [ {
-        "@type" : "korap:distance",
-        "key" : "w",
-        "min" : 1,
-        "max" : 3
-      }, {
-        "@type" : "korap:distance",
-        "key" : "s",
-        "min" : 0,
-        "max" : 1
-      } ],
-      "operands" : [ {
-        "@type" : "korap:token",
-        "wrap" : {
-          "@type" : "korap:term",
-          "key" : "das",
-          "layer" : "orth",
-          "match" : "match:eq"
-        }
-      }, {
-        "@type" : "korap:token",
-        "wrap" : {
-          "@type" : "korap:term",
-          "key" : "Buch",
-          "layer" : "orth",
-          "match" : "match:eq"
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/examples/cosmas2_7.json b/examples/cosmas2_7.json
deleted file mode 100644
index f4b8f2a..0000000
--- a/examples/cosmas2_7.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
-  "query" : {
-    "@type" : "korap:group",
-    "operation" : "operation:sequence",
-    "inOrder" : true,
-    "distances" : [ {
-      "@type" : "korap:distance",
-      "key" : "w",
-      "min" : 0,
-      "max" : 5
-    } ],
-    "operands" : [ {
-      "@type" : "korap:group",
-      "operation" : "operation:sequence",
-      "inOrder" : true,
-      "distances" : [ {
-        "@type" : "korap:distance",
-        "key" : "w",
-        "min" : 1,
-        "max" : 3
-      }, {
-        "@type" : "korap:distance",
-        "key" : "s",
-        "min" : 0,
-        "max" : 1
-      } ],
-      "operands" : [ {
-        "@type" : "korap:token",
-        "wrap" : {
-          "@type" : "korap:term",
-          "key" : "das",
-          "layer" : "orth",
-          "match" : "match:eq"
-        }
-      }, {
-        "@type" : "korap:token",
-        "wrap" : {
-          "@type" : "korap:term",
-          "key" : "Buch",
-          "layer" : "orth",
-          "match" : "match:eq"
-        }
-      } ]
-    }, {
-      "@type" : "korap:group",
-      "operation" : "operation:sequence",
-      "operands" : [ {
-        "@type" : "korap:token",
-        "wrap" : {
-          "@type" : "korap:term",
-          "key" : "auf",
-          "layer" : "orth",
-          "match" : "match:eq"
-        }
-      }, {
-        "@type" : "korap:token",
-        "wrap" : {
-          "@type" : "korap:term",
-          "key" : "dem",
-          "layer" : "orth",
-          "match" : "match:eq"
-        }
-      }, {
-        "@type" : "korap:token",
-        "wrap" : {
-          "@type" : "korap:term",
-          "key" : "Tisch",
-          "layer" : "orth",
-          "match" : "match:eq"
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/examples/cosmas2_8.json b/examples/cosmas2_8.json
deleted file mode 100644
index c9d2f85..0000000
--- a/examples/cosmas2_8.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "@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",
-        "match" : "match:eq"
-      }
-    }, {
-      "@type" : "korap:token",
-      "wrap" : {
-        "@type" : "korap:term",
-        "key" : "Deutsche",
-        "layer" : "orth",
-        "match" : "match:eq"
-      }
-    }, {
-      "@type" : "korap:token",
-      "wrap" : {
-        "@type" : "korap:term",
-        "key" : "Sprache",
-        "layer" : "orth",
-        "match" : "match:eq"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/examples/cosmas2_9.json b/examples/cosmas2_9.json
deleted file mode 100644
index b42eefc..0000000
--- a/examples/cosmas2_9.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "@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",
-        "match" : "match:eq"
-      }
-    }, {
-      "@type" : "korap:token",
-      "wrap" : {
-        "@type" : "korap:term",
-        "key" : "deutsche",
-        "layer" : "orth",
-        "match" : "match:eq"
-      }
-    }, {
-      "@type" : "korap:token",
-      "wrap" : {
-        "@type" : "korap:term",
-        "key" : "Sprache",
-        "layer" : "orth",
-        "match" : "match:eq"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/examples/examples.txt b/examples/examples.txt
deleted file mode 100644
index f9987d6..0000000
--- a/examples/examples.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-bsp1.json: "Der Mann"
-bsp2.json: "Der /+w1:3 Mann"
-bsp3.json: "Der /+w1:3,s1 Mann"
-bsp4.json: "(Der /+w1:3,s1 Mann) /+w5 geht"
-bsp5.json: "(Der /+w1:3,s1 Mann) /-w5 geht"
-bsp6.json: "(Der /+w1:3,s1 Mann) /+w5 (geht weg)"
-
-cosmas1.json:  "Buch"
-cosmas2.json:  "das Buch"						// to demonstrate token sequences
-cosmas3.json:  "das /+w1:3 Buch"				// word-distance constraint
-cosmas4.json:  "das /+w1:3,s1 Buch"  			// combined word-distance and sent-distance constraint
-cosmas5.json:  "(das /+w1:3,s1 Buch) /+w5 Tisch"	// complex distance constraint on sequences
-cosmas6.json:  "(das /+w1:3,s1 Buch) /-w5 Tisch"    // negative distance -> precedence
-cosmas7.json:  "(das /+w1:3,s1 Buch) /+w5 (auf dem Tisch)"
-cosmas8.json:  "Institut für Deutsche Sprache"	// spelling variations: deutsche/Deutsche
-cosmas9.json:  "Institut für deutsche Sprache"  
-cosmas10.json: "Institut für $deutsche Sprache" // finds both
-cosmas11.json: "Institut für &deutsch Sprache"  // finds both if base form (lemma) is annotated
-cosmas12.json: "Institut für /+w2 Sprache"  	// finds institutes for any language
-cosmas13.json: "Institut für %+w1 deutsche Sprach e"  // finds institutes for anything
-cosmas14.json: "Institut für MORPH(A) Sprache"	// finds institutes for any language
-cosmas15.json: "wegen #IN(L) <s>"				// finds 'wegen' at beginning of sentence
-cosmas16.json: "$wegen #IN(L) <s>"				// finds 'wegen' at beginning of sentence, also when capitalised
-cosmas17.json: "#BED($wegen , +sa)"				// equivalent to above
-cosmas18.json: "#BEG(#ELEM(S))" 				// finds every sentence-initial word
-cosmas19.json: "MORPH(V) #IN(L) #ELEM(S)"  		// e.g. questions
-cosmas20.json: "MORPH(V) #IN(R) #ELEM(S)"  		// e.g. subordinate clauses
\ No newline at end of file
diff --git a/korap-style.xml b/korap-style.xml
deleted file mode 100644
index a02ad23..0000000
--- a/korap-style.xml
+++ /dev/null
@@ -1,896 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<profiles version="12">
-  <profile kind="CodeFormatterProfile" name="korap" version="1">
-    <setting
-	id="org.eclipse.jdt.core.compiler.source"
-	value="1.7"/>
-    <setting
-	id="org.eclipse.jdt.core.compiler.compliance"
-	value="1.7"/>
-    <setting
-	id="org.eclipse.jdt.core.compiler.codegen.targetPlatform"
-	value="1.7"/>
-    
-    <!-- Global rules -->
-    <setting
-	id="org.eclipse.jdt.core.formatter.indentation.size"
-	value="4"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations"
-	value="false"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.tabulation.char"
-	value="space"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.continuation_indentation"
-	value="2"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.lineSplit"
-	value="80"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body"
-	value="true"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.tabulation.size"
-	value="4"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.indent_empty_lines"
-	value="false"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve"
-	value="1"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.comment.line_length"
-	value="70"/><!-- This differs from the default -->
-    <setting
-	id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header"
-	value="true"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header"
-	value="true"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block"
-	value="true"/>
-
-    <!-- Spaces around parens -->
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration"
-	value="insert"/><!-- This differs from default -->
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block"
-	value="do not insert"/><!-- This differs from default -->
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch"
-	value="insert"/>
-
-    <!-- Spaces around commas -->
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters"
-	value="do not insert"/>
-
-    <!-- Spaces around semicolons -->
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for"
-	value="insert"/>
-
-    <!-- Spaces around colons -->
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for"
-	value="insert"/><!-- This differs from default -->
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert"
-	value="insert"/>
-
-
-    <!-- Unary operators -->
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator"
-	value="do not insert"/>
-
-    <!-- Binary operators -->
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator"
-	value="true"/>
-
-    <!-- Annotation blocks -->
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation"
-	value="0"/>
-
-    <!-- Blank lines -->
-    <setting
-	id="org.eclipse.jdt.core.formatter.blank_lines_before_field"
-	value="0"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.blank_lines_after_package"
-	value="1"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk"
-	value="1"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.blank_lines_before_package"
-	value="0"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type"
-	value="1"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment"
-	value="false"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration"
-	value="0"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.blank_lines_before_method"
-	value="1"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body"
-	value="0"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations"
-	value="1"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.blank_lines_before_imports"
-	value="1"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment"
-	value="false"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups"
-	value="1"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.blank_lines_after_imports"
-	value="1"/>
-
-    <!-- New lines -->
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries"
-	value="true"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries"
-	value="true"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement"
-	value="insert"/><!-- This differs from default -->
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement"
-	value="insert"/><!-- This differs from default -->
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement"
-	value="insert"/><!-- This differs from default -->
-    <setting
-	id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_new_line_after_label"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body"
-	value="do not insert"/><!-- This differs from default -->
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing"
-	value="do not insert"/><!-- doesn't seem to work -->
-    <setting
-	id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line"
-	value="false"/><!-- This differs from the default -->
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package"
-	value="insert"/>
-
-    <!-- switch/case blocks -->
-    <setting
-	id="org.eclipse.jdt.core.formatter.brace_position_for_switch"
-	value="end_of_line"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch"
-	value="true"/><!-- This differs from default -->
-    <setting
-	id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case"
-	value="end_of_line"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases"
-	value="true"/>
-
-    <!-- Conditional blocks -->
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional"
-	value="insert"/>
-
-    <!-- Comment blocks -->
-    <setting
-	id="org.eclipse.jdt.core.formatter.comment.format_line_comments"
-	value="true"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description"
-	value="true"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments"
-	value="false"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.comment.indent_root_tags"
-	value="true"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments"
-	value="true"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.join_lines_in_comments"
-	value="true"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.comment.format_html"
-	value="true"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.comment.format_source_code"
-	value="true"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.comment.format_header"
-	value="false"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.comment.format_block_comments"
-	value="true"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column"
-	value="false"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column"
-	value="false"/>
-
-    <!-- if/else blocks -->
-    <setting
-	id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line"
-	value="false"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.compact_else_if"
-	value="true"/>
-
-    <!-- try/catch/finally blocks -->
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch"
-	value="do not insert"/>
-
-    <!-- No opinion/idea here -->
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.disabling_tag"
-	value="@formatter:off"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration"
-	value="end_of_line"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.use_on_off_tags"
-	value="false"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases"
-	value="true"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer"
-	value="16"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression"
-	value="80"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer"
-	value="end_of_line"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation"
-	value="16"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.join_wrapped_lines"
-	value="true"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call"
-	value="16"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.align_type_members_on_columns"
-	value="false"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation"
-	value="16"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.enabling_tag"
-	value="@formatter:on"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration"
-	value="16"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.alignment_for_assignment"
-	value="0"/>
-    <setting
-	id="org.eclipse.jdt.core.compiler.problem.assertIdentifier"
-	value="error"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested"
-	value="true"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line"
-	value="false"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration"
-	value="16"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration"
-	value="end_of_line"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration"
-	value="0"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.compiler.problem.enumIdentifier"
-	value="error"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.brace_position_for_block"
-	value="end_of_line"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration"
-	value="end_of_line"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch"
-	value="true"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column"
-	value="true"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant"
-	value="end_of_line"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch"
-	value="16"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration"
-	value="16"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression"
-	value="16"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer"
-	value="2"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression"
-	value="16"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line"
-	value="false"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line"
-	value="false"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration"
-	value="16"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression"
-	value="16"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration"
-	value="end_of_line"/>
-    <setting
-	id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode"
-	value="enabled"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant"
-	value="16"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration"
-	value="end_of_line"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration"
-	value="16"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.alignment_for_compact_if"
-	value="16"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter"
-	value="insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration"
-	value="16"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator"
-	value="do not insert"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration"
-	value="16"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try"
-	value="80"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants"
-	value="0"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header"
-	value="true"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields"
-	value="16"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration"
-	value="end_of_line"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header"
-	value="true"/>
-    <setting
-	id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line"
-	value="false"/>
-  </profile>
-</profiles>
diff --git a/notes.txt b/notes.txt
deleted file mode 100644
index 56ad883..0000000
--- a/notes.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-COSMAS:
- - disjunctions with more than 2 arguments are parsed as nested by ANTLR grammar:
-   "A oder B oder C" becomes (simplified) "A|(B|C)" 
- - using stacks proves to be a good choice for tree processing
- - queries of form "A B C" where A, B, C are terms of type <R> (see http://www.ids-mannheim.de/cosmas2/win-app/hilfe/suchanfrage/eingabe-grafisch/syntax/ARGUMENT_R.html)
-   are strictly speaking not well-formed since there is no linking operator between the individual terms. The Cosmas II web app offers two alternatives of how to interpret
-   such lacking operators: as a logical OR or as a /+w1 distance operator. In KorAP, the second alternative will be chose as this appears to be more intuitive (effectively,
-   the query expresses a sequence of terms) and more in line with other QLs (e.g. Poliqarp)
- - distance operators allow to specify a minimal and maximal distance between their arguments, in the form "/wn:m" where n and m are integers. In case only one number
-   is given (like "/w2"), Cosmas II interprets this as the maximal distance. Note that it is not possible to specify a minimal but possibly infinite distance between to
-   tokens - for obvious reasons.
- - distance operator: flip arguments and change 'minus' to 'plus' 
- - operands of distance operators to be expressed via shrink/classes?
- - #BEG() and #END() are solved via shrink, with the shrink argument not being a class but a position (first/last) indicating the first or last word in the matched sequence  
- - #BED() with two conditions (like 'sa,-pa') can't be mapped to position group as implemented -> make two position groups and embed in 'and'-group
- 
- 
- Poliqarp
- - empty tokens as distance operators
- 
\ No newline at end of file
diff --git a/src/main/java/de/ids_mannheim/korap/query/serialize/AnnisQueryProcessor.java b/src/main/java/de/ids_mannheim/korap/query/serialize/AnnisQueryProcessor.java
index a1c75ac..7815edd 100644
--- a/src/main/java/de/ids_mannheim/korap/query/serialize/AnnisQueryProcessor.java
+++ b/src/main/java/de/ids_mannheim/korap/query/serialize/AnnisQueryProcessor.java
@@ -342,7 +342,6 @@
 
         if (node.getChildCount() == 3) {  			// (foundry/)?layer=key specification
             if (object.get("@type").equals("korap:token")) {
-                @SuppressWarnings("unchecked")
                 HashMap<String, Object> term = (HashMap<String, Object>) object.get("wrap");
                 term.putAll(parseTextSpec(node.getChild(2)));
                 term.put("match", parseMatchOperator(getFirstChildWithCat(node, "eqOperator")));
@@ -818,9 +817,9 @@
      */
     private String parseMatchOperator(ParseTree node) {
         if (node.getChildCount()>0) {
-            return node.getChild(0).toStringTree(parser).equals("=") ? "match:eq" : "match:ne";
+            return node.getChild(0).getText().equals("=") ? "match:eq" : "match:ne";
         }
-        return null;
+        return "match:eq";
     }
 
     private LinkedHashMap<String, Object> parseQNameNode(ParseTree node) {
diff --git a/src/main/java/de/ids_mannheim/korap/query/serialize/QuerySerializer.java b/src/main/java/de/ids_mannheim/korap/query/serialize/QuerySerializer.java
index b0af534..c5fa7a8 100644
--- a/src/main/java/de/ids_mannheim/korap/query/serialize/QuerySerializer.java
+++ b/src/main/java/de/ids_mannheim/korap/query/serialize/QuerySerializer.java
@@ -4,8 +4,11 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+
 import de.ids_mannheim.korap.query.serialize.util.KoralObjectGenerator;
 import de.ids_mannheim.korap.query.serialize.util.StatusCodes;
+
+import org.apache.log4j.BasicConfigurator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -48,23 +51,26 @@
         /*
          * just for testing...
          */
+        BasicConfigurator.configure();
         QuerySerializer jg = new QuerySerializer();
         int i = 0;
         String[] queries;
-        if (args.length == 0) {
+        String ql = "poliqarpplus";
+        if (args.length < 2) {
             queries = new String[] {
-                    "tok=\"corpus\" & tok=\"query\" & tok=\"language\"& #2 . #3 & #1 . #2 "
+//                    "tok=\"corpus\" & tok=\"query\" & tok=\"language\"& #2 . #3 & #1 . #2 "
+                    "[] Mann"
 
             };
         }
-        else
+        else {
             queries = new String[] { args[0] };
-
+            ql  = args[1];
+        }
         for (String q : queries) {
             i++;
             try {
                 System.out.println(q);
-                String ql = "cosmas2";
                 jg.run(q, ql);
                 System.out.println();
             }
diff --git a/src/test/java/de/ids_mannheim/korap/query/serialize/AnnisQueryProcessorTest.java b/src/test/java/de/ids_mannheim/korap/query/serialize/AnnisQueryProcessorTest.java
index b14b9a9..627bfa7 100644
--- a/src/test/java/de/ids_mannheim/korap/query/serialize/AnnisQueryProcessorTest.java
+++ b/src/test/java/de/ids_mannheim/korap/query/serialize/AnnisQueryProcessorTest.java
@@ -883,6 +883,7 @@
         assertEquals("cnx",             res.at("/query/foundry").asText());
         assertEquals("c",               res.at("/query/layer").asText());
         assertEquals("NP",              res.at("/query/key").asText());
+        assertEquals("match:eq",        res.at("/query/match").asText());
         assertEquals("korap:term",      res.at("/query/attr/@type").asText());
         assertEquals(true,              res.at("/query/attr/root").asBoolean());