diff --git a/runtime/queries/ecma/context.scm b/runtime/queries/ecma/context.scm
index aedc23229961..c4bb59989483 100644
--- a/runtime/queries/ecma/context.scm
+++ b/runtime/queries/ecma/context.scm
@@ -10,6 +10,10 @@
 	(formal_parameters) @context.params
 ) @context
 
+(generator_function_declaration
+	(formal_parameters) @context.params
+) @context
+
 [
 	(call_expression)
 	(class_declaration)
@@ -21,5 +25,7 @@
   (object)
   (pair)
   (while_statement)
+	(switch_statement)
+	(switch_case)
 ] @context