diff --git a/queries/javascript/context.scm b/queries/javascript/context.scm
index 0b220705..02391d0f 100644
--- a/queries/javascript/context.scm
+++ b/queries/javascript/context.scm
@@ -9,6 +9,7 @@
   (else_clause)
   (expression_statement)
   (for_statement)
+  (for_in_statement)
   (function_declaration)
   (generator_function_declaration)
   (jsx_element)
diff --git a/queries/tsx/context.scm b/queries/tsx/context.scm
index 0e2ec56d..6fab5590 100644
--- a/queries/tsx/context.scm
+++ b/queries/tsx/context.scm
@@ -8,6 +8,7 @@
   (else_clause)
   (expression_statement)
   (for_statement)
+  (for_in_statement)
   (interface_declaration)
   (jsx_element)
   (jsx_self_closing_element)
@@ -16,6 +17,8 @@
   (object)
   (pair)
   (while_statement)
+  (switch_statement)
+  (switch_case)
 ] @context)
 
 (arrow_function
diff --git a/queries/typescript/context.scm b/queries/typescript/context.scm
index fbe1fc11..16d470bc 100644
--- a/queries/typescript/context.scm
+++ b/queries/typescript/context.scm
@@ -8,12 +8,15 @@
   (else_clause)
   (expression_statement)
   (for_statement)
+  (for_in_statement)
   (interface_declaration)
   (lexical_declaration)
   (method_definition)
   (object)
   (pair)
   (while_statement)
+  (switch_statement)
+  (switch_case)
 ] @context)
 
 (arrow_function