diff --git a/src/main/java/de/ids_mannheim/korap/query/serialize/CosmasTree.java b/src/main/java/de/ids_mannheim/korap/query/serialize/CosmasTree.java
index 3aa9322..2fa9763 100644
--- a/src/main/java/de/ids_mannheim/korap/query/serialize/CosmasTree.java
+++ b/src/main/java/de/ids_mannheim/korap/query/serialize/CosmasTree.java
@@ -216,7 +216,6 @@
                 fieldMap.put("caseInsensitive", true);
             }
 
-            attr = ResourceMapper.descriptor2policy(attr);
             fieldMap.put("key", value);
             fieldMap.put("layer", attr);
 
@@ -249,7 +248,7 @@
 
             fieldMap.put("key", pos);
 
-            fieldMap.put("layer", ResourceMapper.descriptor2policy("pos"));
+            fieldMap.put("layer", "pos");
             // make category-specific fieldMap entry
             // negate field (see above)
             if (negate) {
diff --git a/src/main/java/de/ids_mannheim/korap/query/serialize/PoliqarpPlusTree.java b/src/main/java/de/ids_mannheim/korap/query/serialize/PoliqarpPlusTree.java
index eef19e4..6f7b25a 100644
--- a/src/main/java/de/ids_mannheim/korap/query/serialize/PoliqarpPlusTree.java
+++ b/src/main/java/de/ids_mannheim/korap/query/serialize/PoliqarpPlusTree.java
@@ -2,7 +2,6 @@
 
 import de.ids_mannheim.korap.query.PoliqarpPlusLexer;
 import de.ids_mannheim.korap.query.PoliqarpPlusParser;
-import de.ids_mannheim.korap.query.serialize.util.ResourceMapper;
 import de.ids_mannheim.korap.util.QueryException;
 import org.antlr.v4.runtime.*;
 import org.antlr.v4.runtime.tree.ParseTree;
@@ -482,8 +481,6 @@
 
             if (layer.equals("base")) layer = "lemma";
 
-            // fixme: injected layer mapping:
-            layer = ResourceMapper.descriptor2policy(layer);
 
             fieldMap.put("layer", layer);
             if (foundry != null) fieldMap.put("foundry", foundry);