diff --git a/src/main/java/de/ids_mannheim/korap/query/serialize/MetaQueryBuilder.java b/src/main/java/de/ids_mannheim/korap/query/serialize/MetaQueryBuilder.java
index b9fe4cc..277e17d 100644
--- a/src/main/java/de/ids_mannheim/korap/query/serialize/MetaQueryBuilder.java
+++ b/src/main/java/de/ids_mannheim/korap/query/serialize/MetaQueryBuilder.java
@@ -18,7 +18,14 @@
     }
 
     public MetaQueryBuilder addContext(Integer left, String leftType,
-                                Integer right, String rightType) {
+                                       Integer right, String rightType) {
+        if (leftType.equalsIgnoreCase("sentence") | leftType.equalsIgnoreCase("paragraph")) {
+            addEntry("context", leftType);
+            return this;
+        } else if (rightType.equalsIgnoreCase("sentence") | rightType.equalsIgnoreCase("paragraph")) {
+            addEntry("context", rightType);
+            return this;
+        }
         Map map = new LinkedHashMap();
         List l = new LinkedList();
         List r = new LinkedList();
@@ -40,5 +47,4 @@
     public Map raw() {
         return meta;
     }
-
 }
