diff --git a/queries/fennel/context.scm b/queries/fennel/context.scm
index 1164231b..964ff2e5 100644
--- a/queries/fennel/context.scm
+++ b/queries/fennel/context.scm
@@ -1,6 +1,21 @@
 [
+  (quote_reader_macro)
+  (quasi_quote_reader_macro)
+  (quote_form)
   (fn_form)
   (lambda_form)
-  (hashfn_form)
-  (table)
+  (macro_form)
+  (case_form)
+  (match_form)
+  (case_try_form)
+  (match_try_form)
 ] @context
+
+(list
+  call: (symbol) @_sym
+  (#eq? @_sym "when")) @context
+
+(hashfn_reader_macro
+  expression: (list
+    call: (symbol) @_sym
+    (#eq? @_sym "do"))) @context