8 files changed, 18 insertions, 4 deletions
diff --git a/queries/c/folds.scm b/queries/c/folds.scm
index 2e2a6b4d0..bb26a62eb 100644
--- a/queries/c/folds.scm
+++ b/queries/c/folds.scm
@@ -16,6 +16,7 @@
   (preproc_function_def)
   (initializer_list)
   (gnu_asm_expression)
+  (preproc_include)+
 ] @fold
 
 (compound_statement
diff --git a/queries/c_sharp/folds.scm b/queries/c_sharp/folds.scm
index bdd7b6551..80ae4e44b 100644
--- a/queries/c_sharp/folds.scm
+++ b/queries/c_sharp/folds.scm
@@ -8,4 +8,7 @@ accessors: (accessor_list) @fold
 
 initializer: (initializer_expression) @fold
 
-(block) @fold
+[
+  (block)
+  (using_directive)+
+] @fold
diff --git a/queries/css/folds.scm b/queries/css/folds.scm
index 2c244d63f..dc3c14df9 100644
--- a/queries/css/folds.scm
+++ b/queries/css/folds.scm
@@ -1 +1,4 @@
-(rule_set) @fold
+[
+  (rule_set)
+  (import_statement)+
+] @fold
diff --git a/queries/ecma/folds.scm b/queries/ecma/folds.scm
index ef1bda52f..0d4124a70 100644
--- a/queries/ecma/folds.scm
+++ b/queries/ecma/folds.scm
@@ -13,7 +13,7 @@
   (switch_statement)
   (switch_case)
   (switch_default)
-  (import_statement)
+  (import_statement)+
   (if_statement)
   (try_statement)
   (catch_clause)
diff --git a/queries/haskell/folds.scm b/queries/haskell/folds.scm
index a1af2a169..5bb256563 100644
--- a/queries/haskell/folds.scm
+++ b/queries/haskell/folds.scm
@@ -2,4 +2,5 @@
   (exp_apply)
   (exp_do)
   (function)
+  (import)+
 ] @fold
diff --git a/queries/java/folds.scm b/queries/java/folds.scm
index b0cdead4b..2cc143a78 100644
--- a/queries/java/folds.scm
+++ b/queries/java/folds.scm
@@ -4,4 +4,5 @@
   (constructor_declaration)
   (argument_list)
   (annotation_argument_list)
+  (import_declaration)+
 ] @fold
diff --git a/queries/python/folds.scm b/queries/python/folds.scm
index 7c547db38..ecb9352d7 100644
--- a/queries/python/folds.scm
+++ b/queries/python/folds.scm
@@ -21,3 +21,8 @@
   (dictionary)
   (string)
 ] @fold
+
+[
+  (import_statement)
+  (import_from_statement)
+]+ @fold
diff --git a/queries/rust/folds.scm b/queries/rust/folds.scm
index 4c8c61f28..e5721c021 100644
--- a/queries/rust/folds.scm
+++ b/queries/rust/folds.scm
@@ -9,7 +9,7 @@
   (type_item)
   (union_item)
   (const_item)
-  (use_declaration)
+  (use_declaration)+
   (let_declaration)
   (loop_expression)
   (for_expression)