diff --git a/queries/dart/textobjects.scm b/queries/dart/textobjects.scm
index 2a479a2..6b8c93b 100644
--- a/queries/dart/textobjects.scm
+++ b/queries/dart/textobjects.scm
@@ -1,6 +1,6 @@
 ; class
 ((
-  [(marker_annotation)? (annotation)?] @class.outer.start .
+  (annotation)? @class.outer.start .
   (class_definition 
     body: (class_body)  @class.outer._end @class.inner)  @class.outer._start
  )
@@ -13,7 +13,7 @@
 
 ; function/method
 (( 
-  [(marker_annotation)? (annotation)?] @function.outer.start .
+  (annotation)? @function.outer.start .
   [(method_signature) (function_signature)]  @function.outer._start .
   (function_body)  @function.outer._end
  )
diff --git a/queries/fish/textobjects.scm b/queries/fish/textobjects.scm
index 525ae35..40c59be 100644
--- a/queries/fish/textobjects.scm
+++ b/queries/fish/textobjects.scm
@@ -1,4 +1,10 @@
-(function_definition) @function.outer
+;; assignment
+(command
+  name: (word) @_command
+  argument: (word) @_varname @assignment.lhs @assignment.inner
+  argument: (_)* @assignment.rhs
+  (#not-lua-match? @_varname "[-].*")
+  (#eq? @_command "set")) @assignment.outer
 
 (command
   name: (word) @_name
diff --git a/queries/hlsl/textobjects.scm b/queries/hlsl/textobjects.scm
new file mode 100644
index 0000000..cef8a66
--- /dev/null
+++ b/queries/hlsl/textobjects.scm
@@ -0,0 +1,2 @@
+; inherits: cpp
+