diff --git a/core/wiki/macros/toc.tid b/core/wiki/macros/toc.tid
index bd13d9f34..9f3824a62 100644
--- a/core/wiki/macros/toc.tid
+++ b/core/wiki/macros/toc.tid
@@ -7,9 +7,9 @@ tags: $:/tags/Macro
<$set name="toc-item-class" filter="""$itemClassFilter$""" value="toc-item-selected" emptyValue="toc-item">
>>
<$list filter="[all[current]toc-link[no]]" emptyMessage="<$link><$view field='caption'><$view field='title'/>$view>$link>">
-<$view field="caption">
+<$transclude field="caption">
<$view field="title"/>
-$view>
+$transclude>
$list>
<$list filter="""[all[current]] -[[$rootTag$]]""">
<$macrocall $name="toc-body" rootTag="""$rootTag$""" tag=<> sort="""$sort$""" itemClassFilter="""$itemClassFilter$"""/>
@@ -39,9 +39,9 @@ tags: $:/tags/Macro
{{$:/core/images/down-arrow}}
$button>
$reveal>
-<$view field="caption">
+<$transclude field="caption">
<$view field="title"/>
-$view>
+$transclude>
$link>
<$reveal type="match" state=<> text="open">
<$macrocall $name="toc-expandable" tag=<> sort="""$sort$""" itemClassFilter="""$itemClassFilter$"""/>
@@ -58,17 +58,17 @@ tags: $:/tags/Macro
<$reveal type="nomatch" state=<> text="open">
<$button set=<> setTo="open" class="tc-btn-invisible">
{{$:/core/images/right-arrow}}
-<$view field="caption">
+<$transclude field="caption">
<$view field="title"/>
-$view>
+$transclude>
$button>
$reveal>
<$reveal type="match" state=<> text="open">
<$button set=<> setTo="close" class="tc-btn-invisible">
{{$:/core/images/down-arrow}}
-<$view field="caption">
+<$transclude field="caption">
<$view field="title"/>
-$view>
+$transclude>
$button>
$reveal>
<$reveal type="match" state=<> text="open">
@@ -106,9 +106,9 @@ tags: $:/tags/Macro
$button>
$reveal>
$list>
-<$view field="caption">
+<$transclude field="caption">
<$view field="title"/>
-$view>
+$transclude>
$link>
<$reveal type="match" state=<> text="open">
<$macrocall $name="toc-selective-expandable" tag=<> sort="""$sort$""" itemClassFilter="""$itemClassFilter$"""/>
@@ -126,17 +126,17 @@ tags: $:/tags/Macro
<$reveal type="nomatch" state=<> text="open">
<$button set=<> setTo="open" class="tc-btn-invisible">
{{$:/core/images/right-arrow}}
-<$view field="caption">
+<$transclude field="caption">
<$view field="title"/>
-$view>
+$transclude>
$button>
$reveal>
<$reveal type="match" state=<> text="open">
<$button set=<> setTo="close" class="tc-btn-invisible">
{{$:/core/images/down-arrow}}
-<$view field="caption">
+<$transclude field="caption">
<$view field="title"/>
-$view>
+$transclude>
$button>
$reveal>
$list>
@@ -173,7 +173,7 @@ tags: $:/tags/Macro
<$reveal state="""$selectedTiddler$""" type="nomatch" text="">
<$transclude mode="block" tiddler="$template$">
-
<$view field="caption"><$view field="title"/>$view>
+<$transclude field="caption"><$view field="title"/>$transclude>
<$transclude mode="block">$missingText$$transclude>
$transclude>
$reveal>