diff --git a/queries/highlights.scm b/queries/highlights.scm
index 220cdf5..a2a7556 100644
--- a/queries/highlights.scm
+++ b/queries/highlights.scm
@@ -11,12 +11,14 @@
   (end_paired_statement)
 ] @tag
 
-"end" @keyword.return
+[
+ "end"
+ (tag_name) 
+] @function
 
 (variable_name) @variable
 (filter_name) @method
 (filter_argument) @parameter
-(tag_name) @function
 (keyword) @keyword
 (operator) @operator
 (keyword_operator) @keyword.operator