diff --git a/netmap/parser/Query.g4 b/netmap/parser/Query.g4
index 0a5b314..cbdc2bc 100644
--- a/netmap/parser/Query.g4
+++ b/netmap/parser/Query.g4
@@ -19,10 +19,10 @@ repStmt:
 cbfStmt: CBF BackupFactor = NUMBER1; // container backup factor
 
 selectStmt:
-    SELECT Count = NUMBER1       // number of nodes to select without container backup factor *)
-    (IN clause? Bucket = ident)? // bucket name
-    FROM Filter = identWC        // filter reference or whole netmap
-    (AS Name = ident)?           // optional selector name
+    SELECT Count = NUMBER1           // number of nodes to select without container backup factor *)
+    (IN clause? Bucket = filterKey)? // bucket name
+    FROM Filter = identWC            // filter reference or whole netmap
+    (AS Name = ident)?               // optional selector name
     ;
 
 clause: CLAUSE_SAME | CLAUSE_DISTINCT; // nodes from distinct buckets