diff --git a/queries/dtd/injections.scm b/queries/dtd/injections.scm
index ed5557a05..57fae5832 100644
--- a/queries/dtd/injections.scm
+++ b/queries/dtd/injections.scm
@@ -1 +1,2 @@
-(Comment) @comment
+((Comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/glimmer_javascript/injections.scm b/queries/glimmer_javascript/injections.scm
index 38cf529b7..174372a48 100644
--- a/queries/glimmer_javascript/injections.scm
+++ b/queries/glimmer_javascript/injections.scm
@@ -1,13 +1,5 @@
 ; inherits: ecma
 
-; Parse Ember/Glimmer/Handlebars/HTMLBars/etc. template literals
-; e.g.: await render(hbs`<SomeComponent />`)
-(call_expression
-  function: ((identifier) @_name
-    (#eq? @_name "hbs"))
-  arguments: ((template_string) @glimmer
-    (#offset! @glimmer 0 1 0 -1)))
-
 ; Ember Unified <template> syntax
 ; e.g.: <template><SomeComponent @arg={{double @value}} /></template>
 ((glimmer_template) @injection.content
diff --git a/queries/glimmer_typescript/injections.scm b/queries/glimmer_typescript/injections.scm
index 487d69734..4c79d635a 100644
--- a/queries/glimmer_typescript/injections.scm
+++ b/queries/glimmer_typescript/injections.scm
@@ -1,13 +1,5 @@
 ; inherits: typescript
 
-; Parse Ember/Glimmer/Handlebars/HTMLBars/etc. template literals
-; e.g.: await render(hbs`<SomeComponent />`)
-(call_expression
-  function: ((identifier) @_name
-    (#eq? @_name "hbs"))
-  arguments: ((template_string) @glimmer
-    (#offset! @glimmer 0 1 0 -1)))
-
 ; Ember Unified <template> syntax
 ; e.g.: <template><SomeComponent @arg={{double @value}} /></template>
 ((glimmer_template) @injection.content
diff --git a/queries/razor/injections.scm b/queries/razor/injections.scm
index fe28d8611..f73839bd6 100644
--- a/queries/razor/injections.scm
+++ b/queries/razor/injections.scm
@@ -3,7 +3,7 @@
 ([
   (html_comment)
   (razor_comment)
-] @comment
+] @injection.content
   (#set! injection.language "comment"))
 
 ((element) @injection.content
diff --git a/queries/tablegen/injections.scm b/queries/tablegen/injections.scm
index 08390aaa1..99f7919b6 100644
--- a/queries/tablegen/injections.scm
+++ b/queries/tablegen/injections.scm
@@ -6,4 +6,4 @@
   (comment) @injection.content)
   (#lua-match? @injection.content "^.*RUN")
   (#set! injection.language "bash")
-  (#offset! @injection.content 0 8))
+  (#offset! @injection.content 0 8 0 0))
diff --git a/queries/teal/injections.scm b/queries/teal/injections.scm
index 830b745ba..decb4831c 100644
--- a/queries/teal/injections.scm
+++ b/queries/teal/injections.scm
@@ -34,7 +34,7 @@
 ((function_call
   (method_index
     (parenthesized_expression
-      (string) @printf)
+      (string) @injection.content)
     key: (identifier) @_func))
   (#eq? @_func "format")
   (#set! injection.language "printf"))