diff --git a/lib/opcodes.py b/lib/opcodes.py
index dbcf8d73f40caef809ea8213ce1d150fcb3000c8..83eee25d710725d397df28a07d7a901ce4ca5ece 100644
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -650,8 +650,7 @@ class OpQuery(OpCode):
     _PQueryWhat,
     ("fields", ht.NoDefault, ht.TListOf(ht.TNonEmptyString),
      "Requested fields"),
-    ("filter", None, ht.TOr(ht.TNone,
-                            ht.TListOf(ht.TOr(ht.TNonEmptyString, ht.TList))),
+    ("filter", None, ht.TOr(ht.TNone, ht.TListOf),
      "Query filter"),
     ]