diff --git a/runtime/queries/lua/highlights.scm b/runtime/queries/lua/highlights.scm
index 0c8f07f290..01c280f2d5 100644
--- a/runtime/queries/lua/highlights.scm
+++ b/runtime/queries/lua/highlights.scm
@@ -162,7 +162,7 @@
 
 ; Tables
 (field
-  name: (identifier) @variable.member)
+  name: (identifier) @property)
 
 (dot_index_expression
   field: (identifier) @variable.member)
diff --git a/runtime/queries/markdown/highlights.scm b/runtime/queries/markdown/highlights.scm
index 4b445e02f3..a9ce4df200 100644
--- a/runtime/queries/markdown/highlights.scm
+++ b/runtime/queries/markdown/highlights.scm
@@ -8,28 +8,22 @@
   (setext_h2_underline) @markup.heading.2)
 
 (atx_heading
-  (atx_h1_marker) @markup.heading.1
-  (inline) @markup.heading.1)
+  (atx_h1_marker)) @markup.heading.1
 
 (atx_heading
-  (atx_h2_marker) @markup.heading.2
-  (inline) @markup.heading.2)
+  (atx_h2_marker)) @markup.heading.2
 
 (atx_heading
-  (atx_h3_marker) @markup.heading.3
-  (inline) @markup.heading.3)
+  (atx_h3_marker)) @markup.heading.3
 
 (atx_heading
-  (atx_h4_marker) @markup.heading.4
-  (inline) @markup.heading.4)
+  (atx_h4_marker)) @markup.heading.4
 
 (atx_heading
-  (atx_h5_marker) @markup.heading.5
-  (inline) @markup.heading.5)
+  (atx_h5_marker)) @markup.heading.5
 
 (atx_heading
-  (atx_h6_marker) @markup.heading.6
-  (inline) @markup.heading.6)
+  (atx_h6_marker)) @markup.heading.6
 
 (info_string) @label
 
diff --git a/runtime/queries/markdown_inline/highlights.scm b/runtime/queries/markdown_inline/highlights.scm
index 233ab411cd..ac99cce5fc 100644
--- a/runtime/queries/markdown_inline/highlights.scm
+++ b/runtime/queries/markdown_inline/highlights.scm
@@ -85,12 +85,22 @@
 [
   (link_destination)
   (uri_autolink)
+  (email_autolink)
 ] @markup.link.url @nospell
 
+((link_destination) @_url
+  (#set! @_url "url" @_url))
+
+((uri_autolink) @_url
+  (#offset! @_url 0 1 0 -1)
+  (#set! @_url "url" @_url))
+
+(entity_reference) @nospell
+
 ; Replace common HTML entities.
 ((entity_reference) @character.special
   (#eq? @character.special " ")
-  (#set! conceal ""))
+  (#set! conceal " "))
 
 ((entity_reference) @character.special
   (#eq? @character.special "<")
diff --git a/test/functional/treesitter/highlight_spec.lua b/test/functional/treesitter/highlight_spec.lua
index 3774ff8d54..b0ac180738 100644
--- a/test/functional/treesitter/highlight_spec.lua
+++ b/test/functional/treesitter/highlight_spec.lua
@@ -1052,10 +1052,15 @@ describe('treesitter highlighting (markdown)', function()
     insert(string.format('[This link text](%s) is a hyperlink.', url))
     screen:add_extra_attr_ids({
       [100] = { foreground = Screen.colors.DarkCyan, url = 'https://example.com' },
+      [101] = {
+        foreground = Screen.colors.SlateBlue,
+        url = 'https://example.com',
+        underline = true,
+      },
     })
     screen:expect({
       grid = [[
-        {25:[}{100:This link text}{25:](}{28:https://example.com}{25:)} is|
+        {25:[}{100:This link text}{25:](}{101:https://example.com}{25:)} is|
          a hyperlink^.                           |
         {1:~                                       }|*3
                                                 |