diff --git a/include/mrdocs/Metadata/Info.hpp b/include/mrdocs/Metadata/Info.hpp
index 6988f78c7..c69315794 100644
--- a/include/mrdocs/Metadata/Info.hpp
+++ b/include/mrdocs/Metadata/Info.hpp
@@ -341,10 +341,6 @@ tag_invoke(
     if (I.Parent)
     {
         io.map("parent", I.Parent);
-        io.defer("parents", [&]
-        {
-            return getParents(*domCorpus, I);
-        });
     }
     if (I.javadoc)
     {
diff --git a/share/mrdocs/addons/generator/adoc/partials/symbol.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/symbol.adoc.hbs
index 8f65231a4..7c3fd37bf 100644
--- a/share/mrdocs/addons/generator/adoc/partials/symbol.adoc.hbs
+++ b/share/mrdocs/addons/generator/adoc/partials/symbol.adoc.hbs
@@ -14,7 +14,7 @@
 {{#unless @root.config.multipage }}
 {{! Single page documentation: symbol is not available to the wrapper but it's available here }}
 {{! Include the symbol title at a higher level }}
-{{#> markup/h level=1 id=symbol.anchor }}{{> symbol/qualified-name symbol }}{{/markup/h}}
+{{#> markup/h level=1 id=symbol.anchor }}{{> symbol/qualified-name-title symbol }}{{/markup/h}}
 {{/unless}}
 {{! Brief }}
 {{#if symbol.doc.brief}}
@@ -83,7 +83,7 @@
 | Description
 {{#each symbol.friends }}
 {{#if symbol}}
-| {{#>markup/code}}{{> symbol/name symbol link=symbol }}{{/markup/code}}
+| {{#>markup/code}}{{> symbol/qualified-name symbol }}{{/markup/code}}
 | {{> javadoc/inline-brief symbol.doc.brief }}
 {{else}}
 | {{#>markup/code}}{{> type/declarator type }}{{/markup/code}}
diff --git a/share/mrdocs/addons/generator/common/partials/symbol/detail/members-table-row.hbs b/share/mrdocs/addons/generator/common/partials/symbol/detail/members-table-row.hbs
index ef1a6f970..f8ba6854b 100644
--- a/share/mrdocs/addons/generator/common/partials/symbol/detail/members-table-row.hbs
+++ b/share/mrdocs/addons/generator/common/partials/symbol/detail/members-table-row.hbs
@@ -8,7 +8,7 @@
 {{~> symbol/name-info . nolink=true~}}
 {{~/if~}}
 {{~else~}}
-{{~#>markup/a href=url}}{{#>markup/code}}{{>symbol/name . nolink=true}}{{/markup/code}}{{/markup/a}} {{>symbol/special-function-suffix .~}}
+{{~#>markup/a href=url}}{{#>markup/code}}{{>symbol/name-text .}}{{/markup/code}}{{/markup/a}} {{>symbol/special-function-suffix .~}}
 {{~/if~}}
 {{~/markup/td}}
 {{#if includeBrief~}}
diff --git a/share/mrdocs/addons/generator/common/partials/symbol/name-text.hbs b/share/mrdocs/addons/generator/common/partials/symbol/name-text.hbs
new file mode 100644
index 000000000..40692c363
--- /dev/null
+++ b/share/mrdocs/addons/generator/common/partials/symbol/name-text.hbs
@@ -0,0 +1,37 @@
+{{!--
+    Renders the symbol name in an appropriate format for section titles.
+
+    This is typically a linked name, but it can also be a special name like
+    "see-below" or "implementation-defined".
+
+    Expected Context: {Symbol Object}
+
+    Optional parameters:
+        nolink: If true, types and symbols will not be linked.
+        link: Symbol that should be linked to, regardless of the original symbol.
+
+    Example:
+        {{> declarator symbol }}
+
+    See: https://mrdocs.com/docs/mrdocs/develop/generators.html#dom_reference
+--}}
+{{~#if (and (eq kind "function") (eq functionClass "conversion"))~}}
+    {{! Conversion operator: "operator" and the type declarator ~}}
+    operator {{>type/declarator return nolink=true~}}
+{{~else if (eq kind "guide")~}}
+    {{! Deduction guide: "deduced" type declarator ~}}
+    {{>type/declarator deduced nolink=true~}}
+{{~else~}}
+    {{! Symbol with URL: link to the symbol documentation ~}}
+    {{~#if name~}}
+        {{~name~}}
+    {{~else if parent ~}}
+        Unnamed {{or tag kind~}}
+    {{~else ~}}
+        Global namespace
+    {{~/if~}}
+    {{~#if (contains (arr "explicit" "partial") template.kind)~}}
+        {{! Explicit or partial template: render the template arguments ~}}
+        {{>template/args args=template.args nolink=true~}}
+    {{~/if~}}
+{{~/if~}}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/common/partials/symbol/name.hbs b/share/mrdocs/addons/generator/common/partials/symbol/name.hbs
index 82b9cac1a..c3a1e6660 100644
--- a/share/mrdocs/addons/generator/common/partials/symbol/name.hbs
+++ b/share/mrdocs/addons/generator/common/partials/symbol/name.hbs
@@ -8,29 +8,20 @@
 
     Optional parameters:
         nolink: If true, types and symbols will not be linked.
-        link: Symbol that should be linked to, regardless of the original symbol.
 
     Example:
         {{> declarator symbol }}
 
     See: https://mrdocs.com/docs/mrdocs/develop/generators.html#dom_reference
 --}}
-{{#if (and (eq kind "function") (eq functionClass "conversion"))~}}
+{{~#if (and (eq kind "function") (eq functionClass "conversion"))~}}
     {{! Conversion operator: "operator" and the type declarator ~}}
-    operator {{>type/declarator return nolink=nolink~}}
-{{else if (eq kind "guide")~}}
+    operator {{>type/declarator return nolink=false~}}
+{{~else if (eq kind "guide")~}}
     {{! Deduction guide: "deduced" type declarator ~}}
-    {{>type/declarator deduced nolink=nolink~}}
-{{else~}}
-    {{#if (and link.url (not nolink))~}}
-        {{! Symbol with URL: link to the symbol documentation ~}}
-        {{#>markup/a href=link.url}}{{or name "<unnamed>"}}{{/markup/a~}}
-    {{else~}}
-        {{! Symbol without URL: plain text ~}}
-        {{or name "<unnamed>"~}}
-    {{/if~}}
-    {{#if (contains (arr "explicit" "partial") template.kind)~}}
-        {{! Explicit or partial template: render the template arguments ~}}
-        {{>template/args args=template.args nolink=nolink~}}
-    {{/if~}}
-{{/if}}
\ No newline at end of file
+    {{>type/declarator deduced nolink=false~}}
+{{~else if (and url (not nolink))~}}
+    {{#>markup/a href=url}}{{>symbol/name-text}}{{/markup/a~}}
+{{~else~}}
+    {{~>symbol/name-text~}}
+{{~/if~}}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/common/partials/symbol/qualified-name-text.hbs b/share/mrdocs/addons/generator/common/partials/symbol/qualified-name-text.hbs
new file mode 100644
index 000000000..fc6617182
--- /dev/null
+++ b/share/mrdocs/addons/generator/common/partials/symbol/qualified-name-text.hbs
@@ -0,0 +1,18 @@
+{{!--
+    Renders the qualified symbol name as text only
+
+    This partial renders the qualified symbol name as text only.
+
+    Expected Context: {Symbol Object}
+
+    Example:
+        {{> symbol/qualified-name symbol }}
+
+    See: https://mrdocs.com/docs/mrdocs/develop/generators.html#dom_reference
+--}}
+{{~#if (and parent parent.parent)~}}
+{{~> symbol/qualified-name-text parent ~}}::
+{{~/if~}}
+{{~#if name ~}}
+{{~> symbol/name-text . ~}}
+{{~/if~}}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/common/partials/symbol/qualified-name-title.hbs b/share/mrdocs/addons/generator/common/partials/symbol/qualified-name-title.hbs
new file mode 100644
index 000000000..5aa4bfad9
--- /dev/null
+++ b/share/mrdocs/addons/generator/common/partials/symbol/qualified-name-title.hbs
@@ -0,0 +1,41 @@
+{{!--
+    Renders the qualified symbol in the format used in titles
+
+    Titles use a format where all parent namespaces are linked to their documentation.
+    A parent is included only if it has a name. Unnamed namespaces are not included.
+
+    In general, the last symbol name is then appended to the linked namespaces without
+    any link because it represents the current symbol. However, there are some
+    exceptions to that:
+
+    - If the symbol is a conversion operator, the conversion type is linked.
+    - If the symbol is a template specialization, the primary template is linked
+      and the links to the arguments are appended to the name.
+    - In other cases, the symbol name text is used without any links.
+
+    Expected Context: {Symbol Object}
+
+    Example:
+        {{> symbol/title-qualified-name symbol }}
+
+    See: https://mrdocs.com/docs/mrdocs/develop/generators.html#dom_reference
+--}}
+{{~#if (and parent parent.parent)~}}
+{{~> symbol/qualified-name-title parent is-qualified-name-parent=true ~}}{{#if parent.name }}::{{/if}}
+{{~/if~}}
+{{~#if (and (eq kind "function") (eq functionClass "conversion"))~}}
+    {{~> symbol/name . ~}}
+{{~else if is-qualified-name-parent ~}}
+    {{!~ If this is a parent, we only print it if it really has a name ~}}
+    {{~#if name ~}}
+        {{~> symbol/name . ~}}
+    {{~/if~}}
+{{~else if (eq kind "guide")~}}
+    {{>type/declarator deduced nolink=false~}}
+{{~else if (contains (arr "explicit" "partial") template.kind)~}}
+    {{!~ If the last part is a template specialization, we include links to primary template and the arguments. ~}}
+    {{!~ If the primary template wasn't correctly extracted for some reason, we just print the name as usual. ~}}
+    {{#if template.primary }}{{~>symbol/name template.primary ~}}{{else}}{{ name }}{{/if}}{{>template/args args=template.args nolink=false~}}
+{{~else~}}
+    {{~> symbol/name-text . ~}}
+{{~/if~}}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/common/partials/symbol/qualified-name.hbs b/share/mrdocs/addons/generator/common/partials/symbol/qualified-name.hbs
index 7e8499aa9..273da92d3 100644
--- a/share/mrdocs/addons/generator/common/partials/symbol/qualified-name.hbs
+++ b/share/mrdocs/addons/generator/common/partials/symbol/qualified-name.hbs
@@ -1,14 +1,8 @@
 {{!--
-    Renders the qualified symbol name in an appropriate format for section titles.
+    Renders the qualified symbol with a link to the symbol's documentation.
 
-    This partial renders the symbol name in a format where all parent namespaces
-    are linked to their documentation. The symbol name is then appended to the
-    linked namespaces.
-
-    It also includes exceptions for unnamed symbols and friend declarations.
-    Unnamed symbols need to be handled differently as they have no name to display.
-    Friend declarations need to be handled differently as they are not part of the
-    symbol hierarchy and need to be linked to the befriended symbol or type.
+    This partial renders the symbol name in a format where the whole qualified name
+    is linked to the documentation of the main symbol.
 
     Expected Context: {Symbol Object}
 
@@ -17,31 +11,8 @@
 
     See: https://mrdocs.com/docs/mrdocs/develop/generators.html#dom_reference
 --}}
-{{! We remove whitespace between all tag so the result is in a single line ~}}
-{{~#if (ne kind "friend")~}}
-    {{~#if name~}}
-        {{! General case: linked parent symbols followed by the symbol name ~}}
-        {{#each parents~}}
-            {{#if name~}}
-                {{>symbol/name . link=. nolink=../nolink}}::
-            {{~/if}}
-        {{~/each}}{{>symbol/name .}}
-    {{~else~}}
-        {{! Unnamed symbol: use the symbol type in the title ~}}
-        {{~#if parent~}}
-            {{! Symbol with no name but with a parent ~}}
-            Unnamed
-        {{~else~}}
-            {{! Symbol with no name and no parent: Global symbol ~}}
-            Global
-        {{~/if}} {{or tag kind~}}
-    {{~/if~}}
+{{~#if (and url (not nolink))~}}
+{{#>markup/a href=url}}{{>symbol/qualified-name-text}}{{/markup/a~}}
 {{~else~}}
-    {{~#if symbol~}}
-        {{! Friend symbol: use the befriended symbol ~}}
-        {{>symbol/qualified-name symbol nolink=nolink ~}}
-    {{~else~}}
-        {{! Friend type: use the type name ~}}
-        {{~>type/declarator type ~}}
-    {{~/if~}}
+{{~>symbol/qualified-name-text~}}
 {{~/if~}}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/common/partials/symbol/qualified-names.hbs b/share/mrdocs/addons/generator/common/partials/symbol/qualified-names.hbs
new file mode 100644
index 000000000..4914ed4e7
--- /dev/null
+++ b/share/mrdocs/addons/generator/common/partials/symbol/qualified-names.hbs
@@ -0,0 +1,18 @@
+{{!--
+    Renders the qualified symbol name with a link to each component
+
+    This partial renders the symbol name in a format where each component
+    is linked to their documentation.
+
+    Expected Context: {Symbol Object}
+
+    Example:
+        {{> symbol/qualified-name symbol }}
+
+    See: https://mrdocs.com/docs/mrdocs/develop/generators.html#dom_reference
+--}}
+{{! We remove whitespace between all tag so the result is in a single line ~}}
+{{~#if (and parent parent.parent)~}}
+{{~> symbol/qualified-names parent ~}}::
+{{~/if~}}
+{{~> symbol/name . ~}}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/common/partials/symbol/signature.hbs b/share/mrdocs/addons/generator/common/partials/symbol/signature.hbs
index 226239421..9d06caa9a 100644
--- a/share/mrdocs/addons/generator/common/partials/symbol/signature.hbs
+++ b/share/mrdocs/addons/generator/common/partials/symbol/signature.hbs
@@ -11,4 +11,4 @@
 
     See: https://mrdocs.com/docs/mrdocs/develop/generators.html#dom_reference
 --}}
-{{> (concat 'symbol/signature/' kind) }}
\ No newline at end of file
+{{> (concat 'symbol/signature/' kind) nolink=nolink }}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/common/partials/symbol/signature/concept.hbs b/share/mrdocs/addons/generator/common/partials/symbol/signature/concept.hbs
index ae55eb0c2..b3cd811ed 100644
--- a/share/mrdocs/addons/generator/common/partials/symbol/signature/concept.hbs
+++ b/share/mrdocs/addons/generator/common/partials/symbol/signature/concept.hbs
@@ -1,3 +1,3 @@
 {{>template/head template}}
 
-concept {{>symbol/name symbol}} = {{constraint}};
\ No newline at end of file
+concept {{>symbol/name-text symbol}} = {{constraint}};
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/common/partials/symbol/signature/enum.hbs b/share/mrdocs/addons/generator/common/partials/symbol/signature/enum.hbs
index 202010d35..548d50c00 100644
--- a/share/mrdocs/addons/generator/common/partials/symbol/signature/enum.hbs
+++ b/share/mrdocs/addons/generator/common/partials/symbol/signature/enum.hbs
@@ -1,2 +1,2 @@
-enum {{#if isScoped}}class {{/if}}{{>symbol/name .~}}
+enum {{#if isScoped}}class {{/if}}{{>symbol/name-text .~}}
 {{#if type}} : {{>type/declarator type}}{{/if}};
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/common/partials/symbol/signature/function.hbs b/share/mrdocs/addons/generator/common/partials/symbol/signature/function.hbs
index 130a8b58d..5d8857b38 100644
--- a/share/mrdocs/addons/generator/common/partials/symbol/signature/function.hbs
+++ b/share/mrdocs/addons/generator/common/partials/symbol/signature/function.hbs
@@ -14,7 +14,15 @@
 {{/if~}}
 {{#if (eq functionClass "normal")}}{{>type/declarator-prefix return}}
 {{/if~}}
-{{>symbol/name symbol link=(select link link template.primary)}}
+{{~#if force-link~}}
+{{>symbol/name symbol }}
+{{~else if (eq functionClass "conversion")~}}
+{{>symbol/name symbol }}
+{{~else if (contains (arr "explicit" "partial") template.kind)~}}
+{{>symbol/name template.primary ~}}{{>template/args args=template.args nolink=true~}}
+{{~else~}}
+{{>symbol/name-text symbol }}
+{{~/if~}}
 ({{#if isExplicitObjectMemberFunction}}this {{/if}}{{#each params}}{{#unless (and @first @last)}}
     {{/unless}}{{>type/declarator type decl-name=name~}}
     {{#if default}} = {{default}}{{/if~}}
diff --git a/share/mrdocs/addons/generator/common/partials/symbol/signature/record.hbs b/share/mrdocs/addons/generator/common/partials/symbol/signature/record.hbs
index 0afb25ed2..f1a1ceefd 100644
--- a/share/mrdocs/addons/generator/common/partials/symbol/signature/record.hbs
+++ b/share/mrdocs/addons/generator/common/partials/symbol/signature/record.hbs
@@ -1,6 +1,11 @@
 {{#if template}}{{>template/head template}}
 {{/if~}}
-{{#if isFriend}}friend {{/if}}{{tag}} {{>symbol/name symbol link=(select link link template.primary)~}}
+{{#if isFriend}}friend {{/if~}}
+{{~tag}} {{#if (contains (arr "explicit" "partial") template.kind)~}}
+    {{>symbol/name template.primary ~}}{{>template/args args=template.args nolink=nolink~}}
+{{~else~}}
+    {{>symbol/name-text symbol ~}}
+{{~/if}}
 {{#unless bases~}}
 {{else if isFriend~}}
 {{else}}
diff --git a/share/mrdocs/addons/generator/common/partials/symbol/signature/variable.hbs b/share/mrdocs/addons/generator/common/partials/symbol/signature/variable.hbs
index a055a959a..06b2837a2 100644
--- a/share/mrdocs/addons/generator/common/partials/symbol/signature/variable.hbs
+++ b/share/mrdocs/addons/generator/common/partials/symbol/signature/variable.hbs
@@ -10,7 +10,7 @@
 {{/if~}}
 {{#if isThreadLocal}}thread_local
 {{/if~}}
-{{>type/declarator-prefix type}} {{>symbol/name symbol link=(select link link template.primary)~}}
+{{>type/declarator-prefix type}} {{>symbol/name-text symbol ~}}
 {{#if isBitfield}} : {{bitfieldWidth}}{{/if~}}
 {{#if default}} = {{default}}{{/if~}}
 {{>type/declarator-suffix type~}}
diff --git a/share/mrdocs/addons/generator/common/partials/symbol/signatures.hbs b/share/mrdocs/addons/generator/common/partials/symbol/signatures.hbs
index 96e13bc9f..a75a16990 100644
--- a/share/mrdocs/addons/generator/common/partials/symbol/signatures.hbs
+++ b/share/mrdocs/addons/generator/common/partials/symbol/signatures.hbs
@@ -20,7 +20,7 @@
 {{#each members as | member |}}
 {{#if member.doc.brief}}{{> javadoc/brief member.doc.brief }}{{/if}}
 {{#> markup/code-block }}
-{{> symbol/signature member link=member}}
+{{> symbol/signature/function member force-link=true }}
 {{/markup/code-block}}
 {{#> markup/span class="small" }}{{#> markup/a href=member.url }}{{#>markup/em }}» more{{ str "..." }}{{/markup/em}}{{/markup/a}}{{/markup/span}}
 
diff --git a/share/mrdocs/addons/generator/html/partials/symbol.html.hbs b/share/mrdocs/addons/generator/html/partials/symbol.html.hbs
index f9351deb2..f47aa8b71 100644
--- a/share/mrdocs/addons/generator/html/partials/symbol.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/symbol.html.hbs
@@ -113,7 +113,7 @@
 {{#each symbol.friends }}
 <tr>
 {{#if symbol}}
-<td>{{#>markup/code}}{{> symbol/name symbol link=symbol }}{{/markup/code}}</td>
+<td>{{#>markup/code}}{{> symbol/name symbol }}{{/markup/code}}</td>
 <td>{{> javadoc/inline-brief symbol.doc.brief }}</td>
 {{else}}
 <td>{{#>markup/code}}{{> type/declarator type }}{{/markup/code}}</td>
diff --git a/src/lib/Metadata/Template.cpp b/src/lib/Metadata/Template.cpp
index 9ee7f97a6..51cd3d15d 100644
--- a/src/lib/Metadata/Template.cpp
+++ b/src/lib/Metadata/Template.cpp
@@ -341,7 +341,10 @@ tag_invoke(
     io.defer("kind", [&] {
         return toString(I.specializationKind());
     });
-    io.map("primary", I.Primary);
+    if (I.Primary != SymbolID::invalid)
+    {
+        io.map("primary", I.Primary);
+    }
     io.map("params", dom::LazyArray(I.Params, domCorpus));
     io.map("args", dom::LazyArray(I.Args, domCorpus));
     io.map("requires", dom::stringOrNull(I.Requires.Written));
diff --git a/src/lib/Support/LegibleNames.cpp b/src/lib/Support/LegibleNames.cpp
index c31f7fc01..23bad65f0 100644
--- a/src/lib/Support/LegibleNames.cpp
+++ b/src/lib/Support/LegibleNames.cpp
@@ -74,7 +74,7 @@ getUnnamedInfoName(Info const& I)
     }
 
     std::size_t const idx = to_underlying(I.Kind) - 1;
-    std::string res;
+    std::string res = "_";
     // push idx as two digits
     res.push_back(static_cast<char>('0' + (idx / 10)));
     res.push_back(static_cast<char>('0' + (idx % 10)));
diff --git a/test-files/golden-tests/config/auto-brief/auto-brief.html b/test-files/golden-tests/config/auto-brief/auto-brief.html
index fdda96e68..ef8397d1d 100644
--- a/test-files/golden-tests/config/auto-brief/auto-brief.html
+++ b/test-files/golden-tests/config/auto-brief/auto-brief.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -56,7 +56,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="copyBriefFromCopyBrief">copyBriefFromCopyBrief</h2>
+<h2 id="copyBriefFromCopyBrief"><a href="#copyBriefFromCopyBrief">copyBriefFromCopyBrief</a></h2>
 <div>
 <span>This is the explicit brief.</span>
 
@@ -76,7 +76,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="copyBriefFromExplicitBrief">copyBriefFromExplicitBrief</h2>
+<h2 id="copyBriefFromExplicitBrief"><a href="#copyBriefFromExplicitBrief">copyBriefFromExplicitBrief</a></h2>
 <div>
 <span>This is the explicit brief.</span>
 
@@ -96,7 +96,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="copyBriefFromFirstSentenceAsBrief">copyBriefFromFirstSentenceAsBrief</h2>
+<h2 id="copyBriefFromFirstSentenceAsBrief"><a href="#copyBriefFromFirstSentenceAsBrief">copyBriefFromFirstSentenceAsBrief</a></h2>
 <div>
 <span>This is the brief.</span>
 
@@ -116,7 +116,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="copyBriefFromFirstValid">copyBriefFromFirstValid</h2>
+<h2 id="copyBriefFromFirstValid"><a href="#copyBriefFromFirstValid">copyBriefFromFirstValid</a></h2>
 <div>
 <span>This function has documentation but no brief.</span>
 
@@ -136,7 +136,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="copyDetailsFromCopyBrief">copyDetailsFromCopyBrief</h2>
+<h2 id="copyDetailsFromCopyBrief"><a href="#copyDetailsFromCopyBrief">copyDetailsFromCopyBrief</a></h2>
 <div>
 <span>Details will be copied</span>
 
@@ -156,7 +156,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="copyDetailsFromDocNoBrief">copyDetailsFromDocNoBrief</h2>
+<h2 id="copyDetailsFromDocNoBrief"><a href="#copyDetailsFromDocNoBrief">copyDetailsFromDocNoBrief</a></h2>
 <div>
 <span>Custom brief</span>
 
@@ -176,7 +176,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="copyDetailsFromExplicitBrief">copyDetailsFromExplicitBrief</h2>
+<h2 id="copyDetailsFromExplicitBrief"><a href="#copyDetailsFromExplicitBrief">copyDetailsFromExplicitBrief</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -196,7 +196,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="copyDetailsFromFirstSentenceAsBrief">copyDetailsFromFirstSentenceAsBrief</h2>
+<h2 id="copyDetailsFromFirstSentenceAsBrief"><a href="#copyDetailsFromFirstSentenceAsBrief">copyDetailsFromFirstSentenceAsBrief</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -216,7 +216,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="copyDetailsFromNoDoc">copyDetailsFromNoDoc</h2>
+<h2 id="copyDetailsFromNoDoc"><a href="#copyDetailsFromNoDoc">copyDetailsFromNoDoc</a></h2>
 <div>
 <span>Custom brief</span>
 
@@ -236,7 +236,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="copyDocFromCopyBrief">copyDocFromCopyBrief</h2>
+<h2 id="copyDocFromCopyBrief"><a href="#copyDocFromCopyBrief">copyDocFromCopyBrief</a></h2>
 <div>
 <span>This is the explicit brief.</span>
 
@@ -260,7 +260,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="copyDocFromExplicitBrief">copyDocFromExplicitBrief</h2>
+<h2 id="copyDocFromExplicitBrief"><a href="#copyDocFromExplicitBrief">copyDocFromExplicitBrief</a></h2>
 <div>
 <span>This is the explicit brief.</span>
 
@@ -284,7 +284,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="copyDocFromFirstSentenceAsBrief">copyDocFromFirstSentenceAsBrief</h2>
+<h2 id="copyDocFromFirstSentenceAsBrief"><a href="#copyDocFromFirstSentenceAsBrief">copyDocFromFirstSentenceAsBrief</a></h2>
 <div>
 <span>This is the brief.</span>
 
@@ -308,7 +308,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="docNoBriefFunction">docNoBriefFunction</h2>
+<h2 id="docNoBriefFunction"><a href="#docNoBriefFunction">docNoBriefFunction</a></h2>
 <div>
 <span>This function has documentation but no brief.</span>
 
@@ -328,7 +328,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="explicitBriefFunction">explicitBriefFunction</h2>
+<h2 id="explicitBriefFunction"><a href="#explicitBriefFunction">explicitBriefFunction</a></h2>
 <div>
 <span>This is the explicit brief.</span>
 
@@ -352,7 +352,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="explicitBriefFunction2">explicitBriefFunction2</h2>
+<h2 id="explicitBriefFunction2"><a href="#explicitBriefFunction2">explicitBriefFunction2</a></h2>
 <div>
 <span>This is the explicit brief.</span>
 
@@ -376,7 +376,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="failCircularReferenceCopyFunction">failCircularReferenceCopyFunction</h2>
+<h2 id="failCircularReferenceCopyFunction"><a href="#failCircularReferenceCopyFunction">failCircularReferenceCopyFunction</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -392,7 +392,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="failCircularSourceFunctionA">failCircularSourceFunctionA</h2>
+<h2 id="failCircularSourceFunctionA"><a href="#failCircularSourceFunctionA">failCircularSourceFunctionA</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -408,7 +408,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="failCircularSourceFunctionB">failCircularSourceFunctionB</h2>
+<h2 id="failCircularSourceFunctionB"><a href="#failCircularSourceFunctionB">failCircularSourceFunctionB</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -424,7 +424,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="failCopyBriefFromDocNoBrief">failCopyBriefFromDocNoBrief</h2>
+<h2 id="failCopyBriefFromDocNoBrief"><a href="#failCopyBriefFromDocNoBrief">failCopyBriefFromDocNoBrief</a></h2>
 <div>
 <span>This function has documentation but no brief.</span>
 
@@ -444,7 +444,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="failCopyBriefFromInvalidReference">failCopyBriefFromInvalidReference</h2>
+<h2 id="failCopyBriefFromInvalidReference"><a href="#failCopyBriefFromInvalidReference">failCopyBriefFromInvalidReference</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -460,7 +460,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="failCopyBriefFromNoDoc">failCopyBriefFromNoDoc</h2>
+<h2 id="failCopyBriefFromNoDoc"><a href="#failCopyBriefFromNoDoc">failCopyBriefFromNoDoc</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -476,7 +476,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="failCopyDetailsFromInvalidReference">failCopyDetailsFromInvalidReference</h2>
+<h2 id="failCopyDetailsFromInvalidReference"><a href="#failCopyDetailsFromInvalidReference">failCopyDetailsFromInvalidReference</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -492,7 +492,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="failCopyDocFromDocNoBrief">failCopyDocFromDocNoBrief</h2>
+<h2 id="failCopyDocFromDocNoBrief"><a href="#failCopyDocFromDocNoBrief">failCopyDocFromDocNoBrief</a></h2>
 <div>
 <span>This function has documentation but no brief.</span>
 
@@ -512,7 +512,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="failCopyDocFromInvalidReference">failCopyDocFromInvalidReference</h2>
+<h2 id="failCopyDocFromInvalidReference"><a href="#failCopyDocFromInvalidReference">failCopyDocFromInvalidReference</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -528,7 +528,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="failCopyDocFromNoDoc">failCopyDocFromNoDoc</h2>
+<h2 id="failCopyDocFromNoDoc"><a href="#failCopyDocFromNoDoc">failCopyDocFromNoDoc</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -544,7 +544,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="failInvalidReferenceCopyFunctions">failInvalidReferenceCopyFunctions</h2>
+<h2 id="failInvalidReferenceCopyFunctions"><a href="#failInvalidReferenceCopyFunctions">failInvalidReferenceCopyFunctions</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -560,7 +560,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="firstSentenceAsBriefFunction">firstSentenceAsBriefFunction</h2>
+<h2 id="firstSentenceAsBriefFunction"><a href="#firstSentenceAsBriefFunction">firstSentenceAsBriefFunction</a></h2>
 <div>
 <span>This is the brief.</span>
 
@@ -584,7 +584,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="noDocFunction">noDocFunction</h2>
+<h2 id="noDocFunction"><a href="#noDocFunction">noDocFunction</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -600,7 +600,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="recursiveReferenceCopyFunction">recursiveReferenceCopyFunction</h2>
+<h2 id="recursiveReferenceCopyFunction"><a href="#recursiveReferenceCopyFunction">recursiveReferenceCopyFunction</a></h2>
 <div>
 <span>Final recursive brief</span>
 
@@ -620,7 +620,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="recursiveSourceFunctionA">recursiveSourceFunctionA</h2>
+<h2 id="recursiveSourceFunctionA"><a href="#recursiveSourceFunctionA">recursiveSourceFunctionA</a></h2>
 <div>
 <span>Final recursive brief</span>
 
@@ -640,7 +640,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="recursiveSourceFunctionB">recursiveSourceFunctionB</h2>
+<h2 id="recursiveSourceFunctionB"><a href="#recursiveSourceFunctionB">recursiveSourceFunctionB</a></h2>
 <div>
 <span>Final recursive brief</span>
 
diff --git a/test-files/golden-tests/config/auto-brief/no-auto-brief.html b/test-files/golden-tests/config/auto-brief/no-auto-brief.html
index a3171812c..8740b34fd 100644
--- a/test-files/golden-tests/config/auto-brief/no-auto-brief.html
+++ b/test-files/golden-tests/config/auto-brief/no-auto-brief.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -56,7 +56,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="copyBriefFromCopyBrief">copyBriefFromCopyBrief</h2>
+<h2 id="copyBriefFromCopyBrief"><a href="#copyBriefFromCopyBrief">copyBriefFromCopyBrief</a></h2>
 <div>
 <span>This is the explicit brief.</span>
 
@@ -76,7 +76,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="copyBriefFromExplicitBrief">copyBriefFromExplicitBrief</h2>
+<h2 id="copyBriefFromExplicitBrief"><a href="#copyBriefFromExplicitBrief">copyBriefFromExplicitBrief</a></h2>
 <div>
 <span>This is the explicit brief.</span>
 
@@ -96,7 +96,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="copyBriefFromFirstSentenceAsBrief">copyBriefFromFirstSentenceAsBrief</h2>
+<h2 id="copyBriefFromFirstSentenceAsBrief"><a href="#copyBriefFromFirstSentenceAsBrief">copyBriefFromFirstSentenceAsBrief</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -112,7 +112,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="copyBriefFromFirstValid">copyBriefFromFirstValid</h2>
+<h2 id="copyBriefFromFirstValid"><a href="#copyBriefFromFirstValid">copyBriefFromFirstValid</a></h2>
 <div>
 <span>This is the explicit brief.</span>
 
@@ -132,7 +132,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="copyDetailsFromCopyBrief">copyDetailsFromCopyBrief</h2>
+<h2 id="copyDetailsFromCopyBrief"><a href="#copyDetailsFromCopyBrief">copyDetailsFromCopyBrief</a></h2>
 <div>
 <span>Details will be copied</span>
 
@@ -152,7 +152,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="copyDetailsFromDocNoBrief">copyDetailsFromDocNoBrief</h2>
+<h2 id="copyDetailsFromDocNoBrief"><a href="#copyDetailsFromDocNoBrief">copyDetailsFromDocNoBrief</a></h2>
 <div>
 <span>Custom brief</span>
 
@@ -172,7 +172,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="copyDetailsFromExplicitBrief">copyDetailsFromExplicitBrief</h2>
+<h2 id="copyDetailsFromExplicitBrief"><a href="#copyDetailsFromExplicitBrief">copyDetailsFromExplicitBrief</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -192,7 +192,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="copyDetailsFromFirstSentenceAsBrief">copyDetailsFromFirstSentenceAsBrief</h2>
+<h2 id="copyDetailsFromFirstSentenceAsBrief"><a href="#copyDetailsFromFirstSentenceAsBrief">copyDetailsFromFirstSentenceAsBrief</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -213,7 +213,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="copyDetailsFromNoDoc">copyDetailsFromNoDoc</h2>
+<h2 id="copyDetailsFromNoDoc"><a href="#copyDetailsFromNoDoc">copyDetailsFromNoDoc</a></h2>
 <div>
 <span>Custom brief</span>
 
@@ -233,7 +233,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="copyDocFromCopyBrief">copyDocFromCopyBrief</h2>
+<h2 id="copyDocFromCopyBrief"><a href="#copyDocFromCopyBrief">copyDocFromCopyBrief</a></h2>
 <div>
 <span>This is the explicit brief.</span>
 
@@ -257,7 +257,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="copyDocFromExplicitBrief">copyDocFromExplicitBrief</h2>
+<h2 id="copyDocFromExplicitBrief"><a href="#copyDocFromExplicitBrief">copyDocFromExplicitBrief</a></h2>
 <div>
 <span>This is the explicit brief.</span>
 
@@ -281,7 +281,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="copyDocFromFirstSentenceAsBrief">copyDocFromFirstSentenceAsBrief</h2>
+<h2 id="copyDocFromFirstSentenceAsBrief"><a href="#copyDocFromFirstSentenceAsBrief">copyDocFromFirstSentenceAsBrief</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -302,7 +302,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="docNoBriefFunction">docNoBriefFunction</h2>
+<h2 id="docNoBriefFunction"><a href="#docNoBriefFunction">docNoBriefFunction</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -322,7 +322,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="explicitBriefFunction">explicitBriefFunction</h2>
+<h2 id="explicitBriefFunction"><a href="#explicitBriefFunction">explicitBriefFunction</a></h2>
 <div>
 <span>This is the explicit brief.</span>
 
@@ -346,7 +346,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="explicitBriefFunction2">explicitBriefFunction2</h2>
+<h2 id="explicitBriefFunction2"><a href="#explicitBriefFunction2">explicitBriefFunction2</a></h2>
 <div>
 <span>This is the explicit brief.</span>
 
@@ -370,7 +370,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="failCircularReferenceCopyFunction">failCircularReferenceCopyFunction</h2>
+<h2 id="failCircularReferenceCopyFunction"><a href="#failCircularReferenceCopyFunction">failCircularReferenceCopyFunction</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -386,7 +386,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="failCircularSourceFunctionA">failCircularSourceFunctionA</h2>
+<h2 id="failCircularSourceFunctionA"><a href="#failCircularSourceFunctionA">failCircularSourceFunctionA</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -402,7 +402,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="failCircularSourceFunctionB">failCircularSourceFunctionB</h2>
+<h2 id="failCircularSourceFunctionB"><a href="#failCircularSourceFunctionB">failCircularSourceFunctionB</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -418,7 +418,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="failCopyBriefFromDocNoBrief">failCopyBriefFromDocNoBrief</h2>
+<h2 id="failCopyBriefFromDocNoBrief"><a href="#failCopyBriefFromDocNoBrief">failCopyBriefFromDocNoBrief</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -434,7 +434,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="failCopyBriefFromInvalidReference">failCopyBriefFromInvalidReference</h2>
+<h2 id="failCopyBriefFromInvalidReference"><a href="#failCopyBriefFromInvalidReference">failCopyBriefFromInvalidReference</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -450,7 +450,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="failCopyBriefFromNoDoc">failCopyBriefFromNoDoc</h2>
+<h2 id="failCopyBriefFromNoDoc"><a href="#failCopyBriefFromNoDoc">failCopyBriefFromNoDoc</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -466,7 +466,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="failCopyDetailsFromInvalidReference">failCopyDetailsFromInvalidReference</h2>
+<h2 id="failCopyDetailsFromInvalidReference"><a href="#failCopyDetailsFromInvalidReference">failCopyDetailsFromInvalidReference</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -482,7 +482,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="failCopyDocFromDocNoBrief">failCopyDocFromDocNoBrief</h2>
+<h2 id="failCopyDocFromDocNoBrief"><a href="#failCopyDocFromDocNoBrief">failCopyDocFromDocNoBrief</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -502,7 +502,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="failCopyDocFromInvalidReference">failCopyDocFromInvalidReference</h2>
+<h2 id="failCopyDocFromInvalidReference"><a href="#failCopyDocFromInvalidReference">failCopyDocFromInvalidReference</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -518,7 +518,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="failCopyDocFromNoDoc">failCopyDocFromNoDoc</h2>
+<h2 id="failCopyDocFromNoDoc"><a href="#failCopyDocFromNoDoc">failCopyDocFromNoDoc</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -534,7 +534,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="failInvalidReferenceCopyFunctions">failInvalidReferenceCopyFunctions</h2>
+<h2 id="failInvalidReferenceCopyFunctions"><a href="#failInvalidReferenceCopyFunctions">failInvalidReferenceCopyFunctions</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -550,7 +550,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="firstSentenceAsBriefFunction">firstSentenceAsBriefFunction</h2>
+<h2 id="firstSentenceAsBriefFunction"><a href="#firstSentenceAsBriefFunction">firstSentenceAsBriefFunction</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -571,7 +571,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="noDocFunction">noDocFunction</h2>
+<h2 id="noDocFunction"><a href="#noDocFunction">noDocFunction</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -587,7 +587,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="recursiveReferenceCopyFunction">recursiveReferenceCopyFunction</h2>
+<h2 id="recursiveReferenceCopyFunction"><a href="#recursiveReferenceCopyFunction">recursiveReferenceCopyFunction</a></h2>
 <div>
 <span>Final recursive brief</span>
 
@@ -607,7 +607,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="recursiveSourceFunctionA">recursiveSourceFunctionA</h2>
+<h2 id="recursiveSourceFunctionA"><a href="#recursiveSourceFunctionA">recursiveSourceFunctionA</a></h2>
 <div>
 <span>Final recursive brief</span>
 
@@ -627,7 +627,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="recursiveSourceFunctionB">recursiveSourceFunctionB</h2>
+<h2 id="recursiveSourceFunctionB"><a href="#recursiveSourceFunctionB">recursiveSourceFunctionB</a></h2>
 <div>
 <span>Final recursive brief</span>
 
diff --git a/test-files/golden-tests/config/auto-function-metadata/brief-from-function-class.html b/test-files/golden-tests/config/auto-function-metadata/brief-from-function-class.html
index 893d99bd2..41a15aba8 100644
--- a/test-files/golden-tests/config/auto-function-metadata/brief-from-function-class.html
+++ b/test-files/golden-tests/config/auto-function-metadata/brief-from-function-class.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -27,7 +27,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 <div>
 <span>A helper tag</span>
 
@@ -48,7 +48,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="X">X</h2>
+<h2 id="X"><a href="#X">X</a></h2>
 <div>
 <span>Test class</span>
 
@@ -86,7 +86,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="X-2constructor-08"><a href="#X">X</a>::X</h2>
+<h2 id="X-2constructor-08"><a href="#X-2constructor-08">X::X</a></h2>
 <div>
 <span>Constructors</span>
 
@@ -146,7 +146,7 @@ <h3>Synopses</h3>
 </div>
 <div>
 <div>
-<h2 id="X-2constructor-0e8"><a href="#X">X</a>::X</h2>
+<h2 id="X-2constructor-0e8"><a href="#X-2constructor-0e8">X::X</a></h2>
 <div>
 <span>Default constructor</span>
 
@@ -166,7 +166,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="X-2constructor-0e0"><a href="#X">X</a>::X</h2>
+<h2 id="X-2constructor-0e0"><a href="#X-2constructor-0e0">X::X</a></h2>
 <div>
 <span>Copy constructor</span>
 
@@ -203,7 +203,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="X-2constructor-06"><a href="#X">X</a>::X</h2>
+<h2 id="X-2constructor-06"><a href="#X-2constructor-06">X::X</a></h2>
 <div>
 <span>Move constructor</span>
 
@@ -240,7 +240,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="X-2constructor-07"><a href="#X">X</a>::X</h2>
+<h2 id="X-2constructor-07"><a href="#X-2constructor-07">X::X</a></h2>
 <div>
 <span>Construct from <code>int</code></span>
 
@@ -276,7 +276,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="X-2constructor-0b"><a href="#X">X</a>::X</h2>
+<h2 id="X-2constructor-0b"><a href="#X-2constructor-0b">X::X</a></h2>
 <div>
 <span>Construct from <code>A</code></span>
 
@@ -312,7 +312,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="X-2constructor-00"><a href="#X">X</a>::X</h2>
+<h2 id="X-2constructor-00"><a href="#X-2constructor-00">X::X</a></h2>
 <div>
 <span>Construct from <code>A</code></span>
 
@@ -348,7 +348,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="X-2destructor"><a href="#X">X</a>::~X</h2>
+<h2 id="X-2destructor"><a href="#X-2destructor">X::~X</a></h2>
 <div>
 <span>Destructor</span>
 
@@ -367,7 +367,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="X-2conversion-00"><a href="#X">X</a>::operator <a href="#A">A</a></h2>
+<h2 id="X-2conversion-00"><a href="#X-2conversion-00">X::operator A</a></h2>
 <div>
 <span>Conversion to <code>A</code></span>
 
@@ -390,7 +390,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="X-2conversion-0b"><a href="#X">X</a>::operator int</h2>
+<h2 id="X-2conversion-0b"><a href="#X-2conversion-0b">X::operator int</a></h2>
 <div>
 <span>Conversion to <code>int</code></span>
 
diff --git a/test-files/golden-tests/config/auto-function-metadata/brief-from-operator.html b/test-files/golden-tests/config/auto-function-metadata/brief-from-operator.html
index e1c5f5c97..df9f68e07 100644
--- a/test-files/golden-tests/config/auto-function-metadata/brief-from-operator.html
+++ b/test-files/golden-tests/config/auto-function-metadata/brief-from-operator.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -42,7 +42,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 <div>
 <span>A helper tag</span>
 
@@ -63,7 +63,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="X">X</h2>
+<h2 id="X"><a href="#X">X</a></h2>
 <div>
 <span>Test class</span>
 
@@ -99,7 +99,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="X-operator_assign-0a"><a href="#X">X</a>::operator&#x3D;</h2>
+<h2 id="X-operator_assign-0a"><a href="#X-operator_assign-0a">X::operator&#x3D;</a></h2>
 <div>
 <span>Assignment operators</span>
 
@@ -138,7 +138,7 @@ <h3>Synopses</h3>
 </div>
 <div>
 <div>
-<h2 id="X-operator_assign-06"><a href="#X">X</a>::operator&#x3D;</h2>
+<h2 id="X-operator_assign-06"><a href="#X-operator_assign-06">X::operator&#x3D;</a></h2>
 <div>
 <span>Copy assignment operator</span>
 
@@ -179,7 +179,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="X-operator_assign-0e"><a href="#X">X</a>::operator&#x3D;</h2>
+<h2 id="X-operator_assign-0e"><a href="#X-operator_assign-0e">X::operator&#x3D;</a></h2>
 <div>
 <span>Move assignment operator</span>
 
@@ -220,7 +220,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="X-operator_assign-0d"><a href="#X">X</a>::operator&#x3D;</h2>
+<h2 id="X-operator_assign-0d"><a href="#X-operator_assign-0d">X::operator&#x3D;</a></h2>
 <div>
 <span>Assignment operator</span>
 
@@ -261,7 +261,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="X-operator_plus_eq"><a href="#X">X</a>::operator+&#x3D;</h2>
+<h2 id="X-operator_plus_eq"><a href="#X-operator_plus_eq">X::operator+&#x3D;</a></h2>
 <div>
 <span>Addition assignment operator</span>
 
@@ -302,7 +302,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="ostream">ostream</h2>
+<h2 id="ostream"><a href="#ostream">ostream</a></h2>
 <div>
 <span>A dumb ostream class</span>
 
@@ -323,7 +323,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="operator_lshift">operator&lt;&lt;</h2>
+<h2 id="operator_lshift"><a href="#operator_lshift">operator&lt;&lt;</a></h2>
 <div>
 <span>Stream insertion operator</span>
 
diff --git a/test-files/golden-tests/config/auto-function-metadata/param-from-function-class.html b/test-files/golden-tests/config/auto-function-metadata/param-from-function-class.html
index 1d90ec5f3..87aaa6b8d 100644
--- a/test-files/golden-tests/config/auto-function-metadata/param-from-function-class.html
+++ b/test-files/golden-tests/config/auto-function-metadata/param-from-function-class.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -27,7 +27,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 <div>
 <span>A helper tag</span>
 
@@ -48,7 +48,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="X">X</h2>
+<h2 id="X"><a href="#X">X</a></h2>
 <div>
 <span>Test class</span>
 
@@ -84,7 +84,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="X-2constructor-08"><a href="#X">X</a>::X</h2>
+<h2 id="X-2constructor-08"><a href="#X-2constructor-08">X::X</a></h2>
 <div>
 <span>Constructors</span>
 
@@ -134,7 +134,7 @@ <h3>Synopses</h3>
 </div>
 <div>
 <div>
-<h2 id="X-2constructor-0e"><a href="#X">X</a>::X</h2>
+<h2 id="X-2constructor-0e"><a href="#X-2constructor-0e">X::X</a></h2>
 <div>
 <span>Copy constructor</span>
 
@@ -170,7 +170,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="X-2constructor-06"><a href="#X">X</a>::X</h2>
+<h2 id="X-2constructor-06"><a href="#X-2constructor-06">X::X</a></h2>
 <div>
 <span>Move constructor</span>
 
@@ -206,7 +206,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="X-2constructor-07"><a href="#X">X</a>::X</h2>
+<h2 id="X-2constructor-07"><a href="#X-2constructor-07">X::X</a></h2>
 <div>
 <span>Construct from <code>int</code></span>
 
@@ -242,7 +242,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="X-2constructor-0b"><a href="#X">X</a>::X</h2>
+<h2 id="X-2constructor-0b"><a href="#X-2constructor-0b">X::X</a></h2>
 <div>
 <span>Construct from <code>A</code></span>
 
@@ -278,7 +278,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="X-2constructor-00"><a href="#X">X</a>::X</h2>
+<h2 id="X-2constructor-00"><a href="#X-2constructor-00">X::X</a></h2>
 <div>
 <span>Construct from <code>A</code></span>
 
@@ -314,7 +314,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="X-operator_assign-0a"><a href="#X">X</a>::operator&#x3D;</h2>
+<h2 id="X-operator_assign-0a"><a href="#X-operator_assign-0a">X::operator&#x3D;</a></h2>
 <div>
 <span>Assignment operators</span>
 
@@ -369,7 +369,7 @@ <h3>Synopses</h3>
 </div>
 <div>
 <div>
-<h2 id="X-operator_assign-06"><a href="#X">X</a>::operator&#x3D;</h2>
+<h2 id="X-operator_assign-06"><a href="#X-operator_assign-06">X::operator&#x3D;</a></h2>
 <div>
 <span>Copy assignment operator</span>
 
@@ -410,7 +410,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="X-operator_assign-0e"><a href="#X">X</a>::operator&#x3D;</h2>
+<h2 id="X-operator_assign-0e"><a href="#X-operator_assign-0e">X::operator&#x3D;</a></h2>
 <div>
 <span>Move assignment operator</span>
 
@@ -451,7 +451,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="X-operator_assign-07f"><a href="#X">X</a>::operator&#x3D;</h2>
+<h2 id="X-operator_assign-07f"><a href="#X-operator_assign-07f">X::operator&#x3D;</a></h2>
 <div>
 <span>Assignment operator</span>
 
@@ -492,7 +492,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="X-operator_assign-0d"><a href="#X">X</a>::operator&#x3D;</h2>
+<h2 id="X-operator_assign-0d"><a href="#X-operator_assign-0d">X::operator&#x3D;</a></h2>
 <div>
 <span>Assignment operator</span>
 
@@ -533,7 +533,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="X-operator_assign-07e"><a href="#X">X</a>::operator&#x3D;</h2>
+<h2 id="X-operator_assign-07e"><a href="#X-operator_assign-07e">X::operator&#x3D;</a></h2>
 <div>
 <span>Assignment operator</span>
 
diff --git a/test-files/golden-tests/config/auto-function-metadata/param-from-operator.html b/test-files/golden-tests/config/auto-function-metadata/param-from-operator.html
index 9a0b95cae..3c790fb0b 100644
--- a/test-files/golden-tests/config/auto-function-metadata/param-from-operator.html
+++ b/test-files/golden-tests/config/auto-function-metadata/param-from-operator.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -44,7 +44,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 <div>
 <span>A helper tag</span>
 
@@ -65,7 +65,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="X">X</h2>
+<h2 id="X"><a href="#X">X</a></h2>
 <div>
 <span>Test class</span>
 
@@ -100,7 +100,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="X-operator_plus"><a href="#X">X</a>::operator+</h2>
+<h2 id="X-operator_plus"><a href="#X-operator_plus">X::operator+</a></h2>
 <div>
 <span>Addition operator</span>
 
@@ -141,7 +141,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="ostream">ostream</h2>
+<h2 id="ostream"><a href="#ostream">ostream</a></h2>
 <div>
 <span>A dumb ostream class</span>
 
@@ -162,7 +162,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="operator_minus">operator-</h2>
+<h2 id="operator_minus"><a href="#operator_minus">operator-</a></h2>
 <div>
 <span>Subtraction operator</span>
 
@@ -209,7 +209,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="operator_lshift">operator&lt;&lt;</h2>
+<h2 id="operator_lshift"><a href="#operator_lshift">operator&lt;&lt;</a></h2>
 <div>
 <span>Stream insertion operator</span>
 
@@ -256,7 +256,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="operator_not">operator!</h2>
+<h2 id="operator_not"><a href="#operator_not">operator!</a></h2>
 <div>
 <span>Negation operator</span>
 
diff --git a/test-files/golden-tests/config/auto-function-metadata/returns-from-brief.html b/test-files/golden-tests/config/auto-function-metadata/returns-from-brief.html
index e56cab62a..214acab94 100644
--- a/test-files/golden-tests/config/auto-function-metadata/returns-from-brief.html
+++ b/test-files/golden-tests/config/auto-function-metadata/returns-from-brief.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -26,7 +26,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="X">X</h2>
+<h2 id="X"><a href="#X">X</a></h2>
 <div>
 <span>Test class</span>
 
@@ -63,7 +63,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="X-empty"><a href="#X">X</a>::empty</h2>
+<h2 id="X-empty"><a href="#X-empty">X::empty</a></h2>
 <div>
 <span>Determines whether the range is empty.</span>
 
@@ -87,7 +87,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="X-front"><a href="#X">X</a>::front</h2>
+<h2 id="X-front"><a href="#X-front">X::front</a></h2>
 <div>
 <span>Returns the first element of the range.</span>
 
@@ -111,7 +111,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="X-size"><a href="#X">X</a>::size</h2>
+<h2 id="X-size"><a href="#X-size">X::size</a></h2>
 <div>
 <span>Get the range size.</span>
 
diff --git a/test-files/golden-tests/config/auto-function-metadata/returns-from-return-brief.html b/test-files/golden-tests/config/auto-function-metadata/returns-from-return-brief.html
index 53eac380a..3ed6402b4 100644
--- a/test-files/golden-tests/config/auto-function-metadata/returns-from-return-brief.html
+++ b/test-files/golden-tests/config/auto-function-metadata/returns-from-return-brief.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -40,7 +40,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="R">R</h2>
+<h2 id="R"><a href="#R">R</a></h2>
 <div>
 <span>The return type of the function</span>
 
@@ -75,7 +75,7 @@ <h2>Non-Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="getR">getR</h2>
+<h2 id="getR"><a href="#getR">getR</a></h2>
 <div>
 <span>Test function</span>
 
diff --git a/test-files/golden-tests/config/auto-function-metadata/returns-from-special.html b/test-files/golden-tests/config/auto-function-metadata/returns-from-special.html
index 154877617..7c385b4bd 100644
--- a/test-files/golden-tests/config/auto-function-metadata/returns-from-special.html
+++ b/test-files/golden-tests/config/auto-function-metadata/returns-from-special.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -51,7 +51,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 <div>
 <span>A helper class</span>
 
@@ -72,7 +72,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="Undoc">Undoc</h2>
+<h2 id="Undoc"><a href="#Undoc">Undoc</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -89,7 +89,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="X">X</h2>
+<h2 id="X"><a href="#X">X</a></h2>
 <div>
 <span>Test class</span>
 
@@ -136,7 +136,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="X-operator_assign-0a"><a href="#X">X</a>::operator&#x3D;</h2>
+<h2 id="X-operator_assign-0a"><a href="#X-operator_assign-0a">X::operator&#x3D;</a></h2>
 <div>
 <span>Assignment operators</span>
 
@@ -167,7 +167,7 @@ <h3>Synopses</h3>
 </div>
 <div>
 <div>
-<h2 id="X-operator_assign-0d"><a href="#X">X</a>::operator&#x3D;</h2>
+<h2 id="X-operator_assign-0d"><a href="#X-operator_assign-0d">X::operator&#x3D;</a></h2>
 <div>
 <span>Assignment operator</span>
 
@@ -208,7 +208,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="X-operator_assign-07"><a href="#X">X</a>::operator&#x3D;</h2>
+<h2 id="X-operator_assign-07"><a href="#X-operator_assign-07">X::operator&#x3D;</a></h2>
 <div>
 <span>Assignment operator</span>
 
@@ -249,7 +249,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="X-operator_plus"><a href="#X">X</a>::operator+</h2>
+<h2 id="X-operator_plus"><a href="#X-operator_plus">X::operator+</a></h2>
 <div>
 <span>Addition operator</span>
 
@@ -290,7 +290,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="X-operator_ptr"><a href="#X">X</a>::operator-&gt;</h2>
+<h2 id="X-operator_ptr"><a href="#X-operator_ptr">X::operator-&gt;</a></h2>
 <div>
 <span>Member access operator</span>
 
@@ -314,7 +314,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="X-2conversion-00"><a href="#X">X</a>::operator <a href="#A">A</a></h2>
+<h2 id="X-2conversion-00"><a href="#X-2conversion-00">X::operator A</a></h2>
 <div>
 <span>Conversion to <code>A</code></span>
 
@@ -337,7 +337,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="X-2conversion-03"><a href="#X">X</a>::operator <a href="#Undoc">Undoc</a></h2>
+<h2 id="X-2conversion-03"><a href="#X-2conversion-03">X::operator Undoc</a></h2>
 <div>
 <span>Conversion to <code>Undoc</code></span>
 
@@ -360,7 +360,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="X-operator_not"><a href="#X">X</a>::operator!</h2>
+<h2 id="X-operator_not"><a href="#X-operator_not">X::operator!</a></h2>
 <div>
 <span>Negation operator</span>
 
@@ -384,7 +384,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="X-operator_eq"><a href="#X">X</a>::operator&#x3D;&#x3D;</h2>
+<h2 id="X-operator_eq"><a href="#X-operator_eq">X::operator&#x3D;&#x3D;</a></h2>
 <div>
 <span>Equality operator</span>
 
@@ -425,7 +425,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="X-operator_not_eq"><a href="#X">X</a>::operator!&#x3D;</h2>
+<h2 id="X-operator_not_eq"><a href="#X-operator_not_eq">X::operator!&#x3D;</a></h2>
 <div>
 <span>Inequality operator</span>
 
@@ -466,7 +466,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="X-operator_lt"><a href="#X">X</a>::operator&lt;</h2>
+<h2 id="X-operator_lt"><a href="#X-operator_lt">X::operator&lt;</a></h2>
 <div>
 <span>Less-than operator</span>
 
@@ -507,7 +507,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="X-operator_le"><a href="#X">X</a>::operator&lt;&#x3D;</h2>
+<h2 id="X-operator_le"><a href="#X-operator_le">X::operator&lt;&#x3D;</a></h2>
 <div>
 <span>Less-than-or-equal operator</span>
 
@@ -548,7 +548,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="X-operator_gt"><a href="#X">X</a>::operator&gt;</h2>
+<h2 id="X-operator_gt"><a href="#X-operator_gt">X::operator&gt;</a></h2>
 <div>
 <span>Greater-than operator</span>
 
@@ -589,7 +589,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="X-operator_ge"><a href="#X">X</a>::operator&gt;&#x3D;</h2>
+<h2 id="X-operator_ge"><a href="#X-operator_ge">X::operator&gt;&#x3D;</a></h2>
 <div>
 <span>Greater-than-or-equal operator</span>
 
@@ -630,7 +630,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="X-operator_3way"><a href="#X">X</a>::operator&lt;&#x3D;&gt;</h2>
+<h2 id="X-operator_3way"><a href="#X-operator_3way">X::operator&lt;&#x3D;&gt;</a></h2>
 <div>
 <span>Three-way comparison operator</span>
 
@@ -671,7 +671,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="ostream">ostream</h2>
+<h2 id="ostream"><a href="#ostream">ostream</a></h2>
 <div>
 <span>A fake output stream</span>
 
@@ -692,7 +692,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="operator_lshift">operator&lt;&lt;</h2>
+<h2 id="operator_lshift"><a href="#operator_lshift">operator&lt;&lt;</a></h2>
 <div>
 <span>Stream insertion operator</span>
 
@@ -739,7 +739,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="operator_not">operator!</h2>
+<h2 id="operator_not"><a href="#operator_not">operator!</a></h2>
 <div>
 <span>Negation operator</span>
 
@@ -780,7 +780,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="operator_eq">operator&#x3D;&#x3D;</h2>
+<h2 id="operator_eq"><a href="#operator_eq">operator&#x3D;&#x3D;</a></h2>
 <div>
 <span>Equality operator</span>
 
@@ -827,7 +827,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="operator_not_eq">operator!&#x3D;</h2>
+<h2 id="operator_not_eq"><a href="#operator_not_eq">operator!&#x3D;</a></h2>
 <div>
 <span>Inequality operator</span>
 
@@ -874,7 +874,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="operator_lt">operator&lt;</h2>
+<h2 id="operator_lt"><a href="#operator_lt">operator&lt;</a></h2>
 <div>
 <span>Less-than operator</span>
 
@@ -921,7 +921,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="operator_le">operator&lt;&#x3D;</h2>
+<h2 id="operator_le"><a href="#operator_le">operator&lt;&#x3D;</a></h2>
 <div>
 <span>Less-than-or-equal operator</span>
 
@@ -968,7 +968,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="operator_gt">operator&gt;</h2>
+<h2 id="operator_gt"><a href="#operator_gt">operator&gt;</a></h2>
 <div>
 <span>Greater-than operator</span>
 
@@ -1015,7 +1015,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="operator_ge">operator&gt;&#x3D;</h2>
+<h2 id="operator_ge"><a href="#operator_ge">operator&gt;&#x3D;</a></h2>
 <div>
 <span>Greater-than-or-equal operator</span>
 
@@ -1062,7 +1062,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="operator_3way">operator&lt;&#x3D;&gt;</h2>
+<h2 id="operator_3way"><a href="#operator_3way">operator&lt;&#x3D;&gt;</a></h2>
 <div>
 <span>Three-way comparison operator</span>
 
diff --git a/test-files/golden-tests/config/auto-relates/auto-relates.html b/test-files/golden-tests/config/auto-relates/auto-relates.html
index 5ceb23762..ef53250c4 100644
--- a/test-files/golden-tests/config/auto-relates/auto-relates.html
+++ b/test-files/golden-tests/config/auto-relates/auto-relates.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -45,7 +45,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 <div>
 <span>A class with non-member functions</span>
 
@@ -85,7 +85,7 @@ <h2>Non-Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="f1">f1</h2>
+<h2 id="f1"><a href="#f1">f1</a></h2>
 <div>
 <span>A non-member function of A</span>
 
@@ -105,7 +105,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f2">f2</h2>
+<h2 id="f2"><a href="#f2">f2</a></h2>
 <div>
 <span>A non-member function of A</span>
 
@@ -125,7 +125,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f3">f3</h2>
+<h2 id="f3"><a href="#f3">f3</a></h2>
 <div>
 <span>A non-member function of A</span>
 
@@ -145,7 +145,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f4">f4</h2>
+<h2 id="f4"><a href="#f4">f4</a></h2>
 <div>
 <span>A non-member function of A</span>
 
@@ -165,7 +165,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f5">f5</h2>
+<h2 id="f5"><a href="#f5">f5</a></h2>
 <div>
 <span>A non-member function of A</span>
 
@@ -185,7 +185,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f6">f6</h2>
+<h2 id="f6"><a href="#f6">f6</a></h2>
 <div>
 <span>A non-member function of A</span>
 
diff --git a/test-files/golden-tests/config/auto-relates/derived.html b/test-files/golden-tests/config/auto-relates/derived.html
index ec6ed8481..44a2fc2cb 100644
--- a/test-files/golden-tests/config/auto-relates/derived.html
+++ b/test-files/golden-tests/config/auto-relates/derived.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -48,7 +48,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 <div>
 <span>A concrete implementation for ABase</span>
 
@@ -102,7 +102,7 @@ <h2>Non-Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="ABase">ABase</h2>
+<h2 id="ABase"><a href="#ABase">ABase</a></h2>
 <div>
 <span>A base class for non-member functions</span>
 
@@ -159,7 +159,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="AView">AView</h2>
+<h2 id="AView"><a href="#AView">AView</a></h2>
 <div>
 <span>A view of A</span>
 
@@ -228,7 +228,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="AView2">AView2</h2>
+<h2 id="AView2"><a href="#AView2">AView2</a></h2>
 <div>
 <span>Another view of A</span>
 
@@ -286,7 +286,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="f1">f1</h2>
+<h2 id="f1"><a href="#f1">f1</a></h2>
 <div>
 <span>A non-member function of ABase</span>
 
@@ -306,7 +306,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f2">f2</h2>
+<h2 id="f2"><a href="#f2">f2</a></h2>
 <div>
 <span>A non-member function of ABase</span>
 
@@ -326,7 +326,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f3">f3</h2>
+<h2 id="f3"><a href="#f3">f3</a></h2>
 <div>
 <span>A non-member function of ABase</span>
 
@@ -346,7 +346,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f4">f4</h2>
+<h2 id="f4"><a href="#f4">f4</a></h2>
 <div>
 <span>A non-member function of ABase</span>
 
@@ -366,7 +366,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f5">f5</h2>
+<h2 id="f5"><a href="#f5">f5</a></h2>
 <div>
 <span>A non-member function of ABase</span>
 
@@ -386,7 +386,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="n">n</h2>
+<h2 id="n"><a href="#n">n</a></h2>
 <div>
 <span>A non-member function of ABase only</span>
 
diff --git a/test-files/golden-tests/config/auto-relates/enum.html b/test-files/golden-tests/config/auto-relates/enum.html
index 09bed4d59..eb3da61b9 100644
--- a/test-files/golden-tests/config/auto-relates/enum.html
+++ b/test-files/golden-tests/config/auto-relates/enum.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -57,7 +57,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="Result">Result</h2>
+<h2 id="Result"><a href="#Result">Result</a></h2>
 <div>
 <span>Helper result class</span>
 
@@ -93,7 +93,7 @@ <h2>Non-Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="SmallVector">SmallVector</h2>
+<h2 id="SmallVector"><a href="#SmallVector">SmallVector</a></h2>
 <div>
 <span>Helper result class</span>
 
@@ -131,7 +131,7 @@ <h2>Non-Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="E">E</h2>
+<h2 id="E"><a href="#E">E</a></h2>
 <div>
 <span>An enum with non-member functions</span>
 
@@ -179,7 +179,7 @@ <h2>Non-Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="makeE">makeE</h2>
+<h2 id="makeE"><a href="#makeE">makeE</a></h2>
 <div>
 <span>Function that returns A</span>
 
@@ -203,7 +203,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="makeEs">makeEs</h2>
+<h2 id="makeEs"><a href="#makeEs">makeEs</a></h2>
 <div>
 <span>Function that returns template on A</span>
 
@@ -227,7 +227,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="tryMakeE">tryMakeE</h2>
+<h2 id="tryMakeE"><a href="#tryMakeE">tryMakeE</a></h2>
 <div>
 <span>Function that returns template on A</span>
 
diff --git a/test-files/golden-tests/config/auto-relates/no-auto-relates.html b/test-files/golden-tests/config/auto-relates/no-auto-relates.html
index 16e5e5355..b8c42b165 100644
--- a/test-files/golden-tests/config/auto-relates/no-auto-relates.html
+++ b/test-files/golden-tests/config/auto-relates/no-auto-relates.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -45,7 +45,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 <div>
 <span>A class with non-member functions</span>
 
@@ -66,7 +66,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f1">f1</h2>
+<h2 id="f1"><a href="#f1">f1</a></h2>
 <div>
 <span>A non-member function of A</span>
 
@@ -86,7 +86,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f2">f2</h2>
+<h2 id="f2"><a href="#f2">f2</a></h2>
 <div>
 <span>A non-member function of A</span>
 
@@ -106,7 +106,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f3">f3</h2>
+<h2 id="f3"><a href="#f3">f3</a></h2>
 <div>
 <span>A non-member function of A</span>
 
@@ -126,7 +126,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f4">f4</h2>
+<h2 id="f4"><a href="#f4">f4</a></h2>
 <div>
 <span>A non-member function of A</span>
 
@@ -146,7 +146,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f5">f5</h2>
+<h2 id="f5"><a href="#f5">f5</a></h2>
 <div>
 <span>A non-member function of A</span>
 
@@ -166,7 +166,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f6">f6</h2>
+<h2 id="f6"><a href="#f6">f6</a></h2>
 <div>
 <span>A non-member function of A</span>
 
diff --git a/test-files/golden-tests/config/auto-relates/qualified.html b/test-files/golden-tests/config/auto-relates/qualified.html
index d75351b35..563a84d28 100644
--- a/test-files/golden-tests/config/auto-relates/qualified.html
+++ b/test-files/golden-tests/config/auto-relates/qualified.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -55,7 +55,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="N">N</h2>
+<h2 id="N"><a href="#N">N</a></h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -102,7 +102,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="N-M"><a href="#N">N</a>::M</h2>
+<h2 id="N-M"><a href="#N-M">N::M</a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -121,7 +121,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="N-M-f4"><a href="#N">N</a>::<a href="#N-M">M</a>::f4</h2>
+<h2 id="N-M-f4"><a href="#N-M-f4">N::M::f4</a></h2>
 <div>
 <span>A non-member function of ::N::B</span>
 
@@ -141,7 +141,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="N-B"><a href="#N">N</a>::B</h2>
+<h2 id="N-B"><a href="#N-B">N::B</a></h2>
 <div>
 <span>A nested class with non-member functions</span>
 
@@ -179,7 +179,7 @@ <h2>Non-Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="N-f2"><a href="#N">N</a>::f2</h2>
+<h2 id="N-f2"><a href="#N-f2">N::f2</a></h2>
 <div>
 <span>A non-member function of A</span>
 
@@ -199,7 +199,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="N-f3"><a href="#N">N</a>::f3</h2>
+<h2 id="N-f3"><a href="#N-f3">N::f3</a></h2>
 <div>
 <span>A non-member function of B</span>
 
@@ -219,7 +219,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="O">O</h2>
+<h2 id="O"><a href="#O">O</a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -238,7 +238,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="O-f6"><a href="#O">O</a>::f6</h2>
+<h2 id="O-f6"><a href="#O-f6">O::f6</a></h2>
 <div>
 <span>A non-member function of ::N::B</span>
 
@@ -258,7 +258,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 <div>
 <span>A class with non-member functions</span>
 
@@ -294,7 +294,7 @@ <h2>Non-Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="f1">f1</h2>
+<h2 id="f1"><a href="#f1">f1</a></h2>
 <div>
 <span>A non-member function of A</span>
 
@@ -314,7 +314,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f5">f5</h2>
+<h2 id="f5"><a href="#f5">f5</a></h2>
 <div>
 <span>A non-member function of ::N::B</span>
 
diff --git a/test-files/golden-tests/config/auto-relates/remove-friend.html b/test-files/golden-tests/config/auto-relates/remove-friend.html
index b618c1cf6..b3a6368c4 100644
--- a/test-files/golden-tests/config/auto-relates/remove-friend.html
+++ b/test-files/golden-tests/config/auto-relates/remove-friend.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -41,7 +41,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 <div>
 <span>A record with non-member functions</span>
 
@@ -94,7 +94,7 @@ <h2>Non-Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="to_string">to_string</h2>
+<h2 id="to_string"><a href="#to_string">to_string</a></h2>
 <div>
 <span>Non-member function of A</span>
 
@@ -135,7 +135,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="operator_eq">operator&#x3D;&#x3D;</h2>
+<h2 id="operator_eq"><a href="#operator_eq">operator&#x3D;&#x3D;</a></h2>
 <div>
 <span>Friend function not listed as non-member</span>
 
diff --git a/test-files/golden-tests/config/auto-relates/return-type.html b/test-files/golden-tests/config/auto-relates/return-type.html
index 716f41d9b..de95d837c 100644
--- a/test-files/golden-tests/config/auto-relates/return-type.html
+++ b/test-files/golden-tests/config/auto-relates/return-type.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -44,7 +44,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 <div>
 <span>A class with non-member functions</span>
 
@@ -81,7 +81,7 @@ <h2>Non-Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="Result">Result</h2>
+<h2 id="Result"><a href="#Result">Result</a></h2>
 <div>
 <span>Helper result class</span>
 
@@ -117,7 +117,7 @@ <h2>Non-Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="SmallVector">SmallVector</h2>
+<h2 id="SmallVector"><a href="#SmallVector">SmallVector</a></h2>
 <div>
 <span>Helper result class</span>
 
@@ -155,7 +155,7 @@ <h2>Non-Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="makeA">makeA</h2>
+<h2 id="makeA"><a href="#makeA">makeA</a></h2>
 <div>
 <span>Function that returns A</span>
 
@@ -179,7 +179,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="makeAs">makeAs</h2>
+<h2 id="makeAs"><a href="#makeAs">makeAs</a></h2>
 <div>
 <span>Function that returns template on A</span>
 
@@ -203,7 +203,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="tryMakeA">tryMakeA</h2>
+<h2 id="tryMakeA"><a href="#tryMakeA">tryMakeA</a></h2>
 <div>
 <span>Function that returns template on A</span>
 
diff --git a/test-files/golden-tests/config/extract-all/no-extract-all.html b/test-files/golden-tests/config/extract-all/no-extract-all.html
index 82ac41e61..158997bc8 100644
--- a/test-files/golden-tests/config/extract-all/no-extract-all.html
+++ b/test-files/golden-tests/config/extract-all/no-extract-all.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -27,7 +27,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="docFunction">docFunction</h2>
+<h2 id="docFunction"><a href="#docFunction">docFunction</a></h2>
 <div>
 <span>Documented function</span>
 
@@ -47,7 +47,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="sometimesDocFunction">sometimesDocFunction</h2>
+<h2 id="sometimesDocFunction"><a href="#sometimesDocFunction">sometimesDocFunction</a></h2>
 <div>
 <span>Sometimes documented function</span>
 
diff --git a/test-files/golden-tests/config/extract-empty-namespaces/no-extract-empty-namespaces.html b/test-files/golden-tests/config/extract-empty-namespaces/no-extract-empty-namespaces.html
index d53ed5b49..fb22498d2 100644
--- a/test-files/golden-tests/config/extract-empty-namespaces/no-extract-empty-namespaces.html
+++ b/test-files/golden-tests/config/extract-empty-namespaces/no-extract-empty-namespaces.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -63,7 +63,7 @@ <h2>Using Namespace Directives</h2>
 </div>
 <div>
 <div>
-<h2 id="documented_ns">documented_ns</h2>
+<h2 id="documented_ns"><a href="#documented_ns">documented_ns</a></h2>
 <div>
 <span>Namespace documentation</span>
 
@@ -72,7 +72,7 @@ <h2 id="documented_ns">documented_ns</h2>
 </div>
 <div>
 <div>
-<h2 id="mixed_ns">mixed_ns</h2>
+<h2 id="mixed_ns"><a href="#mixed_ns">mixed_ns</a></h2>
 <div>
 <span>Should decay to see-below</span>
 
@@ -94,7 +94,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="mixed_ns-SeeBelowStructA"><a href="#mixed_ns">mixed_ns</a>::SeeBelowStructA</h2>
+<h2 id="mixed_ns-SeeBelowStructA"><a href="#mixed_ns-SeeBelowStructA">mixed_ns::SeeBelowStructA</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -111,7 +111,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="mixed_regular_ns">mixed_regular_ns</h2>
+<h2 id="mixed_regular_ns"><a href="#mixed_regular_ns">mixed_regular_ns</a></h2>
 <div>
 <span>Should decay to regular</span>
 
@@ -134,7 +134,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="mixed_regular_ns-RegularStructA"><a href="#mixed_regular_ns">mixed_regular_ns</a>::RegularStructA</h2>
+<h2 id="mixed_regular_ns-RegularStructA"><a href="#mixed_regular_ns-RegularStructA">mixed_regular_ns::RegularStructA</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -151,7 +151,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="mixed_regular_ns-SeeBelowStructB"><a href="#mixed_regular_ns">mixed_regular_ns</a>::SeeBelowStructB</h2>
+<h2 id="mixed_regular_ns-SeeBelowStructB"><a href="#mixed_regular_ns-SeeBelowStructB">mixed_regular_ns::SeeBelowStructB</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -168,7 +168,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="regular_ns">regular_ns</h2>
+<h2 id="regular_ns"><a href="#regular_ns">regular_ns</a></h2>
 <div>
 <span>Regular namespace</span>
 
@@ -190,7 +190,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="regular_ns-A"><a href="#regular_ns">regular_ns</a>::A</h2>
+<h2 id="regular_ns-A"><a href="#regular_ns-A">regular_ns::A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -207,7 +207,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="see_below_ns">see_below_ns</h2>
+<h2 id="see_below_ns"><a href="#see_below_ns">see_below_ns</a></h2>
 <div>
 <span>Should decay to see-below</span>
 
@@ -230,7 +230,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="see_below_ns-SeeBelowStructA"><a href="#see_below_ns">see_below_ns</a>::SeeBelowStructA</h2>
+<h2 id="see_below_ns-SeeBelowStructA"><a href="#see_below_ns-SeeBelowStructA">see_below_ns::SeeBelowStructA</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -247,7 +247,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="see_below_ns-SeeBelowStructB"><a href="#see_below_ns">see_below_ns</a>::SeeBelowStructB</h2>
+<h2 id="see_below_ns-SeeBelowStructB"><a href="#see_below_ns-SeeBelowStructB">see_below_ns::SeeBelowStructB</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -264,7 +264,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="empty_ns_alias">empty_ns_alias</h2>
+<h2 id="empty_ns_alias"><a href="#empty_ns_alias">empty_ns_alias</a></h2>
 <div>
 <span>Should still work</span>
 
@@ -283,7 +283,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="regular_ns_alias">regular_ns_alias</h2>
+<h2 id="regular_ns_alias"><a href="#regular_ns_alias">regular_ns_alias</a></h2>
 <div>
 <span>Should work</span>
 
diff --git a/test-files/golden-tests/config/extract-implicit-specializations/base.html b/test-files/golden-tests/config/extract-implicit-specializations/base.html
index 4469c2c1d..24367b8ed 100644
--- a/test-files/golden-tests/config/extract-implicit-specializations/base.html
+++ b/test-files/golden-tests/config/extract-implicit-specializations/base.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -26,7 +26,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -71,7 +71,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="B">B</h2>
+<h2 id="B"><a href="#B">B</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -116,7 +116,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="B-value"><a href="#B">B</a>::value</h2>
+<h2 id="B-value"><a href="#B-value">B::value</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/config/extract-implicit-specializations/extract-implicit-specializations.html b/test-files/golden-tests/config/extract-implicit-specializations/extract-implicit-specializations.html
index b37b819bb..f0bfa8968 100644
--- a/test-files/golden-tests/config/extract-implicit-specializations/extract-implicit-specializations.html
+++ b/test-files/golden-tests/config/extract-implicit-specializations/extract-implicit-specializations.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -26,7 +26,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -71,7 +71,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-value"><a href="#A">A</a>::value</h2>
+<h2 id="A-value"><a href="#A-value">A::value</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -87,7 +87,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="B-00">B</h2>
+<h2 id="B-00"><a href="#B-00">B</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -133,7 +133,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="B-00-value"><a href="#B-00">B</a>::value</h2>
+<h2 id="B-00-value"><a href="#B-00-value">B::value</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/config/extract-implicit-specializations/no-extract-implicit-specializations.html b/test-files/golden-tests/config/extract-implicit-specializations/no-extract-implicit-specializations.html
index 2529cff64..8b1d03e79 100644
--- a/test-files/golden-tests/config/extract-implicit-specializations/no-extract-implicit-specializations.html
+++ b/test-files/golden-tests/config/extract-implicit-specializations/no-extract-implicit-specializations.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -26,7 +26,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -71,7 +71,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="B">B</h2>
+<h2 id="B"><a href="#B">B</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -117,7 +117,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="B-value"><a href="#B">B</a>::value</h2>
+<h2 id="B-value"><a href="#B-value">B::value</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/config/extract-local-classes/extract-local-classes.html b/test-files/golden-tests/config/extract-local-classes/extract-local-classes.html
index 243b2c40c..7d0d76d8c 100644
--- a/test-files/golden-tests/config/extract-local-classes/extract-local-classes.html
+++ b/test-files/golden-tests/config/extract-local-classes/extract-local-classes.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -39,7 +39,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="local_class">local_class</h2>
+<h2 id="local_class"><a href="#local_class">local_class</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -56,7 +56,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="local_struct">local_struct</h2>
+<h2 id="local_struct"><a href="#local_struct">local_struct</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -73,7 +73,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="local_function">local_function</h2>
+<h2 id="local_function"><a href="#local_function">local_function</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/config/extract-local-classes/no-extract-local-classes.html b/test-files/golden-tests/config/extract-local-classes/no-extract-local-classes.html
index 7891e672f..a85f9233e 100644
--- a/test-files/golden-tests/config/extract-local-classes/no-extract-local-classes.html
+++ b/test-files/golden-tests/config/extract-local-classes/no-extract-local-classes.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,7 +25,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="local_function">local_function</h2>
+<h2 id="local_function"><a href="#local_function">local_function</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/config/extract-private-virtual/extract-private-virtual.html b/test-files/golden-tests/config/extract-private-virtual/extract-private-virtual.html
index caaf11515..1d7c03ad1 100644
--- a/test-files/golden-tests/config/extract-private-virtual/extract-private-virtual.html
+++ b/test-files/golden-tests/config/extract-private-virtual/extract-private-virtual.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,7 +25,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -68,7 +68,7 @@ <h2>Private Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-f"><a href="#A">A</a>::f</h2>
+<h2 id="A-f"><a href="#A-f">A::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -85,7 +85,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-g"><a href="#A">A</a>::g</h2>
+<h2 id="A-g"><a href="#A-g">A::g</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/config/extract-private-virtual/no-extract-private-virtual.html b/test-files/golden-tests/config/extract-private-virtual/no-extract-private-virtual.html
index 322b385c6..028bedf1c 100644
--- a/test-files/golden-tests/config/extract-private-virtual/no-extract-private-virtual.html
+++ b/test-files/golden-tests/config/extract-private-virtual/no-extract-private-virtual.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,7 +25,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -55,7 +55,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-f"><a href="#A">A</a>::f</h2>
+<h2 id="A-f"><a href="#A-f">A::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/config/inherit-base-members/base-overload-set.html b/test-files/golden-tests/config/inherit-base-members/base-overload-set.html
index 7f05d534c..dedc450f4 100644
--- a/test-files/golden-tests/config/inherit-base-members/base-overload-set.html
+++ b/test-files/golden-tests/config/inherit-base-members/base-overload-set.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -27,7 +27,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="Base">Base</h2>
+<h2 id="Base"><a href="#Base">Base</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -88,7 +88,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="Base-foo-04"><a href="#Base">Base</a>::foo</h2>
+<h2 id="Base-foo-04"><a href="#Base-foo-04">Base::foo</a></h2>
 </div>
 <div>
 <h3>Synopses</h3>
@@ -115,7 +115,7 @@ <h3>Synopses</h3>
 </div>
 <div>
 <div>
-<h2 id="Base-foo-0a"><a href="#Base">Base</a>::foo</h2>
+<h2 id="Base-foo-0a"><a href="#Base-foo-0a">Base::foo</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -131,7 +131,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="Base-foo-08"><a href="#Base">Base</a>::foo</h2>
+<h2 id="Base-foo-08"><a href="#Base-foo-08">Base::foo</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -147,7 +147,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="C">C</h2>
+<h2 id="C"><a href="#C">C</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -193,7 +193,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="ConstBase">ConstBase</h2>
+<h2 id="ConstBase"><a href="#ConstBase">ConstBase</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -238,7 +238,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="ConstBase-foo"><a href="#ConstBase">ConstBase</a>::foo</h2>
+<h2 id="ConstBase-foo"><a href="#ConstBase-foo">ConstBase::foo</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/config/inherit-base-members/copy-dependencies.html b/test-files/golden-tests/config/inherit-base-members/copy-dependencies.html
index 6f14d2483..13426e5fd 100644
--- a/test-files/golden-tests/config/inherit-base-members/copy-dependencies.html
+++ b/test-files/golden-tests/config/inherit-base-members/copy-dependencies.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -30,7 +30,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="base">base</h2>
+<h2 id="base"><a href="#base">base</a></h2>
 <div>
 <span>A base class to test inheritance and shadowing</span>
 
@@ -115,7 +115,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="base-base_inherited"><a href="#base">base</a>::base_inherited</h2>
+<h2 id="base-base_inherited"><a href="#base-base_inherited">base::base_inherited</a></h2>
 <div>
 <span>This function should be inherited by derived classes.</span>
 
@@ -139,7 +139,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="base-base_shadowed"><a href="#base">base</a>::base_shadowed</h2>
+<h2 id="base-base_shadowed"><a href="#base-base_shadowed">base::base_shadowed</a></h2>
 <div>
 <span>This function should shadow the excluded_base function.</span>
 
@@ -163,7 +163,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="base-derived_shadowed"><a href="#base">base</a>::derived_shadowed</h2>
+<h2 id="base-derived_shadowed"><a href="#base-derived_shadowed">base::derived_shadowed</a></h2>
 <div>
 <span>This function should be shadowed by derived classes.</span>
 
@@ -187,7 +187,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="base-do_base_inherited"><a href="#base">base</a>::do_base_inherited</h2>
+<h2 id="base-do_base_inherited"><a href="#base-do_base_inherited">base::do_base_inherited</a></h2>
 <div>
 <span>This function should be inherited by derived classes.</span>
 
@@ -211,7 +211,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="base-do_base_shadowed"><a href="#base">base</a>::do_base_shadowed</h2>
+<h2 id="base-do_base_shadowed"><a href="#base-do_base_shadowed">base::do_base_shadowed</a></h2>
 <div>
 <span>This function should shadow the excluded_base function.</span>
 
@@ -235,7 +235,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="base-do_derived_shadowed"><a href="#base">base</a>::do_derived_shadowed</h2>
+<h2 id="base-do_derived_shadowed"><a href="#base-do_derived_shadowed">base::do_derived_shadowed</a></h2>
 <div>
 <span>This function should be shadowed by derived classes.</span>
 
@@ -259,7 +259,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="base_base">base_base</h2>
+<h2 id="base_base"><a href="#base_base">base_base</a></h2>
 <div>
 <span>A second-order base class to test indirect inheritance</span>
 
@@ -310,7 +310,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="base_base-base_base_inherited"><a href="#base_base">base_base</a>::base_base_inherited</h2>
+<h2 id="base_base-base_base_inherited"><a href="#base_base-base_base_inherited">base_base::base_base_inherited</a></h2>
 <div>
 <span>This function should be indirectly inherited by derived classes.</span>
 
@@ -334,7 +334,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="base_base-do_base_base_inherited"><a href="#base_base">base_base</a>::do_base_base_inherited</h2>
+<h2 id="base_base-do_base_base_inherited"><a href="#base_base-do_base_base_inherited">base_base::do_base_base_inherited</a></h2>
 <div>
 <span>This function should be indirectly inherited by derived classes.</span>
 
@@ -358,7 +358,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="derived">derived</h2>
+<h2 id="derived"><a href="#derived">derived</a></h2>
 <div>
 <span>A class that derives from base and excluded_base</span>
 
@@ -434,7 +434,7 @@ <h2>Protected Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="derived-derived_shadowed"><a href="#derived">derived</a>::derived_shadowed</h2>
+<h2 id="derived-derived_shadowed"><a href="#derived-derived_shadowed">derived::derived_shadowed</a></h2>
 <div>
 <span>This function should shadow the base class function.</span>
 
@@ -458,7 +458,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="derived-do_derived_shadowed"><a href="#derived">derived</a>::do_derived_shadowed</h2>
+<h2 id="derived-do_derived_shadowed"><a href="#derived-do_derived_shadowed">derived::do_derived_shadowed</a></h2>
 <div>
 <span>This function should shadow the base class function.</span>
 
@@ -482,7 +482,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="derived-excluded_inherited"><a href="#derived">derived</a>::excluded_inherited</h2>
+<h2 id="derived-excluded_inherited"><a href="#derived-excluded_inherited">derived::excluded_inherited</a></h2>
 <div>
 <span>This function should be inherited by derived classes.</span>
 
@@ -502,7 +502,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="derived-do_excluded_inherited"><a href="#derived">derived</a>::do_excluded_inherited</h2>
+<h2 id="derived-do_excluded_inherited"><a href="#derived-do_excluded_inherited">derived::do_excluded_inherited</a></h2>
 <div>
 <span>This function should be inherited by derived classes.</span>
 
@@ -522,7 +522,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="derived-do_shadowed"><a href="#derived">derived</a>::do_shadowed</h2>
+<h2 id="derived-do_shadowed"><a href="#derived-do_shadowed">derived::do_shadowed</a></h2>
 <div>
 <span>This function should be shadowed by derived classes.</span>
 
@@ -542,7 +542,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="private_derived">private_derived</h2>
+<h2 id="private_derived"><a href="#private_derived">private_derived</a></h2>
 <div>
 <span>A class that uses private inheritance only</span>
 
@@ -580,7 +580,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="private_derived-derived_shadowed"><a href="#private_derived">private_derived</a>::derived_shadowed</h2>
+<h2 id="private_derived-derived_shadowed"><a href="#private_derived-derived_shadowed">private_derived::derived_shadowed</a></h2>
 <div>
 <span>This function should shadow the base class function.</span>
 
@@ -604,7 +604,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="private_derived-do_derived_shadowed"><a href="#private_derived">private_derived</a>::do_derived_shadowed</h2>
+<h2 id="private_derived-do_derived_shadowed"><a href="#private_derived-do_derived_shadowed">private_derived::do_derived_shadowed</a></h2>
 <div>
 <span>This function should shadow the base class function.</span>
 
@@ -628,7 +628,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="protected_derived">protected_derived</h2>
+<h2 id="protected_derived"><a href="#protected_derived">protected_derived</a></h2>
 <div>
 <span>A class that should inherit functions as protected.</span>
 
@@ -690,7 +690,7 @@ <h2>Protected Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="protected_derived-derived_shadowed"><a href="#protected_derived">protected_derived</a>::derived_shadowed</h2>
+<h2 id="protected_derived-derived_shadowed"><a href="#protected_derived-derived_shadowed">protected_derived::derived_shadowed</a></h2>
 <div>
 <span>This function should shadow the base class function.</span>
 
@@ -714,7 +714,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="protected_derived-do_derived_shadowed"><a href="#protected_derived">protected_derived</a>::do_derived_shadowed</h2>
+<h2 id="protected_derived-do_derived_shadowed"><a href="#protected_derived-do_derived_shadowed">protected_derived::do_derived_shadowed</a></h2>
 <div>
 <span>This function should shadow the base class function.</span>
 
@@ -738,7 +738,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="protected_derived-do_excluded_inherited"><a href="#protected_derived">protected_derived</a>::do_excluded_inherited</h2>
+<h2 id="protected_derived-do_excluded_inherited"><a href="#protected_derived-do_excluded_inherited">protected_derived::do_excluded_inherited</a></h2>
 <div>
 <span>This function should be inherited by derived classes.</span>
 
@@ -758,7 +758,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="protected_derived-do_shadowed"><a href="#protected_derived">protected_derived</a>::do_shadowed</h2>
+<h2 id="protected_derived-do_shadowed"><a href="#protected_derived-do_shadowed">protected_derived::do_shadowed</a></h2>
 <div>
 <span>This function should be shadowed by derived classes.</span>
 
@@ -778,7 +778,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="protected_derived-excluded_inherited"><a href="#protected_derived">protected_derived</a>::excluded_inherited</h2>
+<h2 id="protected_derived-excluded_inherited"><a href="#protected_derived-excluded_inherited">protected_derived::excluded_inherited</a></h2>
 <div>
 <span>This function should be inherited by derived classes.</span>
 
diff --git a/test-files/golden-tests/config/inherit-base-members/copy.html b/test-files/golden-tests/config/inherit-base-members/copy.html
index b56b7845a..7638091a3 100644
--- a/test-files/golden-tests/config/inherit-base-members/copy.html
+++ b/test-files/golden-tests/config/inherit-base-members/copy.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -30,7 +30,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="base">base</h2>
+<h2 id="base"><a href="#base">base</a></h2>
 <div>
 <span>A base class to test inheritance and shadowing</span>
 
@@ -115,7 +115,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="base-base_base_inherited"><a href="#base">base</a>::base_base_inherited</h2>
+<h2 id="base-base_base_inherited"><a href="#base-base_base_inherited">base::base_base_inherited</a></h2>
 <div>
 <span>This function should be indirectly inherited by derived classes.</span>
 
@@ -139,7 +139,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="base-base_inherited"><a href="#base">base</a>::base_inherited</h2>
+<h2 id="base-base_inherited"><a href="#base-base_inherited">base::base_inherited</a></h2>
 <div>
 <span>This function should be inherited by derived classes.</span>
 
@@ -163,7 +163,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="base-base_shadowed"><a href="#base">base</a>::base_shadowed</h2>
+<h2 id="base-base_shadowed"><a href="#base-base_shadowed">base::base_shadowed</a></h2>
 <div>
 <span>This function should shadow the excluded_base function.</span>
 
@@ -187,7 +187,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="base-derived_shadowed"><a href="#base">base</a>::derived_shadowed</h2>
+<h2 id="base-derived_shadowed"><a href="#base-derived_shadowed">base::derived_shadowed</a></h2>
 <div>
 <span>This function should be shadowed by derived classes.</span>
 
@@ -211,7 +211,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="base-do_base_base_inherited"><a href="#base">base</a>::do_base_base_inherited</h2>
+<h2 id="base-do_base_base_inherited"><a href="#base-do_base_base_inherited">base::do_base_base_inherited</a></h2>
 <div>
 <span>This function should be indirectly inherited by derived classes.</span>
 
@@ -235,7 +235,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="base-do_base_inherited"><a href="#base">base</a>::do_base_inherited</h2>
+<h2 id="base-do_base_inherited"><a href="#base-do_base_inherited">base::do_base_inherited</a></h2>
 <div>
 <span>This function should be inherited by derived classes.</span>
 
@@ -259,7 +259,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="base-do_base_shadowed"><a href="#base">base</a>::do_base_shadowed</h2>
+<h2 id="base-do_base_shadowed"><a href="#base-do_base_shadowed">base::do_base_shadowed</a></h2>
 <div>
 <span>This function should shadow the excluded_base function.</span>
 
@@ -283,7 +283,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="base-do_derived_shadowed"><a href="#base">base</a>::do_derived_shadowed</h2>
+<h2 id="base-do_derived_shadowed"><a href="#base-do_derived_shadowed">base::do_derived_shadowed</a></h2>
 <div>
 <span>This function should be shadowed by derived classes.</span>
 
@@ -307,7 +307,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="base_base">base_base</h2>
+<h2 id="base_base"><a href="#base_base">base_base</a></h2>
 <div>
 <span>A second-order base class to test indirect inheritance</span>
 
@@ -358,7 +358,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="base_base-base_base_inherited"><a href="#base_base">base_base</a>::base_base_inherited</h2>
+<h2 id="base_base-base_base_inherited"><a href="#base_base-base_base_inherited">base_base::base_base_inherited</a></h2>
 <div>
 <span>This function should be indirectly inherited by derived classes.</span>
 
@@ -382,7 +382,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="base_base-do_base_base_inherited"><a href="#base_base">base_base</a>::do_base_base_inherited</h2>
+<h2 id="base_base-do_base_base_inherited"><a href="#base_base-do_base_base_inherited">base_base::do_base_base_inherited</a></h2>
 <div>
 <span>This function should be indirectly inherited by derived classes.</span>
 
@@ -406,7 +406,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="derived">derived</h2>
+<h2 id="derived"><a href="#derived">derived</a></h2>
 <div>
 <span>A class that derives from base and excluded_base</span>
 
@@ -482,7 +482,7 @@ <h2>Protected Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="derived-base_base_inherited"><a href="#derived">derived</a>::base_base_inherited</h2>
+<h2 id="derived-base_base_inherited"><a href="#derived-base_base_inherited">derived::base_base_inherited</a></h2>
 <div>
 <span>This function should be indirectly inherited by derived classes.</span>
 
@@ -506,7 +506,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="derived-base_inherited"><a href="#derived">derived</a>::base_inherited</h2>
+<h2 id="derived-base_inherited"><a href="#derived-base_inherited">derived::base_inherited</a></h2>
 <div>
 <span>This function should be inherited by derived classes.</span>
 
@@ -530,7 +530,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="derived-base_shadowed"><a href="#derived">derived</a>::base_shadowed</h2>
+<h2 id="derived-base_shadowed"><a href="#derived-base_shadowed">derived::base_shadowed</a></h2>
 <div>
 <span>This function should shadow the excluded_base function.</span>
 
@@ -554,7 +554,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="derived-derived_shadowed"><a href="#derived">derived</a>::derived_shadowed</h2>
+<h2 id="derived-derived_shadowed"><a href="#derived-derived_shadowed">derived::derived_shadowed</a></h2>
 <div>
 <span>This function should shadow the base class function.</span>
 
@@ -578,7 +578,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="derived-do_base_base_inherited"><a href="#derived">derived</a>::do_base_base_inherited</h2>
+<h2 id="derived-do_base_base_inherited"><a href="#derived-do_base_base_inherited">derived::do_base_base_inherited</a></h2>
 <div>
 <span>This function should be indirectly inherited by derived classes.</span>
 
@@ -602,7 +602,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="derived-do_derived_shadowed-0a"><a href="#derived">derived</a>::do_derived_shadowed</h2>
+<h2 id="derived-do_derived_shadowed-0a"><a href="#derived-do_derived_shadowed-0a">derived::do_derived_shadowed</a></h2>
 <div>
 <span>This function should shadow the base class function.</span>
 
@@ -626,7 +626,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="derived-excluded_inherited"><a href="#derived">derived</a>::excluded_inherited</h2>
+<h2 id="derived-excluded_inherited"><a href="#derived-excluded_inherited">derived::excluded_inherited</a></h2>
 <div>
 <span>This function should be inherited by derived classes.</span>
 
@@ -646,7 +646,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="derived-do_base_inherited"><a href="#derived">derived</a>::do_base_inherited</h2>
+<h2 id="derived-do_base_inherited"><a href="#derived-do_base_inherited">derived::do_base_inherited</a></h2>
 <div>
 <span>This function should be inherited by derived classes.</span>
 
@@ -670,7 +670,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="derived-do_base_shadowed"><a href="#derived">derived</a>::do_base_shadowed</h2>
+<h2 id="derived-do_base_shadowed"><a href="#derived-do_base_shadowed">derived::do_base_shadowed</a></h2>
 <div>
 <span>This function should shadow the excluded_base function.</span>
 
@@ -694,7 +694,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="derived-do_derived_shadowed-0d"><a href="#derived">derived</a>::do_derived_shadowed</h2>
+<h2 id="derived-do_derived_shadowed-0d"><a href="#derived-do_derived_shadowed-0d">derived::do_derived_shadowed</a></h2>
 <div>
 <span>This function should be shadowed by derived classes.</span>
 
@@ -718,7 +718,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="derived-do_excluded_inherited"><a href="#derived">derived</a>::do_excluded_inherited</h2>
+<h2 id="derived-do_excluded_inherited"><a href="#derived-do_excluded_inherited">derived::do_excluded_inherited</a></h2>
 <div>
 <span>This function should be inherited by derived classes.</span>
 
@@ -738,7 +738,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="derived-do_shadowed"><a href="#derived">derived</a>::do_shadowed</h2>
+<h2 id="derived-do_shadowed"><a href="#derived-do_shadowed">derived::do_shadowed</a></h2>
 <div>
 <span>This function should be shadowed by derived classes.</span>
 
@@ -758,7 +758,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="private_derived">private_derived</h2>
+<h2 id="private_derived"><a href="#private_derived">private_derived</a></h2>
 <div>
 <span>A class that uses private inheritance only</span>
 
@@ -796,7 +796,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="private_derived-derived_shadowed"><a href="#private_derived">private_derived</a>::derived_shadowed</h2>
+<h2 id="private_derived-derived_shadowed"><a href="#private_derived-derived_shadowed">private_derived::derived_shadowed</a></h2>
 <div>
 <span>This function should shadow the base class function.</span>
 
@@ -820,7 +820,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="private_derived-do_derived_shadowed"><a href="#private_derived">private_derived</a>::do_derived_shadowed</h2>
+<h2 id="private_derived-do_derived_shadowed"><a href="#private_derived-do_derived_shadowed">private_derived::do_derived_shadowed</a></h2>
 <div>
 <span>This function should shadow the base class function.</span>
 
@@ -844,7 +844,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="protected_derived">protected_derived</h2>
+<h2 id="protected_derived"><a href="#protected_derived">protected_derived</a></h2>
 <div>
 <span>A class that should inherit functions as protected.</span>
 
@@ -906,7 +906,7 @@ <h2>Protected Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="protected_derived-derived_shadowed-0a"><a href="#protected_derived">protected_derived</a>::derived_shadowed</h2>
+<h2 id="protected_derived-derived_shadowed-0a"><a href="#protected_derived-derived_shadowed-0a">protected_derived::derived_shadowed</a></h2>
 <div>
 <span>This function should shadow the base class function.</span>
 
@@ -930,7 +930,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="protected_derived-do_derived_shadowed-0e"><a href="#protected_derived">protected_derived</a>::do_derived_shadowed</h2>
+<h2 id="protected_derived-do_derived_shadowed-0e"><a href="#protected_derived-do_derived_shadowed-0e">protected_derived::do_derived_shadowed</a></h2>
 <div>
 <span>This function should shadow the base class function.</span>
 
@@ -954,7 +954,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="protected_derived-base_base_inherited"><a href="#protected_derived">protected_derived</a>::base_base_inherited</h2>
+<h2 id="protected_derived-base_base_inherited"><a href="#protected_derived-base_base_inherited">protected_derived::base_base_inherited</a></h2>
 <div>
 <span>This function should be indirectly inherited by derived classes.</span>
 
@@ -978,7 +978,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="protected_derived-base_inherited"><a href="#protected_derived">protected_derived</a>::base_inherited</h2>
+<h2 id="protected_derived-base_inherited"><a href="#protected_derived-base_inherited">protected_derived::base_inherited</a></h2>
 <div>
 <span>This function should be inherited by derived classes.</span>
 
@@ -1002,7 +1002,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="protected_derived-base_shadowed"><a href="#protected_derived">protected_derived</a>::base_shadowed</h2>
+<h2 id="protected_derived-base_shadowed"><a href="#protected_derived-base_shadowed">protected_derived::base_shadowed</a></h2>
 <div>
 <span>This function should shadow the excluded_base function.</span>
 
@@ -1026,7 +1026,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="protected_derived-derived_shadowed-0f"><a href="#protected_derived">protected_derived</a>::derived_shadowed</h2>
+<h2 id="protected_derived-derived_shadowed-0f"><a href="#protected_derived-derived_shadowed-0f">protected_derived::derived_shadowed</a></h2>
 <div>
 <span>This function should be shadowed by derived classes.</span>
 
@@ -1050,7 +1050,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="protected_derived-do_base_base_inherited"><a href="#protected_derived">protected_derived</a>::do_base_base_inherited</h2>
+<h2 id="protected_derived-do_base_base_inherited"><a href="#protected_derived-do_base_base_inherited">protected_derived::do_base_base_inherited</a></h2>
 <div>
 <span>This function should be indirectly inherited by derived classes.</span>
 
@@ -1074,7 +1074,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="protected_derived-do_base_inherited"><a href="#protected_derived">protected_derived</a>::do_base_inherited</h2>
+<h2 id="protected_derived-do_base_inherited"><a href="#protected_derived-do_base_inherited">protected_derived::do_base_inherited</a></h2>
 <div>
 <span>This function should be inherited by derived classes.</span>
 
@@ -1098,7 +1098,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="protected_derived-do_base_shadowed"><a href="#protected_derived">protected_derived</a>::do_base_shadowed</h2>
+<h2 id="protected_derived-do_base_shadowed"><a href="#protected_derived-do_base_shadowed">protected_derived::do_base_shadowed</a></h2>
 <div>
 <span>This function should shadow the excluded_base function.</span>
 
@@ -1122,7 +1122,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="protected_derived-do_derived_shadowed-06"><a href="#protected_derived">protected_derived</a>::do_derived_shadowed</h2>
+<h2 id="protected_derived-do_derived_shadowed-06"><a href="#protected_derived-do_derived_shadowed-06">protected_derived::do_derived_shadowed</a></h2>
 <div>
 <span>This function should be shadowed by derived classes.</span>
 
@@ -1146,7 +1146,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="protected_derived-do_excluded_inherited"><a href="#protected_derived">protected_derived</a>::do_excluded_inherited</h2>
+<h2 id="protected_derived-do_excluded_inherited"><a href="#protected_derived-do_excluded_inherited">protected_derived::do_excluded_inherited</a></h2>
 <div>
 <span>This function should be inherited by derived classes.</span>
 
@@ -1166,7 +1166,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="protected_derived-do_shadowed"><a href="#protected_derived">protected_derived</a>::do_shadowed</h2>
+<h2 id="protected_derived-do_shadowed"><a href="#protected_derived-do_shadowed">protected_derived::do_shadowed</a></h2>
 <div>
 <span>This function should be shadowed by derived classes.</span>
 
@@ -1186,7 +1186,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="protected_derived-excluded_inherited"><a href="#protected_derived">protected_derived</a>::excluded_inherited</h2>
+<h2 id="protected_derived-excluded_inherited"><a href="#protected_derived-excluded_inherited">protected_derived::excluded_inherited</a></h2>
 <div>
 <span>This function should be inherited by derived classes.</span>
 
diff --git a/test-files/golden-tests/config/inherit-base-members/never.html b/test-files/golden-tests/config/inherit-base-members/never.html
index c7317da3b..713644a2a 100644
--- a/test-files/golden-tests/config/inherit-base-members/never.html
+++ b/test-files/golden-tests/config/inherit-base-members/never.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -30,7 +30,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="base">base</h2>
+<h2 id="base"><a href="#base">base</a></h2>
 <div>
 <span>A base class to test inheritance and shadowing</span>
 
@@ -113,7 +113,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="base-base_inherited"><a href="#base">base</a>::base_inherited</h2>
+<h2 id="base-base_inherited"><a href="#base-base_inherited">base::base_inherited</a></h2>
 <div>
 <span>This function should be inherited by derived classes.</span>
 
@@ -137,7 +137,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="base-base_shadowed"><a href="#base">base</a>::base_shadowed</h2>
+<h2 id="base-base_shadowed"><a href="#base-base_shadowed">base::base_shadowed</a></h2>
 <div>
 <span>This function should shadow the excluded_base function.</span>
 
@@ -161,7 +161,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="base-derived_shadowed"><a href="#base">base</a>::derived_shadowed</h2>
+<h2 id="base-derived_shadowed"><a href="#base-derived_shadowed">base::derived_shadowed</a></h2>
 <div>
 <span>This function should be shadowed by derived classes.</span>
 
@@ -185,7 +185,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="base-do_base_inherited"><a href="#base">base</a>::do_base_inherited</h2>
+<h2 id="base-do_base_inherited"><a href="#base-do_base_inherited">base::do_base_inherited</a></h2>
 <div>
 <span>This function should be inherited by derived classes.</span>
 
@@ -209,7 +209,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="base-do_base_shadowed"><a href="#base">base</a>::do_base_shadowed</h2>
+<h2 id="base-do_base_shadowed"><a href="#base-do_base_shadowed">base::do_base_shadowed</a></h2>
 <div>
 <span>This function should shadow the excluded_base function.</span>
 
@@ -233,7 +233,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="base-do_derived_shadowed"><a href="#base">base</a>::do_derived_shadowed</h2>
+<h2 id="base-do_derived_shadowed"><a href="#base-do_derived_shadowed">base::do_derived_shadowed</a></h2>
 <div>
 <span>This function should be shadowed by derived classes.</span>
 
@@ -257,7 +257,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="base_base">base_base</h2>
+<h2 id="base_base"><a href="#base_base">base_base</a></h2>
 <div>
 <span>A second-order base class to test indirect inheritance</span>
 
@@ -308,7 +308,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="base_base-base_base_inherited"><a href="#base_base">base_base</a>::base_base_inherited</h2>
+<h2 id="base_base-base_base_inherited"><a href="#base_base-base_base_inherited">base_base::base_base_inherited</a></h2>
 <div>
 <span>This function should be indirectly inherited by derived classes.</span>
 
@@ -332,7 +332,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="base_base-do_base_base_inherited"><a href="#base_base">base_base</a>::do_base_base_inherited</h2>
+<h2 id="base_base-do_base_base_inherited"><a href="#base_base-do_base_base_inherited">base_base::do_base_base_inherited</a></h2>
 <div>
 <span>This function should be indirectly inherited by derived classes.</span>
 
@@ -356,7 +356,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="derived">derived</h2>
+<h2 id="derived"><a href="#derived">derived</a></h2>
 <div>
 <span>A class that derives from base and excluded_base</span>
 
@@ -409,7 +409,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="derived-derived_shadowed"><a href="#derived">derived</a>::derived_shadowed</h2>
+<h2 id="derived-derived_shadowed"><a href="#derived-derived_shadowed">derived::derived_shadowed</a></h2>
 <div>
 <span>This function should shadow the base class function.</span>
 
@@ -433,7 +433,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="derived-do_derived_shadowed"><a href="#derived">derived</a>::do_derived_shadowed</h2>
+<h2 id="derived-do_derived_shadowed"><a href="#derived-do_derived_shadowed">derived::do_derived_shadowed</a></h2>
 <div>
 <span>This function should shadow the base class function.</span>
 
@@ -457,7 +457,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="private_derived">private_derived</h2>
+<h2 id="private_derived"><a href="#private_derived">private_derived</a></h2>
 <div>
 <span>A class that uses private inheritance only</span>
 
@@ -495,7 +495,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="private_derived-derived_shadowed"><a href="#private_derived">private_derived</a>::derived_shadowed</h2>
+<h2 id="private_derived-derived_shadowed"><a href="#private_derived-derived_shadowed">private_derived::derived_shadowed</a></h2>
 <div>
 <span>This function should shadow the base class function.</span>
 
@@ -519,7 +519,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="private_derived-do_derived_shadowed"><a href="#private_derived">private_derived</a>::do_derived_shadowed</h2>
+<h2 id="private_derived-do_derived_shadowed"><a href="#private_derived-do_derived_shadowed">private_derived::do_derived_shadowed</a></h2>
 <div>
 <span>This function should shadow the base class function.</span>
 
@@ -543,7 +543,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="protected_derived">protected_derived</h2>
+<h2 id="protected_derived"><a href="#protected_derived">protected_derived</a></h2>
 <div>
 <span>A class that should inherit functions as protected.</span>
 
@@ -581,7 +581,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="protected_derived-derived_shadowed"><a href="#protected_derived">protected_derived</a>::derived_shadowed</h2>
+<h2 id="protected_derived-derived_shadowed"><a href="#protected_derived-derived_shadowed">protected_derived::derived_shadowed</a></h2>
 <div>
 <span>This function should shadow the base class function.</span>
 
@@ -605,7 +605,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="protected_derived-do_derived_shadowed"><a href="#protected_derived">protected_derived</a>::do_derived_shadowed</h2>
+<h2 id="protected_derived-do_derived_shadowed"><a href="#protected_derived-do_derived_shadowed">protected_derived::do_derived_shadowed</a></h2>
 <div>
 <span>This function should shadow the base class function.</span>
 
diff --git a/test-files/golden-tests/config/inherit-base-members/reference.html b/test-files/golden-tests/config/inherit-base-members/reference.html
index ce813fb7a..28efdbee6 100644
--- a/test-files/golden-tests/config/inherit-base-members/reference.html
+++ b/test-files/golden-tests/config/inherit-base-members/reference.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -30,7 +30,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="base">base</h2>
+<h2 id="base"><a href="#base">base</a></h2>
 <div>
 <span>A base class to test inheritance and shadowing</span>
 
@@ -115,7 +115,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="base-base_inherited"><a href="#base">base</a>::base_inherited</h2>
+<h2 id="base-base_inherited"><a href="#base-base_inherited">base::base_inherited</a></h2>
 <div>
 <span>This function should be inherited by derived classes.</span>
 
@@ -139,7 +139,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="base-base_shadowed"><a href="#base">base</a>::base_shadowed</h2>
+<h2 id="base-base_shadowed"><a href="#base-base_shadowed">base::base_shadowed</a></h2>
 <div>
 <span>This function should shadow the excluded_base function.</span>
 
@@ -163,7 +163,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="base-derived_shadowed"><a href="#base">base</a>::derived_shadowed</h2>
+<h2 id="base-derived_shadowed"><a href="#base-derived_shadowed">base::derived_shadowed</a></h2>
 <div>
 <span>This function should be shadowed by derived classes.</span>
 
@@ -187,7 +187,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="base-do_base_inherited"><a href="#base">base</a>::do_base_inherited</h2>
+<h2 id="base-do_base_inherited"><a href="#base-do_base_inherited">base::do_base_inherited</a></h2>
 <div>
 <span>This function should be inherited by derived classes.</span>
 
@@ -211,7 +211,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="base-do_base_shadowed"><a href="#base">base</a>::do_base_shadowed</h2>
+<h2 id="base-do_base_shadowed"><a href="#base-do_base_shadowed">base::do_base_shadowed</a></h2>
 <div>
 <span>This function should shadow the excluded_base function.</span>
 
@@ -235,7 +235,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="base-do_derived_shadowed"><a href="#base">base</a>::do_derived_shadowed</h2>
+<h2 id="base-do_derived_shadowed"><a href="#base-do_derived_shadowed">base::do_derived_shadowed</a></h2>
 <div>
 <span>This function should be shadowed by derived classes.</span>
 
@@ -259,7 +259,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="base_base">base_base</h2>
+<h2 id="base_base"><a href="#base_base">base_base</a></h2>
 <div>
 <span>A second-order base class to test indirect inheritance</span>
 
@@ -310,7 +310,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="base_base-base_base_inherited"><a href="#base_base">base_base</a>::base_base_inherited</h2>
+<h2 id="base_base-base_base_inherited"><a href="#base_base-base_base_inherited">base_base::base_base_inherited</a></h2>
 <div>
 <span>This function should be indirectly inherited by derived classes.</span>
 
@@ -334,7 +334,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="base_base-do_base_base_inherited"><a href="#base_base">base_base</a>::do_base_base_inherited</h2>
+<h2 id="base_base-do_base_base_inherited"><a href="#base_base-do_base_base_inherited">base_base::do_base_base_inherited</a></h2>
 <div>
 <span>This function should be indirectly inherited by derived classes.</span>
 
@@ -358,7 +358,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="derived">derived</h2>
+<h2 id="derived"><a href="#derived">derived</a></h2>
 <div>
 <span>A class that derives from base and excluded_base</span>
 
@@ -431,7 +431,7 @@ <h2>Protected Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="derived-derived_shadowed"><a href="#derived">derived</a>::derived_shadowed</h2>
+<h2 id="derived-derived_shadowed"><a href="#derived-derived_shadowed">derived::derived_shadowed</a></h2>
 <div>
 <span>This function should shadow the base class function.</span>
 
@@ -455,7 +455,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="derived-do_derived_shadowed"><a href="#derived">derived</a>::do_derived_shadowed</h2>
+<h2 id="derived-do_derived_shadowed"><a href="#derived-do_derived_shadowed">derived::do_derived_shadowed</a></h2>
 <div>
 <span>This function should shadow the base class function.</span>
 
@@ -479,7 +479,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="private_derived">private_derived</h2>
+<h2 id="private_derived"><a href="#private_derived">private_derived</a></h2>
 <div>
 <span>A class that uses private inheritance only</span>
 
@@ -517,7 +517,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="private_derived-derived_shadowed"><a href="#private_derived">private_derived</a>::derived_shadowed</h2>
+<h2 id="private_derived-derived_shadowed"><a href="#private_derived-derived_shadowed">private_derived::derived_shadowed</a></h2>
 <div>
 <span>This function should shadow the base class function.</span>
 
@@ -541,7 +541,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="private_derived-do_derived_shadowed"><a href="#private_derived">private_derived</a>::do_derived_shadowed</h2>
+<h2 id="private_derived-do_derived_shadowed"><a href="#private_derived-do_derived_shadowed">private_derived::do_derived_shadowed</a></h2>
 <div>
 <span>This function should shadow the base class function.</span>
 
@@ -565,7 +565,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="protected_derived">protected_derived</h2>
+<h2 id="protected_derived"><a href="#protected_derived">protected_derived</a></h2>
 <div>
 <span>A class that should inherit functions as protected.</span>
 
@@ -624,7 +624,7 @@ <h2>Protected Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="protected_derived-derived_shadowed"><a href="#protected_derived">protected_derived</a>::derived_shadowed</h2>
+<h2 id="protected_derived-derived_shadowed"><a href="#protected_derived-derived_shadowed">protected_derived::derived_shadowed</a></h2>
 <div>
 <span>This function should shadow the base class function.</span>
 
@@ -648,7 +648,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="protected_derived-do_derived_shadowed"><a href="#protected_derived">protected_derived</a>::do_derived_shadowed</h2>
+<h2 id="protected_derived-do_derived_shadowed"><a href="#protected_derived-do_derived_shadowed">protected_derived::do_derived_shadowed</a></h2>
 <div>
 <span>This function should shadow the base class function.</span>
 
diff --git a/test-files/golden-tests/config/inherit-base-members/skip-special.html b/test-files/golden-tests/config/inherit-base-members/skip-special.html
index 3c55f9be1..616ed6ea9 100644
--- a/test-files/golden-tests/config/inherit-base-members/skip-special.html
+++ b/test-files/golden-tests/config/inherit-base-members/skip-special.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -30,7 +30,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="base">base</h2>
+<h2 id="base"><a href="#base">base</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -113,7 +113,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="base-2constructor"><a href="#base">base</a>::base</h2>
+<h2 id="base-2constructor"><a href="#base-2constructor">base::base</a></h2>
 <div>
 <span>Constructor should not be inherited</span>
 
@@ -132,7 +132,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="base-2destructor"><a href="#base">base</a>::~base</h2>
+<h2 id="base-2destructor"><a href="#base-2destructor">base::~base</a></h2>
 <div>
 <span>Destructor should not be inherited</span>
 
@@ -151,7 +151,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="base-base_inherited"><a href="#base">base</a>::base_inherited</h2>
+<h2 id="base-base_inherited"><a href="#base-base_inherited">base::base_inherited</a></h2>
 <div>
 <span>This function should be inherited by derived classes.</span>
 
@@ -171,7 +171,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="base-base_shadowed"><a href="#base">base</a>::base_shadowed</h2>
+<h2 id="base-base_shadowed"><a href="#base-base_shadowed">base::base_shadowed</a></h2>
 <div>
 <span>This function should shadow the excluded_base function.</span>
 
@@ -191,7 +191,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="base-derived_shadowed"><a href="#base">base</a>::derived_shadowed</h2>
+<h2 id="base-derived_shadowed"><a href="#base-derived_shadowed">base::derived_shadowed</a></h2>
 <div>
 <span>This function should be shadowed by derived classes.</span>
 
@@ -211,7 +211,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="base-do_base_inherited"><a href="#base">base</a>::do_base_inherited</h2>
+<h2 id="base-do_base_inherited"><a href="#base-do_base_inherited">base::do_base_inherited</a></h2>
 <div>
 <span>This function should be inherited by derived classes.</span>
 
@@ -231,7 +231,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="base-do_base_shadowed"><a href="#base">base</a>::do_base_shadowed</h2>
+<h2 id="base-do_base_shadowed"><a href="#base-do_base_shadowed">base::do_base_shadowed</a></h2>
 <div>
 <span>This function should shadow the excluded_base function.</span>
 
@@ -251,7 +251,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="base-do_derived_shadowed"><a href="#base">base</a>::do_derived_shadowed</h2>
+<h2 id="base-do_derived_shadowed"><a href="#base-do_derived_shadowed">base::do_derived_shadowed</a></h2>
 <div>
 <span>This function should be shadowed by derived classes.</span>
 
@@ -271,7 +271,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="base_base">base_base</h2>
+<h2 id="base_base"><a href="#base_base">base_base</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -320,7 +320,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="base_base-2constructor"><a href="#base_base">base_base</a>::base_base</h2>
+<h2 id="base_base-2constructor"><a href="#base_base-2constructor">base_base::base_base</a></h2>
 <div>
 <span>Constructor should not be inherited</span>
 
@@ -339,7 +339,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="base_base-2destructor"><a href="#base_base">base_base</a>::~base_base</h2>
+<h2 id="base_base-2destructor"><a href="#base_base-2destructor">base_base::~base_base</a></h2>
 <div>
 <span>Destructor should not be inherited</span>
 
@@ -358,7 +358,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="base_base-base_base_inherited"><a href="#base_base">base_base</a>::base_base_inherited</h2>
+<h2 id="base_base-base_base_inherited"><a href="#base_base-base_base_inherited">base_base::base_base_inherited</a></h2>
 <div>
 <span>This function should be indirectly inherited by derived classes.</span>
 
@@ -378,7 +378,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="base_base-do_base_base_inherited"><a href="#base_base">base_base</a>::do_base_base_inherited</h2>
+<h2 id="base_base-do_base_base_inherited"><a href="#base_base-do_base_base_inherited">base_base::do_base_base_inherited</a></h2>
 <div>
 <span>This function should be indirectly inherited by derived classes.</span>
 
@@ -398,7 +398,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="derived">derived</h2>
+<h2 id="derived"><a href="#derived">derived</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -472,7 +472,7 @@ <h2>Protected Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="derived-2constructor"><a href="#derived">derived</a>::derived</h2>
+<h2 id="derived-2constructor"><a href="#derived-2constructor">derived::derived</a></h2>
 <div>
 <span>Constructor should not be inherited</span>
 
@@ -491,7 +491,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="derived-2destructor"><a href="#derived">derived</a>::~derived</h2>
+<h2 id="derived-2destructor"><a href="#derived-2destructor">derived::~derived</a></h2>
 <div>
 <span>Destructor should not be inherited</span>
 
@@ -510,7 +510,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="derived-derived_shadowed"><a href="#derived">derived</a>::derived_shadowed</h2>
+<h2 id="derived-derived_shadowed"><a href="#derived-derived_shadowed">derived::derived_shadowed</a></h2>
 <div>
 <span>This function should shadow the base class function.</span>
 
@@ -530,7 +530,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="derived-do_derived_shadowed"><a href="#derived">derived</a>::do_derived_shadowed</h2>
+<h2 id="derived-do_derived_shadowed"><a href="#derived-do_derived_shadowed">derived::do_derived_shadowed</a></h2>
 <div>
 <span>This function should shadow the base class function.</span>
 
@@ -550,7 +550,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="derived-excluded_inherited"><a href="#derived">derived</a>::excluded_inherited</h2>
+<h2 id="derived-excluded_inherited"><a href="#derived-excluded_inherited">derived::excluded_inherited</a></h2>
 <div>
 <span>This function should be inherited by derived classes.</span>
 
@@ -570,7 +570,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="derived-do_excluded_inherited"><a href="#derived">derived</a>::do_excluded_inherited</h2>
+<h2 id="derived-do_excluded_inherited"><a href="#derived-do_excluded_inherited">derived::do_excluded_inherited</a></h2>
 <div>
 <span>This function should be inherited by derived classes.</span>
 
@@ -590,7 +590,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="derived-do_shadowed"><a href="#derived">derived</a>::do_shadowed</h2>
+<h2 id="derived-do_shadowed"><a href="#derived-do_shadowed">derived::do_shadowed</a></h2>
 <div>
 <span>This function should be shadowed by derived classes.</span>
 
@@ -610,7 +610,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="private_derived">private_derived</h2>
+<h2 id="private_derived"><a href="#private_derived">private_derived</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -646,7 +646,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="private_derived-2constructor"><a href="#private_derived">private_derived</a>::private_derived</h2>
+<h2 id="private_derived-2constructor"><a href="#private_derived-2constructor">private_derived::private_derived</a></h2>
 <div>
 <span>Constructor should not be inherited</span>
 
@@ -665,7 +665,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="private_derived-2destructor"><a href="#private_derived">private_derived</a>::~private_derived</h2>
+<h2 id="private_derived-2destructor"><a href="#private_derived-2destructor">private_derived::~private_derived</a></h2>
 <div>
 <span>Destructor should not be inherited</span>
 
@@ -684,7 +684,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="private_derived-derived_shadowed"><a href="#private_derived">private_derived</a>::derived_shadowed</h2>
+<h2 id="private_derived-derived_shadowed"><a href="#private_derived-derived_shadowed">private_derived::derived_shadowed</a></h2>
 <div>
 <span>This function should shadow the base class function.</span>
 
@@ -704,7 +704,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="private_derived-do_derived_shadowed"><a href="#private_derived">private_derived</a>::do_derived_shadowed</h2>
+<h2 id="private_derived-do_derived_shadowed"><a href="#private_derived-do_derived_shadowed">private_derived::do_derived_shadowed</a></h2>
 <div>
 <span>This function should shadow the base class function.</span>
 
@@ -724,7 +724,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="protected_derived">protected_derived</h2>
+<h2 id="protected_derived"><a href="#protected_derived">protected_derived</a></h2>
 <div>
 <span>Should inherit functions as protected.</span>
 
@@ -788,7 +788,7 @@ <h2>Protected Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="protected_derived-2constructor"><a href="#protected_derived">protected_derived</a>::protected_derived</h2>
+<h2 id="protected_derived-2constructor"><a href="#protected_derived-2constructor">protected_derived::protected_derived</a></h2>
 <div>
 <span>Constructor should not be inherited</span>
 
@@ -807,7 +807,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="protected_derived-2destructor"><a href="#protected_derived">protected_derived</a>::~protected_derived</h2>
+<h2 id="protected_derived-2destructor"><a href="#protected_derived-2destructor">protected_derived::~protected_derived</a></h2>
 <div>
 <span>Destructor should not be inherited</span>
 
@@ -826,7 +826,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="protected_derived-derived_shadowed"><a href="#protected_derived">protected_derived</a>::derived_shadowed</h2>
+<h2 id="protected_derived-derived_shadowed"><a href="#protected_derived-derived_shadowed">protected_derived::derived_shadowed</a></h2>
 <div>
 <span>This function should shadow the base class function.</span>
 
@@ -850,7 +850,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="protected_derived-do_derived_shadowed"><a href="#protected_derived">protected_derived</a>::do_derived_shadowed</h2>
+<h2 id="protected_derived-do_derived_shadowed"><a href="#protected_derived-do_derived_shadowed">protected_derived::do_derived_shadowed</a></h2>
 <div>
 <span>This function should shadow the base class function.</span>
 
@@ -874,7 +874,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="protected_derived-do_excluded_inherited"><a href="#protected_derived">protected_derived</a>::do_excluded_inherited</h2>
+<h2 id="protected_derived-do_excluded_inherited"><a href="#protected_derived-do_excluded_inherited">protected_derived::do_excluded_inherited</a></h2>
 <div>
 <span>This function should be inherited by derived classes.</span>
 
@@ -894,7 +894,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="protected_derived-do_shadowed"><a href="#protected_derived">protected_derived</a>::do_shadowed</h2>
+<h2 id="protected_derived-do_shadowed"><a href="#protected_derived-do_shadowed">protected_derived::do_shadowed</a></h2>
 <div>
 <span>This function should be shadowed by derived classes.</span>
 
@@ -914,7 +914,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="protected_derived-excluded_inherited"><a href="#protected_derived">protected_derived</a>::excluded_inherited</h2>
+<h2 id="protected_derived-excluded_inherited"><a href="#protected_derived-excluded_inherited">protected_derived::excluded_inherited</a></h2>
 <div>
 <span>This function should be inherited by derived classes.</span>
 
diff --git a/test-files/golden-tests/config/legible-names/constructor.html b/test-files/golden-tests/config/legible-names/constructor.html
index 82250f571..7c1cd5b8d 100644
--- a/test-files/golden-tests/config/legible-names/constructor.html
+++ b/test-files/golden-tests/config/legible-names/constructor.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,7 +25,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="X">X</h2>
+<h2 id="X"><a href="#X">X</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -56,7 +56,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="X-2constructor-08"><a href="#X">X</a>::X</h2>
+<h2 id="X-2constructor-08"><a href="#X-2constructor-08">X::X</a></h2>
 <div>
 <span>Constructors</span>
 
@@ -106,7 +106,7 @@ <h3>Synopses</h3>
 </div>
 <div>
 <div>
-<h2 id="X-2constructor-0e8"><a href="#X">X</a>::X</h2>
+<h2 id="X-2constructor-0e8"><a href="#X-2constructor-0e8">X::X</a></h2>
 <div>
 <span>Default constructor</span>
 
@@ -125,7 +125,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="X-2constructor-0e0"><a href="#X">X</a>::X</h2>
+<h2 id="X-2constructor-0e0"><a href="#X-2constructor-0e0">X::X</a></h2>
 <div>
 <span>Copy constructor</span>
 
@@ -161,7 +161,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="X-2constructor-069"><a href="#X">X</a>::X</h2>
+<h2 id="X-2constructor-069"><a href="#X-2constructor-069">X::X</a></h2>
 <div>
 <span>Move constructor</span>
 
@@ -197,7 +197,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="X-2constructor-07"><a href="#X">X</a>::X</h2>
+<h2 id="X-2constructor-07"><a href="#X-2constructor-07">X::X</a></h2>
 <div>
 <span>Construct from <code>int</code></span>
 
@@ -233,7 +233,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="X-2constructor-06f"><a href="#X">X</a>::X</h2>
+<h2 id="X-2constructor-06f"><a href="#X-2constructor-06f">X::X</a></h2>
 <div>
 <span>Construct from <code>double</code></span>
 
diff --git a/test-files/golden-tests/config/overloads/const-mutable.html b/test-files/golden-tests/config/overloads/const-mutable.html
index 250a91c33..c452d5f7e 100644
--- a/test-files/golden-tests/config/overloads/const-mutable.html
+++ b/test-files/golden-tests/config/overloads/const-mutable.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,7 +25,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="C">C</h2>
+<h2 id="C"><a href="#C">C</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -56,7 +56,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="C-foo-0e"><a href="#C">C</a>::foo</h2>
+<h2 id="C-foo-0e"><a href="#C-foo-0e">C::foo</a></h2>
 </div>
 <div>
 <h3>Synopses</h3>
@@ -83,7 +83,7 @@ <h3>Synopses</h3>
 </div>
 <div>
 <div>
-<h2 id="C-foo-0b"><a href="#C">C</a>::foo</h2>
+<h2 id="C-foo-0b"><a href="#C-foo-0b">C::foo</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -99,7 +99,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="C-foo-07"><a href="#C">C</a>::foo</h2>
+<h2 id="C-foo-07"><a href="#C-foo-07">C::foo</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/config/overloads/visibility.html b/test-files/golden-tests/config/overloads/visibility.html
index a185063a1..6087eb42f 100644
--- a/test-files/golden-tests/config/overloads/visibility.html
+++ b/test-files/golden-tests/config/overloads/visibility.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,7 +25,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="C">C</h2>
+<h2 id="C"><a href="#C">C</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -98,7 +98,7 @@ <h2>Protected Static Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="C-foo-0e"><a href="#C">C</a>::foo</h2>
+<h2 id="C-foo-0e"><a href="#C-foo-0e">C::foo</a></h2>
 </div>
 <div>
 <h3>Synopses</h3>
@@ -125,7 +125,7 @@ <h3>Synopses</h3>
 </div>
 <div>
 <div>
-<h2 id="C-foo-0b"><a href="#C">C</a>::foo</h2>
+<h2 id="C-foo-0b"><a href="#C-foo-0b">C::foo</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -141,7 +141,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="C-foo-06"><a href="#C">C</a>::foo</h2>
+<h2 id="C-foo-06"><a href="#C-foo-06">C::foo</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -157,7 +157,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="C-foo-03"><a href="#C">C</a>::foo</h2>
+<h2 id="C-foo-03"><a href="#C-foo-03">C::foo</a></h2>
 </div>
 <div>
 <h3>Synopses</h3>
@@ -188,7 +188,7 @@ <h3>Synopses</h3>
 </div>
 <div>
 <div>
-<h2 id="C-foo-0fc"><a href="#C">C</a>::foo</h2>
+<h2 id="C-foo-0fc"><a href="#C-foo-0fc">C::foo</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -205,7 +205,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="C-foo-05"><a href="#C">C</a>::foo</h2>
+<h2 id="C-foo-05"><a href="#C-foo-05">C::foo</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -224,7 +224,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="C-foo-04c"><a href="#C">C</a>::foo</h2>
+<h2 id="C-foo-04c"><a href="#C-foo-04c">C::foo</a></h2>
 </div>
 <div>
 <h3>Synopses</h3>
@@ -256,7 +256,7 @@ <h3>Synopses</h3>
 </div>
 <div>
 <div>
-<h2 id="C-foo-0a"><a href="#C">C</a>::foo</h2>
+<h2 id="C-foo-0a"><a href="#C-foo-0a">C::foo</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -274,7 +274,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="C-foo-0c"><a href="#C">C</a>::foo</h2>
+<h2 id="C-foo-0c"><a href="#C-foo-0c">C::foo</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -293,7 +293,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="C-foo-048"><a href="#C">C</a>::foo</h2>
+<h2 id="C-foo-048"><a href="#C-foo-048">C::foo</a></h2>
 </div>
 <div>
 <h3>Synopses</h3>
@@ -329,7 +329,7 @@ <h3>Synopses</h3>
 </div>
 <div>
 <div>
-<h2 id="C-foo-00"><a href="#C">C</a>::foo</h2>
+<h2 id="C-foo-00"><a href="#C-foo-00">C::foo</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -349,7 +349,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="C-foo-0f5"><a href="#C">C</a>::foo</h2>
+<h2 id="C-foo-0f5"><a href="#C-foo-0f5">C::foo</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/config/sfinae/redeclare.html b/test-files/golden-tests/config/sfinae/redeclare.html
index dd8d67da0..07e4c1004 100644
--- a/test-files/golden-tests/config/sfinae/redeclare.html
+++ b/test-files/golden-tests/config/sfinae/redeclare.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,7 +25,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="f">f</h2>
+<h2 id="f"><a href="#f">f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/config/sfinae/return-based.html b/test-files/golden-tests/config/sfinae/return-based.html
index 6fa9f3ce7..cf2c47ee2 100644
--- a/test-files/golden-tests/config/sfinae/return-based.html
+++ b/test-files/golden-tests/config/sfinae/return-based.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,7 +25,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="f">f</h2>
+<h2 id="f"><a href="#f">f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/config/show-namespaces/show-namespaces.html b/test-files/golden-tests/config/show-namespaces/show-namespaces.html
index f36e1dfbd..7ff54fa93 100644
--- a/test-files/golden-tests/config/show-namespaces/show-namespaces.html
+++ b/test-files/golden-tests/config/show-namespaces/show-namespaces.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="A-B-c">A::B::c</h2>
+<h2 id="A-B-c"><a href="#A-B-c">A::B::c</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -23,7 +23,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-b">A::b</h2>
+<h2 id="A-b"><a href="#A-b">A::b</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -39,7 +39,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="a">a</h2>
+<h2 id="a"><a href="#a">a</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/config/sort/sort-members.adoc b/test-files/golden-tests/config/sort/sort-members.adoc
index e68aedcd9..55ac3ec0f 100644
--- a/test-files/golden-tests/config/sort/sort-members.adoc
+++ b/test-files/golden-tests/config/sort/sort-members.adoc
@@ -68,7 +68,7 @@ struct B;
 ----
 
 [#B-04]
-== B&lt;int, char&gt;
+== <<B-0b,B>>&lt;int, char&gt;
 
 === Synopsis
 
@@ -81,7 +81,7 @@ struct <<B-0b,B>>&lt;int, char&gt;;
 ----
 
 [#B-05]
-== B&lt;int, U&gt;
+== <<B-0b,B>>&lt;int, U&gt;
 
 === Synopsis
 
@@ -109,7 +109,7 @@ struct C;
 ----
 
 [#C-03]
-== C&lt;int&gt;
+== <<C-0f,C>>&lt;int&gt;
 
 === Synopsis
 
@@ -122,7 +122,7 @@ struct <<C-0f,C>>&lt;int&gt;;
 ----
 
 [#C-0d]
-== C&lt;int, char&gt;
+== <<C-0f,C>>&lt;int, char&gt;
 
 === Synopsis
 
@@ -488,7 +488,7 @@ char
 ----
 template&lt;&gt;
 char
-<<g-0e4,g>>&lt;int&gt;(
+<<g-0e4,g&lt;int&gt;>>(
     int,
     int,
     int);
@@ -584,7 +584,7 @@ g(
 ----
 
 [#g-0e4]
-== g&lt;int&gt;
+== <<g-03c,g>>&lt;int&gt;
 
 === Synopsis
 
diff --git a/test-files/golden-tests/config/sort/sort-members.html b/test-files/golden-tests/config/sort/sort-members.html
index 872608ad1..20246e901 100644
--- a/test-files/golden-tests/config/sort/sort-members.html
+++ b/test-files/golden-tests/config/sort/sort-members.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -52,7 +52,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -69,7 +69,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="B-0b">B</h2>
+<h2 id="B-0b"><a href="#B-0b">B</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -89,7 +89,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="B-04">B&lt;int, char&gt;</h2>
+<h2 id="B-04"><a href="#B-04">B&lt;int, char&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -107,7 +107,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="B-05">B&lt;int, U&gt;</h2>
+<h2 id="B-05"><a href="#B-05">B&lt;int, U&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -125,7 +125,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="C-0f">C</h2>
+<h2 id="C-0f"><a href="#C-0f">C</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -145,7 +145,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="C-03">C&lt;int&gt;</h2>
+<h2 id="C-03"><a href="#C-03">C&lt;int&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -163,7 +163,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="C-0d">C&lt;int, char&gt;</h2>
+<h2 id="C-0d"><a href="#C-0d">C&lt;int, char&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -181,7 +181,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="D">D</h2>
+<h2 id="D"><a href="#D">D</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -198,7 +198,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="Z">Z</h2>
+<h2 id="Z"><a href="#Z">Z</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -236,7 +236,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="Z-2constructor-00"><a href="#Z">Z</a>::Z</h2>
+<h2 id="Z-2constructor-00"><a href="#Z-2constructor-00">Z::Z</a></h2>
 <div>
 <span>Constructors</span>
 
@@ -265,7 +265,7 @@ <h3>Synopses</h3>
 </div>
 <div>
 <div>
-<h2 id="Z-2constructor-05"><a href="#Z">Z</a>::Z</h2>
+<h2 id="Z-2constructor-05"><a href="#Z-2constructor-05">Z::Z</a></h2>
 <div>
 <span>Default constructor</span>
 
@@ -284,7 +284,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="Z-2constructor-06"><a href="#Z">Z</a>::Z</h2>
+<h2 id="Z-2constructor-06"><a href="#Z-2constructor-06">Z::Z</a></h2>
 <div>
 <span>Construct from <code>int</code></span>
 
@@ -320,7 +320,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="Z-2destructor"><a href="#Z">Z</a>::~Z</h2>
+<h2 id="Z-2destructor"><a href="#Z-2destructor">Z::~Z</a></h2>
 <div>
 <span>Destructor</span>
 
@@ -339,7 +339,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="Z-foo"><a href="#Z">Z</a>::foo</h2>
+<h2 id="Z-foo"><a href="#Z-foo">Z::foo</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -355,7 +355,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="Z-2conversion"><a href="#Z">Z</a>::operator bool</h2>
+<h2 id="Z-2conversion"><a href="#Z-2conversion">Z::operator bool</a></h2>
 <div>
 <span>Conversion to <code>bool</code></span>
 
@@ -378,7 +378,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="Z-operator_not"><a href="#Z">Z</a>::operator!</h2>
+<h2 id="Z-operator_not"><a href="#Z-operator_not">Z::operator!</a></h2>
 <div>
 <span>Negation operator</span>
 
@@ -402,7 +402,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="Z-operator_eq"><a href="#Z">Z</a>::operator&#x3D;&#x3D;</h2>
+<h2 id="Z-operator_eq"><a href="#Z-operator_eq">Z::operator&#x3D;&#x3D;</a></h2>
 <div>
 <span>Equality operator</span>
 
@@ -443,7 +443,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="Z-operator_not_eq"><a href="#Z">Z</a>::operator!&#x3D;</h2>
+<h2 id="Z-operator_not_eq"><a href="#Z-operator_not_eq">Z::operator!&#x3D;</a></h2>
 <div>
 <span>Inequality operator</span>
 
@@ -484,7 +484,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="Z-operator_3way"><a href="#Z">Z</a>::operator&lt;&#x3D;&gt;</h2>
+<h2 id="Z-operator_3way"><a href="#Z-operator_3way">Z::operator&lt;&#x3D;&gt;</a></h2>
 <div>
 <span>Three-way comparison operator</span>
 
@@ -525,7 +525,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="f">f</h2>
+<h2 id="f"><a href="#f">f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -541,7 +541,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="g-0f">g</h2>
+<h2 id="g-0f"><a href="#g-0f">g</a></h2>
 </div>
 <div>
 <h3>Synopses</h3>
@@ -609,7 +609,7 @@ <h3>Synopses</h3>
 <code class="source-code cpp">
 template&lt;&gt;
 char
-<a href="#g-0e4">g</a>&lt;int&gt;(
+<a href="#g-0e4">g&lt;int&gt;</a>(
     int,
     int,
     int);
@@ -621,7 +621,7 @@ <h3>Synopses</h3>
 </div>
 <div>
 <div>
-<h2 id="g-0e3">g</h2>
+<h2 id="g-0e3"><a href="#g-0e3">g</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -637,7 +637,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="g-04">g</h2>
+<h2 id="g-04"><a href="#g-04">g</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -653,7 +653,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="g-06">g</h2>
+<h2 id="g-06"><a href="#g-06">g</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -669,7 +669,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="g-03a">g</h2>
+<h2 id="g-03a"><a href="#g-03a">g</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -687,7 +687,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="g-0a">g</h2>
+<h2 id="g-0a"><a href="#g-0a">g</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -706,7 +706,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="g-03c">g</h2>
+<h2 id="g-03c"><a href="#g-03c">g</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -726,7 +726,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="g-0e4">g&lt;int&gt;</h2>
+<h2 id="g-0e4"><a href="#g-0e4">g&lt;int&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -746,7 +746,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="h">h</h2>
+<h2 id="h"><a href="#h">h</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -762,7 +762,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="operator_not">operator!</h2>
+<h2 id="operator_not"><a href="#operator_not">operator!</a></h2>
 <div>
 <span>Negation operator</span>
 
@@ -803,7 +803,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="operator_eq">operator&#x3D;&#x3D;</h2>
+<h2 id="operator_eq"><a href="#operator_eq">operator&#x3D;&#x3D;</a></h2>
 <div>
 <span>Equality operator</span>
 
@@ -850,7 +850,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="operator_not_eq">operator!&#x3D;</h2>
+<h2 id="operator_not_eq"><a href="#operator_not_eq">operator!&#x3D;</a></h2>
 <div>
 <span>Inequality operator</span>
 
diff --git a/test-files/golden-tests/config/sort/unordered.adoc b/test-files/golden-tests/config/sort/unordered.adoc
index 679a6ac0a..066f166ef 100644
--- a/test-files/golden-tests/config/sort/unordered.adoc
+++ b/test-files/golden-tests/config/sort/unordered.adoc
@@ -68,7 +68,7 @@ struct C;
 ----
 
 [#C-0d]
-== C&lt;int, char&gt;
+== <<C-0f,C>>&lt;int, char&gt;
 
 === Synopsis
 
@@ -81,7 +81,7 @@ struct <<C-0f,C>>&lt;int, char&gt;;
 ----
 
 [#C-03]
-== C&lt;int&gt;
+== <<C-0f,C>>&lt;int&gt;
 
 === Synopsis
 
@@ -109,7 +109,7 @@ struct B;
 ----
 
 [#B-04]
-== B&lt;int, char&gt;
+== <<B-0b,B>>&lt;int, char&gt;
 
 === Synopsis
 
@@ -122,7 +122,7 @@ struct <<B-0b,B>>&lt;int, char&gt;;
 ----
 
 [#B-05]
-== B&lt;int, U&gt;
+== <<B-0b,B>>&lt;int, U&gt;
 
 === Synopsis
 
@@ -533,7 +533,7 @@ char
 ----
 template&lt;&gt;
 char
-<<g-0e4,g>>&lt;int&gt;(
+<<g-0e4,g&lt;int&gt;>>(
     int,
     int,
     int);
@@ -609,7 +609,7 @@ g(
 ----
 
 [#g-0e4]
-== g&lt;int&gt;
+== <<g-03c,g>>&lt;int&gt;
 
 === Synopsis
 
diff --git a/test-files/golden-tests/config/sort/unordered.html b/test-files/golden-tests/config/sort/unordered.html
index 63ffee98f..48e4bae0e 100644
--- a/test-files/golden-tests/config/sort/unordered.html
+++ b/test-files/golden-tests/config/sort/unordered.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -52,7 +52,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="D">D</h2>
+<h2 id="D"><a href="#D">D</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -69,7 +69,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="C-0f">C</h2>
+<h2 id="C-0f"><a href="#C-0f">C</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -89,7 +89,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="C-0d">C&lt;int, char&gt;</h2>
+<h2 id="C-0d"><a href="#C-0d">C&lt;int, char&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -107,7 +107,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="C-03">C&lt;int&gt;</h2>
+<h2 id="C-03"><a href="#C-03">C&lt;int&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -125,7 +125,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="B-0b">B</h2>
+<h2 id="B-0b"><a href="#B-0b">B</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -145,7 +145,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="B-04">B&lt;int, char&gt;</h2>
+<h2 id="B-04"><a href="#B-04">B&lt;int, char&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -163,7 +163,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="B-05">B&lt;int, U&gt;</h2>
+<h2 id="B-05"><a href="#B-05">B&lt;int, U&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -181,7 +181,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -198,7 +198,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="Z">Z</h2>
+<h2 id="Z"><a href="#Z">Z</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -236,7 +236,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="Z-operator_3way"><a href="#Z">Z</a>::operator&lt;&#x3D;&gt;</h2>
+<h2 id="Z-operator_3way"><a href="#Z-operator_3way">Z::operator&lt;&#x3D;&gt;</a></h2>
 <div>
 <span>Three-way comparison operator</span>
 
@@ -277,7 +277,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="Z-operator_not_eq"><a href="#Z">Z</a>::operator!&#x3D;</h2>
+<h2 id="Z-operator_not_eq"><a href="#Z-operator_not_eq">Z::operator!&#x3D;</a></h2>
 <div>
 <span>Inequality operator</span>
 
@@ -318,7 +318,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="Z-operator_eq"><a href="#Z">Z</a>::operator&#x3D;&#x3D;</h2>
+<h2 id="Z-operator_eq"><a href="#Z-operator_eq">Z::operator&#x3D;&#x3D;</a></h2>
 <div>
 <span>Equality operator</span>
 
@@ -359,7 +359,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="Z-operator_not"><a href="#Z">Z</a>::operator!</h2>
+<h2 id="Z-operator_not"><a href="#Z-operator_not">Z::operator!</a></h2>
 <div>
 <span>Negation operator</span>
 
@@ -383,7 +383,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="Z-2conversion"><a href="#Z">Z</a>::operator bool</h2>
+<h2 id="Z-2conversion"><a href="#Z-2conversion">Z::operator bool</a></h2>
 <div>
 <span>Conversion to <code>bool</code></span>
 
@@ -406,7 +406,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="Z-foo"><a href="#Z">Z</a>::foo</h2>
+<h2 id="Z-foo"><a href="#Z-foo">Z::foo</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -422,7 +422,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="Z-2destructor"><a href="#Z">Z</a>::~Z</h2>
+<h2 id="Z-2destructor"><a href="#Z-2destructor">Z::~Z</a></h2>
 <div>
 <span>Destructor</span>
 
@@ -441,7 +441,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="Z-2constructor-00"><a href="#Z">Z</a>::Z</h2>
+<h2 id="Z-2constructor-00"><a href="#Z-2constructor-00">Z::Z</a></h2>
 <div>
 <span>Constructors</span>
 
@@ -470,7 +470,7 @@ <h3>Synopses</h3>
 </div>
 <div>
 <div>
-<h2 id="Z-2constructor-06"><a href="#Z">Z</a>::Z</h2>
+<h2 id="Z-2constructor-06"><a href="#Z-2constructor-06">Z::Z</a></h2>
 <div>
 <span>Construct from <code>int</code></span>
 
@@ -506,7 +506,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="Z-2constructor-05"><a href="#Z">Z</a>::Z</h2>
+<h2 id="Z-2constructor-05"><a href="#Z-2constructor-05">Z::Z</a></h2>
 <div>
 <span>Default constructor</span>
 
@@ -525,7 +525,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="operator_not_eq">operator!&#x3D;</h2>
+<h2 id="operator_not_eq"><a href="#operator_not_eq">operator!&#x3D;</a></h2>
 <div>
 <span>Inequality operator</span>
 
@@ -572,7 +572,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="operator_eq">operator&#x3D;&#x3D;</h2>
+<h2 id="operator_eq"><a href="#operator_eq">operator&#x3D;&#x3D;</a></h2>
 <div>
 <span>Equality operator</span>
 
@@ -619,7 +619,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="operator_not">operator!</h2>
+<h2 id="operator_not"><a href="#operator_not">operator!</a></h2>
 <div>
 <span>Negation operator</span>
 
@@ -660,7 +660,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="h">h</h2>
+<h2 id="h"><a href="#h">h</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -676,7 +676,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="g-0f">g</h2>
+<h2 id="g-0f"><a href="#g-0f">g</a></h2>
 </div>
 <div>
 <h3>Synopses</h3>
@@ -699,7 +699,7 @@ <h3>Synopses</h3>
 <code class="source-code cpp">
 template&lt;&gt;
 char
-<a href="#g-0e4">g</a>&lt;int&gt;(
+<a href="#g-0e4">g&lt;int&gt;</a>(
     int,
     int,
     int);
@@ -756,7 +756,7 @@ <h3>Synopses</h3>
 </div>
 <div>
 <div>
-<h2 id="g-03c">g</h2>
+<h2 id="g-03c"><a href="#g-03c">g</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -776,7 +776,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="g-0e4">g&lt;int&gt;</h2>
+<h2 id="g-0e4"><a href="#g-0e4">g&lt;int&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -796,7 +796,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="g-0a">g</h2>
+<h2 id="g-0a"><a href="#g-0a">g</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -815,7 +815,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="g-03a">g</h2>
+<h2 id="g-03a"><a href="#g-03a">g</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -833,7 +833,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="g-06">g</h2>
+<h2 id="g-06"><a href="#g-06">g</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -849,7 +849,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="g-04">g</h2>
+<h2 id="g-04"><a href="#g-04">g</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -865,7 +865,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="g-0e3">g</h2>
+<h2 id="g-0e3"><a href="#g-0e3">g</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -881,7 +881,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f">f</h2>
+<h2 id="f"><a href="#f">f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/core/empty.html b/test-files/golden-tests/core/empty.html
index 2f92faa1e..1ee3b8055 100644
--- a/test-files/golden-tests/core/empty.html
+++ b/test-files/golden-tests/core/empty.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 </div>
 
diff --git a/test-files/golden-tests/core/libcxx.html b/test-files/golden-tests/core/libcxx.html
index 27312a96d..7235f3f2b 100644
--- a/test-files/golden-tests/core/libcxx.html
+++ b/test-files/golden-tests/core/libcxx.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -26,7 +26,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="sqrt">sqrt</h2>
+<h2 id="sqrt"><a href="#sqrt">sqrt</a></h2>
 <div>
 <span>Computes the square root of an integral value.</span>
 
diff --git a/test-files/golden-tests/core/utf-8.html b/test-files/golden-tests/core/utf-8.html
index 709706fa4..3e98213a2 100644
--- a/test-files/golden-tests/core/utf-8.html
+++ b/test-files/golden-tests/core/utf-8.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,7 +25,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="Христос_воскрес">Христос_воскрес</h2>
+<h2 id="Христос_воскрес"><a href="#Христос_воскрес">Христос_воскрес</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/filters/file/exclude-self.html b/test-files/golden-tests/filters/file/exclude-self.html
index 2f92faa1e..1ee3b8055 100644
--- a/test-files/golden-tests/filters/file/exclude-self.html
+++ b/test-files/golden-tests/filters/file/exclude-self.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 </div>
 
diff --git a/test-files/golden-tests/filters/file/include-self.html b/test-files/golden-tests/filters/file/include-self.html
index 348b6fbac..e8b5bf87c 100644
--- a/test-files/golden-tests/filters/file/include-self.html
+++ b/test-files/golden-tests/filters/file/include-self.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,7 +25,7 @@ <h2>Namespaces</h2>
 </div>
 <div>
 <div>
-<h2 id="TEST">TEST</h2>
+<h2 id="TEST"><a href="#TEST">TEST</a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -43,7 +43,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="TEST-SUCCESS"><a href="#TEST">TEST</a>::SUCCESS</h2>
+<h2 id="TEST-SUCCESS"><a href="#TEST-SUCCESS">TEST::SUCCESS</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/filters/file/include-symlink.html b/test-files/golden-tests/filters/file/include-symlink.html
index 3d639ea8e..b0b0b0a8e 100644
--- a/test-files/golden-tests/filters/file/include-symlink.html
+++ b/test-files/golden-tests/filters/file/include-symlink.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -26,7 +26,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="f">f</h2>
+<h2 id="f"><a href="#f">f</a></h2>
 <div>
 <span>A brief.</span>
 
diff --git a/test-files/golden-tests/filters/symbol-name/blacklist_0.html b/test-files/golden-tests/filters/symbol-name/blacklist_0.html
index 639a96eeb..0ee8e9e39 100644
--- a/test-files/golden-tests/filters/symbol-name/blacklist_0.html
+++ b/test-files/golden-tests/filters/symbol-name/blacklist_0.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -27,7 +27,7 @@ <h2>Namespaces</h2>
 </div>
 <div>
 <div>
-<h2 id="N0">N0</h2>
+<h2 id="N0"><a href="#N0">N0</a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -45,7 +45,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="N0-f0"><a href="#N0">N0</a>::f0</h2>
+<h2 id="N0-f0"><a href="#N0-f0">N0::f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -61,7 +61,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="N4">N4</h2>
+<h2 id="N4"><a href="#N4">N4</a></h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -80,7 +80,7 @@ <h2>Namespaces</h2>
 </div>
 <div>
 <div>
-<h2 id="N4-N5"><a href="#N4">N4</a>::N5</h2>
+<h2 id="N4-N5"><a href="#N4-N5">N4::N5</a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -98,7 +98,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="N4-N5-f1"><a href="#N4">N4</a>::<a href="#N4-N5">N5</a>::f1</h2>
+<h2 id="N4-N5-f1"><a href="#N4-N5-f1">N4::N5::f1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -114,7 +114,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="N4-N6"><a href="#N4">N4</a>::N6</h2>
+<h2 id="N4-N6"><a href="#N4-N6">N4::N6</a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -132,7 +132,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="N4-N6-f1"><a href="#N4">N4</a>::<a href="#N4-N6">N6</a>::f1</h2>
+<h2 id="N4-N6-f1"><a href="#N4-N6-f1">N4::N6::f1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -148,7 +148,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="N7">N7</h2>
+<h2 id="N7"><a href="#N7">N7</a></h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -166,7 +166,7 @@ <h2>Namespaces</h2>
 </div>
 <div>
 <div>
-<h2 id="N7-N9"><a href="#N7">N7</a>::N9</h2>
+<h2 id="N7-N9"><a href="#N7-N9">N7::N9</a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -184,7 +184,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="N7-N9-g0"><a href="#N7">N7</a>::<a href="#N7-N9">N9</a>::g0</h2>
+<h2 id="N7-N9-g0"><a href="#N7-N9-g0">N7::N9::g0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/filters/symbol-name/excluded-base-class.html b/test-files/golden-tests/filters/symbol-name/excluded-base-class.html
index 8d87e62c8..94c3e998b 100644
--- a/test-files/golden-tests/filters/symbol-name/excluded-base-class.html
+++ b/test-files/golden-tests/filters/symbol-name/excluded-base-class.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,7 +25,7 @@ <h2>Namespaces</h2>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -44,7 +44,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-D"><a href="#A">A</a>::D</h2>
+<h2 id="A-D"><a href="#A-D">A::D</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -92,7 +92,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-D-f"><a href="#A">A</a>::<a href="#A-D">D</a>::f</h2>
+<h2 id="A-D-f"><a href="#A-D-f">A::D::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -108,7 +108,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-D-g"><a href="#A">A</a>::<a href="#A-D">D</a>::g</h2>
+<h2 id="A-D-g"><a href="#A-D-g">A::D::g</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -125,7 +125,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-D-h"><a href="#A">A</a>::<a href="#A-D">D</a>::h</h2>
+<h2 id="A-D-h"><a href="#A-D-h">A::D::h</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -142,7 +142,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-D-i"><a href="#A">A</a>::<a href="#A-D">D</a>::i</h2>
+<h2 id="A-D-i"><a href="#A-D-i">A::D::i</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -158,7 +158,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-E"><a href="#A">A</a>::E</h2>
+<h2 id="A-E"><a href="#A-E">A::E</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -206,7 +206,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-E-f"><a href="#A">A</a>::<a href="#A-E">E</a>::f</h2>
+<h2 id="A-E-f"><a href="#A-E-f">A::E::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -222,7 +222,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-E-g"><a href="#A">A</a>::<a href="#A-E">E</a>::g</h2>
+<h2 id="A-E-g"><a href="#A-E-g">A::E::g</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -239,7 +239,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-E-h"><a href="#A">A</a>::<a href="#A-E">E</a>::h</h2>
+<h2 id="A-E-h"><a href="#A-E-h">A::E::h</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -256,7 +256,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-E-i"><a href="#A">A</a>::<a href="#A-E">E</a>::i</h2>
+<h2 id="A-E-i"><a href="#A-E-i">A::E::i</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/filters/symbol-name/excluded-namespace-alias.html b/test-files/golden-tests/filters/symbol-name/excluded-namespace-alias.html
index 63e992a06..1c412757e 100644
--- a/test-files/golden-tests/filters/symbol-name/excluded-namespace-alias.html
+++ b/test-files/golden-tests/filters/symbol-name/excluded-namespace-alias.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,7 +25,7 @@ <h2>Namespaces</h2>
 </div>
 <div>
 <div>
-<h2 id="B">B</h2>
+<h2 id="B"><a href="#B">B</a></h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -43,7 +43,7 @@ <h2>Namespaces</h2>
 </div>
 <div>
 <div>
-<h2 id="B-U"><a href="#B">B</a>::U</h2>
+<h2 id="B-U"><a href="#B-U">B::U</a></h2>
 </div>
 <h2>Namespace Aliases</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -61,7 +61,7 @@ <h2>Namespace Aliases</h2>
 </div>
 <div>
 <div>
-<h2 id="B-U-E"><a href="#B">B</a>::<a href="#B-U">U</a>::E</h2>
+<h2 id="B-U-E"><a href="#B-U-E">B::U::E</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/filters/symbol-name/extraction-mode.html b/test-files/golden-tests/filters/symbol-name/extraction-mode.html
index 706b1ecca..0173cbc79 100644
--- a/test-files/golden-tests/filters/symbol-name/extraction-mode.html
+++ b/test-files/golden-tests/filters/symbol-name/extraction-mode.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -75,7 +75,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="regular_ns">regular_ns</h2>
+<h2 id="regular_ns"><a href="#regular_ns">regular_ns</a></h2>
 <div>
 <span>A regular namespace with different filters for members</span>
 
@@ -116,7 +116,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="regular_ns-regular"><a href="#regular_ns">regular_ns</a>::regular</h2>
+<h2 id="regular_ns-regular"><a href="#regular_ns-regular">regular_ns::regular</a></h2>
 <div>
 <span>A symbol that passes the filters</span>
 
@@ -169,7 +169,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="regular_ns-regular-also_regular"><a href="#regular_ns">regular_ns</a>::<a href="#regular_ns-regular">regular</a>::also_regular</h2>
+<h2 id="regular_ns-regular-also_regular"><a href="#regular_ns-regular-also_regular">regular_ns::regular::also_regular</a></h2>
 <div>
 <span>Child of a regular symbol extracted as regular</span>
 
@@ -204,7 +204,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="regular_ns-regular-also_regular-regular_as_well"><a href="#regular_ns">regular_ns</a>::<a href="#regular_ns-regular">regular</a>::<a href="#regular_ns-regular-also_regular">also_regular</a>::regular_as_well</h2>
+<h2 id="regular_ns-regular-also_regular-regular_as_well"><a href="#regular_ns-regular-also_regular-regular_as_well">regular_ns::regular::also_regular::regular_as_well</a></h2>
 <div>
 <span>Grandchild of a regular symbol extracted as regular</span>
 
@@ -225,7 +225,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="regular_ns-see_below"><a href="#regular_ns">regular_ns</a>::see_below</h2>
+<h2 id="regular_ns-see_below"><a href="#regular_ns-see_below">regular_ns::see_below</a></h2>
 <div>
 <span>A symbol that passes the see-below filter</span>
 
@@ -250,7 +250,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="regular_ns-get_dependency"><a href="#regular_ns">regular_ns</a>::get_dependency</h2>
+<h2 id="regular_ns-get_dependency"><a href="#regular_ns-get_dependency">regular_ns::get_dependency</a></h2>
 <div>
 <span>A function to get an excluded symbol</span>
 
@@ -274,7 +274,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="regular_ns-get_implementation_defined"><a href="#regular_ns">regular_ns</a>::get_implementation_defined</h2>
+<h2 id="regular_ns-get_implementation_defined"><a href="#regular_ns-get_implementation_defined">regular_ns::get_implementation_defined</a></h2>
 <div>
 <span>A function to get an implementation-defined symbol</span>
 
@@ -303,7 +303,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="regular_ns-get_regular"><a href="#regular_ns">regular_ns</a>::get_regular</h2>
+<h2 id="regular_ns-get_regular"><a href="#regular_ns-get_regular">regular_ns::get_regular</a></h2>
 <div>
 <span>A function to get a regular symbol</span>
 
@@ -331,7 +331,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="regular_ns-get_see_below"><a href="#regular_ns">regular_ns</a>::get_see_below</h2>
+<h2 id="regular_ns-get_see_below"><a href="#regular_ns-get_see_below">regular_ns::get_see_below</a></h2>
 <div>
 <span>A function to get a see-below symbol</span>
 
@@ -359,7 +359,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="see_below_ns">see_below_ns</h2>
+<h2 id="see_below_ns"><a href="#see_below_ns">see_below_ns</a></h2>
 <div>
 <span>A see-below namespace</span>
 
@@ -403,7 +403,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="see_below_ns-regular"><a href="#see_below_ns">see_below_ns</a>::regular</h2>
+<h2 id="see_below_ns-regular"><a href="#see_below_ns-regular">see_below_ns::regular</a></h2>
 <div>
 <span>Regular symbol in a see-below namespace</span>
 
@@ -428,7 +428,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="see_below_ns-see_below"><a href="#see_below_ns">see_below_ns</a>::see_below</h2>
+<h2 id="see_below_ns-see_below"><a href="#see_below_ns-see_below">see_below_ns::see_below</a></h2>
 <div>
 <span>See-below symbol in a see-below namespace</span>
 
@@ -453,7 +453,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="see_below_ns-get_dependency"><a href="#see_below_ns">see_below_ns</a>::get_dependency</h2>
+<h2 id="see_below_ns-get_dependency"><a href="#see_below_ns-get_dependency">see_below_ns::get_dependency</a></h2>
 <div>
 <span>A function to get a dependency symbol in a see-below namespace</span>
 
@@ -478,7 +478,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="see_below_ns-get_implementation_defined"><a href="#see_below_ns">see_below_ns</a>::get_implementation_defined</h2>
+<h2 id="see_below_ns-get_implementation_defined"><a href="#see_below_ns-get_implementation_defined">see_below_ns::get_implementation_defined</a></h2>
 <div>
 <span>A function to get an implementation-defined symbol in a see-below namespace</span>
 
@@ -507,7 +507,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="dependency_ns_alias">dependency_ns_alias</h2>
+<h2 id="dependency_ns_alias"><a href="#dependency_ns_alias">dependency_ns_alias</a></h2>
 <div>
 <span>Namespace alias to form the dependency on dependency_ns</span>
 
@@ -526,7 +526,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="implementation_defined_ns_alias">implementation_defined_ns_alias</h2>
+<h2 id="implementation_defined_ns_alias"><a href="#implementation_defined_ns_alias">implementation_defined_ns_alias</a></h2>
 <div>
 <span>Namespace alias to form a dependency on the implementation-defined namespace</span>
 
@@ -545,7 +545,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="see_below_ns_alias">see_below_ns_alias</h2>
+<h2 id="see_below_ns_alias"><a href="#see_below_ns_alias">see_below_ns_alias</a></h2>
 <div>
 <span>Namespace alias to form a dependency on the see-below namespace</span>
 
@@ -568,7 +568,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="regular">regular</h2>
+<h2 id="regular"><a href="#regular">regular</a></h2>
 <div>
 <span>A regular symbol in the global namespace</span>
 
@@ -621,7 +621,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="regular-also_regular"><a href="#regular">regular</a>::also_regular</h2>
+<h2 id="regular-also_regular"><a href="#regular-also_regular">regular::also_regular</a></h2>
 <div>
 <span>Child of a regular symbol: should be traversed as usual</span>
 
@@ -656,7 +656,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="regular-also_regular-regular_as_well"><a href="#regular">regular</a>::<a href="#regular-also_regular">also_regular</a>::regular_as_well</h2>
+<h2 id="regular-also_regular-regular_as_well"><a href="#regular-also_regular-regular_as_well">regular::also_regular::regular_as_well</a></h2>
 <div>
 <span>Grandchild of a regular symbol: should be traversed as usual</span>
 
@@ -677,7 +677,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="see_below">see_below</h2>
+<h2 id="see_below"><a href="#see_below">see_below</a></h2>
 <div>
 <span>A see-below symbol in the global namespace</span>
 
@@ -703,7 +703,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="get_dependency">get_dependency</h2>
+<h2 id="get_dependency"><a href="#get_dependency">get_dependency</a></h2>
 <div>
 <span>A function to get a dependency symbol on the global namespace</span>
 
@@ -727,7 +727,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="get_implementation_defined">get_implementation_defined</h2>
+<h2 id="get_implementation_defined"><a href="#get_implementation_defined">get_implementation_defined</a></h2>
 <div>
 <span>A function to get an implementation-defined symbol in the global namespace</span>
 
@@ -756,7 +756,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="get_regular">get_regular</h2>
+<h2 id="get_regular"><a href="#get_regular">get_regular</a></h2>
 <div>
 <span>A function to get a regular symbol in the global namespace</span>
 
@@ -784,7 +784,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="get_see_below">get_see_below</h2>
+<h2 id="get_see_below"><a href="#get_see_below">get_see_below</a></h2>
 <div>
 <span>A function to get a see-below symbol in the global namespace</span>
 
diff --git a/test-files/golden-tests/filters/symbol-name/impl-defined-member.html b/test-files/golden-tests/filters/symbol-name/impl-defined-member.html
index 45183276d..54b2690e8 100644
--- a/test-files/golden-tests/filters/symbol-name/impl-defined-member.html
+++ b/test-files/golden-tests/filters/symbol-name/impl-defined-member.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -39,7 +39,7 @@ <h2>Variables</h2>
 </div>
 <div>
 <div>
-<h2 id="regular">regular</h2>
+<h2 id="regular"><a href="#regular">regular</a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -57,7 +57,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="regular-absolute_uri_rule_t"><a href="#regular">regular</a>::absolute_uri_rule_t</h2>
+<h2 id="regular-absolute_uri_rule_t"><a href="#regular-absolute_uri_rule_t">regular::absolute_uri_rule_t</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -74,7 +74,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="absolute_uri_rule">absolute_uri_rule</h2>
+<h2 id="absolute_uri_rule"><a href="#absolute_uri_rule">absolute_uri_rule</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -89,7 +89,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="regular_absolute_uri_rule">regular_absolute_uri_rule</h2>
+<h2 id="regular_absolute_uri_rule"><a href="#regular_absolute_uri_rule">regular_absolute_uri_rule</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/filters/symbol-name/whitelist_0.html b/test-files/golden-tests/filters/symbol-name/whitelist_0.html
index 9c06dfe15..643d2186f 100644
--- a/test-files/golden-tests/filters/symbol-name/whitelist_0.html
+++ b/test-files/golden-tests/filters/symbol-name/whitelist_0.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -42,7 +42,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="N0">N0</h2>
+<h2 id="N0"><a href="#N0">N0</a></h2>
 <div>
 <span>This namespace should extracted because it&#x27;s implied by <code>N0::f0_WL</code></span>
 
@@ -65,7 +65,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="N0-f0_WL"><a href="#N0">N0</a>::f0_WL</h2>
+<h2 id="N0-f0_WL"><a href="#N0-f0_WL">N0::f0_WL</a></h2>
 <div>
 <span>This function should be included because it matches <code>N0::f0_WL</code></span>
 
@@ -85,7 +85,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="N1">N1</h2>
+<h2 id="N1"><a href="#N1">N1</a></h2>
 <div>
 <span>This namespace should extracted because it&#x27;s implied by <code>N1::N3_WL</code> and <code>N1::N4::f1_WL</code></span>
 
@@ -109,7 +109,7 @@ <h2>Namespaces</h2>
 </div>
 <div>
 <div>
-<h2 id="N1-N3_WL"><a href="#N1">N1</a>::N3_WL</h2>
+<h2 id="N1-N3_WL"><a href="#N1-N3_WL">N1::N3_WL</a></h2>
 <div>
 <span>This namespace should extracted because it&#x27;s explicitly included by <code>N1::N3_WL</code></span>
 
@@ -132,7 +132,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="N1-N3_WL-f1_WL"><a href="#N1">N1</a>::<a href="#N1-N3_WL">N3_WL</a>::f1_WL</h2>
+<h2 id="N1-N3_WL-f1_WL"><a href="#N1-N3_WL-f1_WL">N1::N3_WL::f1_WL</a></h2>
 <div>
 <span>This function should extracted because the namespace <code>N1::N3_WL</code> is included as a literal.</span>
 
@@ -152,7 +152,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="N1-N4"><a href="#N1">N1</a>::N4</h2>
+<h2 id="N1-N4"><a href="#N1-N4">N1::N4</a></h2>
 <div>
 <span>This namespace should extracted because it&#x27;s implied by <code>N1::N4::f1_WL</code></span>
 
@@ -175,7 +175,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="N1-N4-f1_WL"><a href="#N1">N1</a>::<a href="#N1-N4">N4</a>::f1_WL</h2>
+<h2 id="N1-N4-f1_WL"><a href="#N1-N4-f1_WL">N1::N4::f1_WL</a></h2>
 <div>
 <span>This function should extracted because it matches <code>N1::N4::f1_WL</code></span>
 
@@ -195,7 +195,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="N5">N5</h2>
+<h2 id="N5"><a href="#N5">N5</a></h2>
 <div>
 <span>This namespace should extracted because it&#x27;s implied by <code>N5::N6::*7</code></span>
 
@@ -218,7 +218,7 @@ <h2>Namespaces</h2>
 </div>
 <div>
 <div>
-<h2 id="N5-N6"><a href="#N5">N5</a>::N6</h2>
+<h2 id="N5-N6"><a href="#N5-N6">N5::N6</a></h2>
 <div>
 <span>This namespace should extracted because it&#x27;s implied by <code>N5::N6::*7</code></span>
 
@@ -242,7 +242,7 @@ <h2>Namespaces</h2>
 </div>
 <div>
 <div>
-<h2 id="N5-N6-M7"><a href="#N5">N5</a>::<a href="#N5-N6">N6</a>::M7</h2>
+<h2 id="N5-N6-M7"><a href="#N5-N6-M7">N5::N6::M7</a></h2>
 <div>
 <span>This namespace should be included because it matches <code>N5::N6::*7</code></span>
 
@@ -265,7 +265,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="N5-N6-M7-f2_WL"><a href="#N5">N5</a>::<a href="#N5-N6">N6</a>::<a href="#N5-N6-M7">M7</a>::f2_WL</h2>
+<h2 id="N5-N6-M7-f2_WL"><a href="#N5-N6-M7-f2_WL">N5::N6::M7::f2_WL</a></h2>
 <div>
 <span>This function should be included because it&#x27;s a member of <code>M7</code>, which matches <code>N5::N6::*7</code></span>
 
@@ -285,7 +285,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="N5-N6-N7"><a href="#N5">N5</a>::<a href="#N5-N6">N6</a>::N7</h2>
+<h2 id="N5-N6-N7"><a href="#N5-N6-N7">N5::N6::N7</a></h2>
 <div>
 <span>This namespace should be included because it matches <code>N5::N6::*7</code></span>
 
@@ -308,7 +308,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="N5-N6-N7-f2_WL"><a href="#N5">N5</a>::<a href="#N5-N6">N6</a>::<a href="#N5-N6-N7">N7</a>::f2_WL</h2>
+<h2 id="N5-N6-N7-f2_WL"><a href="#N5-N6-N7-f2_WL">N5::N6::N7::f2_WL</a></h2>
 <div>
 <span>This function should be included because it&#x27;s a member of <code>N7</code>, which matches <code>N5::N6::*7</code></span>
 
@@ -328,7 +328,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="C">C</h2>
+<h2 id="C"><a href="#C">C</a></h2>
 <div>
 <span>This namespace should be included because it strictly matches <code>C</code></span>
 
@@ -377,7 +377,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="C-D"><a href="#C">C</a>::D</h2>
+<h2 id="C-D"><a href="#C-D">C::D</a></h2>
 <div>
 <span>This struct should be included because it&#x27;s a member of <code>C</code></span>
 
@@ -412,7 +412,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="C-D-f1_WL"><a href="#C">C</a>::<a href="#C-D">D</a>::f1_WL</h2>
+<h2 id="C-D-f1_WL"><a href="#C-D-f1_WL">C::D::f1_WL</a></h2>
 <div>
 <span>This function should be included because it&#x27;s a member of <code>D</code></span>
 
@@ -432,7 +432,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="C-f0_WL"><a href="#C">C</a>::f0_WL</h2>
+<h2 id="C-f0_WL"><a href="#C-f0_WL">C::f0_WL</a></h2>
 <div>
 <span>This function should be included because it&#x27;s a member of <code>C</code></span>
 
diff --git a/test-files/golden-tests/filters/symbol-type/nested-private-template.adoc b/test-files/golden-tests/filters/symbol-type/nested-private-template.adoc
index 798d2d03c..c38fccadc 100644
--- a/test-files/golden-tests/filters/symbol-type/nested-private-template.adoc
+++ b/test-files/golden-tests/filters/symbol-type/nested-private-template.adoc
@@ -50,7 +50,7 @@ struct impl;
 ----
 
 [#range-impl-00]
-== <<range,range>>::impl&lt;R, false&gt;
+== <<range,range>>::<<range-impl-0e,impl>>&lt;R, false&gt;
 
 === Synopsis
 
diff --git a/test-files/golden-tests/filters/symbol-type/nested-private-template.html b/test-files/golden-tests/filters/symbol-type/nested-private-template.html
index 9b3fa8883..63967e6ff 100644
--- a/test-files/golden-tests/filters/symbol-type/nested-private-template.html
+++ b/test-files/golden-tests/filters/symbol-type/nested-private-template.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,7 +25,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="range">range</h2>
+<h2 id="range"><a href="#range">range</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -57,7 +57,7 @@ <h2>Private Types</h2>
 </div>
 <div>
 <div>
-<h2 id="range-impl-0e"><a href="#range">range</a>::impl</h2>
+<h2 id="range-impl-0e"><a href="#range-impl-0e">range::impl</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -77,7 +77,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="range-impl-00"><a href="#range">range</a>::impl&lt;R, false&gt;</h2>
+<h2 id="range-impl-00"><a href="#range-impl-00">range::impl&lt;R, false&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/javadoc/brief/brief-1.html b/test-files/golden-tests/javadoc/brief/brief-1.html
index 9a39a41f3..448dbebca 100644
--- a/test-files/golden-tests/javadoc/brief/brief-1.html
+++ b/test-files/golden-tests/javadoc/brief/brief-1.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -27,7 +27,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="f5">f5</h2>
+<h2 id="f5"><a href="#f5">f5</a></h2>
 <div>
 <span>brief bold it continues to the line.</span>
 
@@ -47,7 +47,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f6">f6</h2>
+<h2 id="f6"><a href="#f6">f6</a></h2>
 <div>
 <span>brief</span>
 
diff --git a/test-files/golden-tests/javadoc/brief/brief-2.html b/test-files/golden-tests/javadoc/brief/brief-2.html
index 918fb74ec..37809d239 100644
--- a/test-files/golden-tests/javadoc/brief/brief-2.html
+++ b/test-files/golden-tests/javadoc/brief/brief-2.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -31,7 +31,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="f1">f1</h2>
+<h2 id="f1"><a href="#f1">f1</a></h2>
 <div>
 <span>brief</span>
 
@@ -51,7 +51,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f2">f2</h2>
+<h2 id="f2"><a href="#f2">f2</a></h2>
 <div>
 <span>brief</span>
 
@@ -71,7 +71,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f3">f3</h2>
+<h2 id="f3"><a href="#f3">f3</a></h2>
 <div>
 <span>brief</span>
 
@@ -91,7 +91,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f4">f4</h2>
+<h2 id="f4"><a href="#f4">f4</a></h2>
 <div>
 <span>brief x</span>
 
@@ -115,7 +115,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="f5">f5</h2>
+<h2 id="f5"><a href="#f5">f5</a></h2>
 <div>
 <span>brief</span>
 
@@ -135,7 +135,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f6">f6</h2>
+<h2 id="f6"><a href="#f6">f6</a></h2>
 <div>
 <span>brief</span>
 
diff --git a/test-files/golden-tests/javadoc/brief/brief-3.html b/test-files/golden-tests/javadoc/brief/brief-3.html
index e8bf1c3dc..4a0f3d61a 100644
--- a/test-files/golden-tests/javadoc/brief/brief-3.html
+++ b/test-files/golden-tests/javadoc/brief/brief-3.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -26,7 +26,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="f-0c">f</h2>
+<h2 id="f-0c"><a href="#f-0c">f</a></h2>
 <div>
 <span><code>f</code> overloads</span>
 
@@ -73,7 +73,7 @@ <h3>Synopses</h3>
 </div>
 <div>
 <div>
-<h2 id="f-06">f</h2>
+<h2 id="f-06"><a href="#f-06">f</a></h2>
 <div>
 <span>Integer overload.</span>
 
@@ -97,7 +97,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="f-0f">f</h2>
+<h2 id="f-0f"><a href="#f-0f">f</a></h2>
 <div>
 <span>Integer overload.</span>
 
@@ -117,7 +117,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f-07">f</h2>
+<h2 id="f-07"><a href="#f-07">f</a></h2>
 <div>
 <span>C string overload.</span>
 
@@ -141,7 +141,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="f-0b">f</h2>
+<h2 id="f-0b"><a href="#f-0b">f</a></h2>
 <div>
 <span>C string overload.</span>
 
diff --git a/test-files/golden-tests/javadoc/brief/brief-4.html b/test-files/golden-tests/javadoc/brief/brief-4.html
index 9a9385a13..d0ba48c2d 100644
--- a/test-files/golden-tests/javadoc/brief/brief-4.html
+++ b/test-files/golden-tests/javadoc/brief/brief-4.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -28,7 +28,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="f0">f0</h2>
+<h2 id="f0"><a href="#f0">f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -44,7 +44,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f1">f1</h2>
+<h2 id="f1"><a href="#f1">f1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -60,7 +60,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f2">f2</h2>
+<h2 id="f2"><a href="#f2">f2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -76,7 +76,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f3">f3</h2>
+<h2 id="f3"><a href="#f3">f3</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/javadoc/brief/brief-5.html b/test-files/golden-tests/javadoc/brief/brief-5.html
index 6edcc193d..cb5c1a180 100644
--- a/test-files/golden-tests/javadoc/brief/brief-5.html
+++ b/test-files/golden-tests/javadoc/brief/brief-5.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -31,7 +31,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="f0">f0</h2>
+<h2 id="f0"><a href="#f0">f0</a></h2>
 <div>
 <span>brief</span>
 
@@ -51,7 +51,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f1">f1</h2>
+<h2 id="f1"><a href="#f1">f1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -67,7 +67,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f2">f2</h2>
+<h2 id="f2"><a href="#f2">f2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -83,7 +83,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f3">f3</h2>
+<h2 id="f3"><a href="#f3">f3</a></h2>
 <div>
 <span>brief</span>
 
@@ -103,7 +103,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f4">f4</h2>
+<h2 id="f4"><a href="#f4">f4</a></h2>
 <div>
 <span>brief</span>
 
@@ -123,7 +123,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f5">f5</h2>
+<h2 id="f5"><a href="#f5">f5</a></h2>
 <div>
 <span>brief</span>
 
diff --git a/test-files/golden-tests/javadoc/brief/brief-6.html b/test-files/golden-tests/javadoc/brief/brief-6.html
index 764d39521..3bc97cf10 100644
--- a/test-files/golden-tests/javadoc/brief/brief-6.html
+++ b/test-files/golden-tests/javadoc/brief/brief-6.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -26,7 +26,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="f0">f0</h2>
+<h2 id="f0"><a href="#f0">f0</a></h2>
 <div>
 <span>brief</span>
 
diff --git a/test-files/golden-tests/javadoc/code/code.html b/test-files/golden-tests/javadoc/code/code.html
index d7c6d34f0..3bd37d08d 100644
--- a/test-files/golden-tests/javadoc/code/code.html
+++ b/test-files/golden-tests/javadoc/code/code.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -26,7 +26,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="f">f</h2>
+<h2 id="f"><a href="#f">f</a></h2>
 <div>
 <span>brief</span>
 
diff --git a/test-files/golden-tests/javadoc/copybrief/copybrief.html b/test-files/golden-tests/javadoc/copybrief/copybrief.html
index 06e3a3a71..3fa250df1 100644
--- a/test-files/golden-tests/javadoc/copybrief/copybrief.html
+++ b/test-files/golden-tests/javadoc/copybrief/copybrief.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -28,7 +28,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="f1">f1</h2>
+<h2 id="f1"><a href="#f1">f1</a></h2>
 <div>
 <span>brief1</span>
 
@@ -48,7 +48,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f2">f2</h2>
+<h2 id="f2"><a href="#f2">f2</a></h2>
 <div>
 <span>brief1</span>
 
@@ -68,7 +68,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f3">f3</h2>
+<h2 id="f3"><a href="#f3">f3</a></h2>
 <div>
 <span>brief1</span>
 
diff --git a/test-files/golden-tests/javadoc/copydetails/copydetails.html b/test-files/golden-tests/javadoc/copydetails/copydetails.html
index cbf963864..7ad1b14be 100644
--- a/test-files/golden-tests/javadoc/copydetails/copydetails.html
+++ b/test-files/golden-tests/javadoc/copydetails/copydetails.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -28,7 +28,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="dest">dest</h2>
+<h2 id="dest"><a href="#dest">dest</a></h2>
 <div>
 <span>Destination doc function</span>
 
@@ -121,7 +121,7 @@ <h3>See Also</h3>
 </div>
 <div>
 <div>
-<h2 id="destOverride">destOverride</h2>
+<h2 id="destOverride"><a href="#destOverride">destOverride</a></h2>
 <div>
 <span>Destination doc function</span>
 
@@ -242,7 +242,7 @@ <h3>See Also</h3>
 </div>
 <div>
 <div>
-<h2 id="source">source</h2>
+<h2 id="source"><a href="#source">source</a></h2>
 <div>
 <span>Source doc function</span>
 
diff --git a/test-files/golden-tests/javadoc/copydoc/conversion.html b/test-files/golden-tests/javadoc/copydoc/conversion.html
index b7fa52399..c582247a3 100644
--- a/test-files/golden-tests/javadoc/copydoc/conversion.html
+++ b/test-files/golden-tests/javadoc/copydoc/conversion.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -27,7 +27,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -60,7 +60,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-operator_assign-04"><a href="#A">A</a>::operator&#x3D;</h2>
+<h2 id="A-operator_assign-04"><a href="#A-operator_assign-04">A::operator&#x3D;</a></h2>
 <div>
 <span>Convert a string to A</span>
 
@@ -112,7 +112,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="A-operator_assign-08"><a href="#A">A</a>::operator&#x3D;</h2>
+<h2 id="A-operator_assign-08"><a href="#A-operator_assign-08">A::operator&#x3D;</a></h2>
 <div>
 <span>Convert a string to A</span>
 
@@ -153,7 +153,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="A-operator_assign-00"><a href="#A">A</a>::operator&#x3D;</h2>
+<h2 id="A-operator_assign-00"><a href="#A-operator_assign-00">A::operator&#x3D;</a></h2>
 <div>
 <span>Convert a string to A</span>
 
@@ -194,7 +194,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="A-2conversion-02"><a href="#A">A</a>::operator <a href="#string_type">string_type</a></h2>
+<h2 id="A-2conversion-02"><a href="#A-2conversion-02">A::operator string_type</a></h2>
 <div>
 <span>Convert A to a string</span>
 
@@ -217,7 +217,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="A-2conversion-00"><a href="#A">A</a>::operator <a href="#string_view_type">string_view_type</a></h2>
+<h2 id="A-2conversion-00"><a href="#A-2conversion-00">A::operator string_view_type</a></h2>
 <div>
 <span>Convert A to a string</span>
 
@@ -240,7 +240,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="string_type">string_type</h2>
+<h2 id="string_type"><a href="#string_type">string_type</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -257,7 +257,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="string_view_type">string_view_type</h2>
+<h2 id="string_view_type"><a href="#string_view_type">string_view_type</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/javadoc/copydoc/decay-params.html b/test-files/golden-tests/javadoc/copydoc/decay-params.html
index aca5e0a3d..8187b5aa0 100644
--- a/test-files/golden-tests/javadoc/copydoc/decay-params.html
+++ b/test-files/golden-tests/javadoc/copydoc/decay-params.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -27,7 +27,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="bar">bar</h2>
+<h2 id="bar"><a href="#bar">bar</a></h2>
 <div>
 <span>Brief from <code>foo()</code></span>
 
@@ -73,7 +73,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="foo-02">foo</h2>
+<h2 id="foo-02"><a href="#foo-02">foo</a></h2>
 <div>
 <span><code>foo</code> overloads</span>
 
@@ -134,7 +134,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="foo-0c">foo</h2>
+<h2 id="foo-0c"><a href="#foo-0c">foo</a></h2>
 <div>
 <span>We should not copy this doc</span>
 
@@ -158,7 +158,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="foo-01">foo</h2>
+<h2 id="foo-01"><a href="#foo-01">foo</a></h2>
 <div>
 <span>We should not copy this doc</span>
 
@@ -199,7 +199,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="foo-0e">foo</h2>
+<h2 id="foo-0e"><a href="#foo-0e">foo</a></h2>
 <div>
 <span>Brief from <code>foo()</code></span>
 
diff --git a/test-files/golden-tests/javadoc/copydoc/fundamental.html b/test-files/golden-tests/javadoc/copydoc/fundamental.html
index eea42604f..e1a116592 100644
--- a/test-files/golden-tests/javadoc/copydoc/fundamental.html
+++ b/test-files/golden-tests/javadoc/copydoc/fundamental.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -28,7 +28,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="f-0c">f</h2>
+<h2 id="f-0c"><a href="#f-0c">f</a></h2>
 <div>
 <span><code>f</code> overloads</span>
 
@@ -76,7 +76,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="f-06">f</h2>
+<h2 id="f-06"><a href="#f-06">f</a></h2>
 <div>
 <span>Fail</span>
 
@@ -113,7 +113,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="f-04">f</h2>
+<h2 id="f-04"><a href="#f-04">f</a></h2>
 <div>
 <span>Brief</span>
 
@@ -154,7 +154,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="g">g</h2>
+<h2 id="g"><a href="#g">g</a></h2>
 <div>
 <span>Brief</span>
 
@@ -195,7 +195,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="h">h</h2>
+<h2 id="h"><a href="#h">h</a></h2>
 <div>
 <span>Brief</span>
 
diff --git a/test-files/golden-tests/javadoc/copydoc/no-param.html b/test-files/golden-tests/javadoc/copydoc/no-param.html
index 3521a469e..6fe577daa 100644
--- a/test-files/golden-tests/javadoc/copydoc/no-param.html
+++ b/test-files/golden-tests/javadoc/copydoc/no-param.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -28,7 +28,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="copyFromNoParam">copyFromNoParam</h2>
+<h2 id="copyFromNoParam"><a href="#copyFromNoParam">copyFromNoParam</a></h2>
 <div>
 <span>Brief from <code>foo()</code></span>
 
@@ -58,7 +58,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="copyfromOverloads">copyfromOverloads</h2>
+<h2 id="copyfromOverloads"><a href="#copyfromOverloads">copyfromOverloads</a></h2>
 <div>
 <span>Brief from <code>foo()</code></span>
 
@@ -87,7 +87,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="foo-02">foo</h2>
+<h2 id="foo-02"><a href="#foo-02">foo</a></h2>
 <div>
 <span>Brief from <code>foo()</code></span>
 
@@ -141,7 +141,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="foo-0c">foo</h2>
+<h2 id="foo-0c"><a href="#foo-0c">foo</a></h2>
 <div>
 <span>Brief from <code>foo()</code></span>
 
@@ -170,7 +170,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="foo-0a">foo</h2>
+<h2 id="foo-0a"><a href="#foo-0a">foo</a></h2>
 <div>
 <span>Brief from <code>foo()</code></span>
 
diff --git a/test-files/golden-tests/javadoc/copydoc/operator-param.html b/test-files/golden-tests/javadoc/copydoc/operator-param.html
index 0a4a08ff2..2ed8e23c8 100644
--- a/test-files/golden-tests/javadoc/copydoc/operator-param.html
+++ b/test-files/golden-tests/javadoc/copydoc/operator-param.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,7 +25,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -56,7 +56,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-operator_call-08"><a href="#A">A</a>::operator()</h2>
+<h2 id="A-operator_call-08"><a href="#A-operator_call-08">A::operator()</a></h2>
 <div>
 <span>Return true if ch is in the character set.</span>
 
@@ -110,7 +110,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="A-operator_call-0f"><a href="#A">A</a>::operator()</h2>
+<h2 id="A-operator_call-0f"><a href="#A-operator_call-0f">A::operator()</a></h2>
 <div>
 <span>Return true if ch is in the character set.</span>
 
@@ -156,7 +156,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="A-operator_call-0b"><a href="#A">A</a>::operator()</h2>
+<h2 id="A-operator_call-0b"><a href="#A-operator_call-0b">A::operator()</a></h2>
 <div>
 <span>Return true if ch is in the character set.</span>
 
diff --git a/test-files/golden-tests/javadoc/copydoc/param-types.html b/test-files/golden-tests/javadoc/copydoc/param-types.html
index 79c8b93c9..b1ba86b78 100644
--- a/test-files/golden-tests/javadoc/copydoc/param-types.html
+++ b/test-files/golden-tests/javadoc/copydoc/param-types.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -70,7 +70,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="N">N</h2>
+<h2 id="N"><a href="#N">N</a></h2>
 <div>
 <span>Namespace to test qualified identifier parameters.</span>
 
@@ -93,7 +93,7 @@ <h2>Namespaces</h2>
 </div>
 <div>
 <div>
-<h2 id="N-M"><a href="#N">N</a>::M</h2>
+<h2 id="N-M"><a href="#N-M">N::M</a></h2>
 <div>
 <span>Namespace to test qualified identifier parameters.</span>
 
@@ -116,7 +116,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="N-M-Q"><a href="#N">N</a>::<a href="#N-M">M</a>::Q</h2>
+<h2 id="N-M-Q"><a href="#N-M-Q">N::M::Q</a></h2>
 <div>
 <span>Struct to test qualified identifier parameters.</span>
 
@@ -151,7 +151,7 @@ <h2>Non-Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 <div>
 <span>Struct to test explicit object member functions.</span>
 
@@ -201,7 +201,7 @@ <h2>Non-Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-f"><a href="#A">A</a>::f</h2>
+<h2 id="A-f"><a href="#A-f">A::f</a></h2>
 <div>
 <span>Reference member function.</span>
 
@@ -243,7 +243,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="A-g"><a href="#A">A</a>::g</h2>
+<h2 id="A-g"><a href="#A-g">A::g</a></h2>
 <div>
 <span>Reference member function.</span>
 
@@ -290,7 +290,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="paramType">paramType</h2>
+<h2 id="paramType"><a href="#paramType">paramType</a></h2>
 <div>
 <span>Struct used to vary the parameter type.</span>
 
@@ -334,7 +334,7 @@ <h2>Non-Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="testEnum">testEnum</h2>
+<h2 id="testEnum"><a href="#testEnum">testEnum</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -376,7 +376,7 @@ <h2>Non-Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="f-0c7">f</h2>
+<h2 id="f-0c7"><a href="#f-0c7">f</a></h2>
 <div>
 <span><code>f</code> overloads</span>
 
@@ -488,7 +488,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="f-0b3">f</h2>
+<h2 id="f-0b3"><a href="#f-0b3">f</a></h2>
 <div>
 <span>Reference function.</span>
 
@@ -512,7 +512,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="f-00">f</h2>
+<h2 id="f-00"><a href="#f-00">f</a></h2>
 <div>
 <span>Reference function.</span>
 
@@ -554,7 +554,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="f-08c">f</h2>
+<h2 id="f-08c"><a href="#f-08c">f</a></h2>
 <div>
 <span>Reference function.</span>
 
@@ -596,7 +596,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="f-012">f</h2>
+<h2 id="f-012"><a href="#f-012">f</a></h2>
 <div>
 <span>Variadic function</span>
 
@@ -638,7 +638,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="f-0c1">f</h2>
+<h2 id="f-0c1"><a href="#f-0c1">f</a></h2>
 <div>
 <span>Non-variadic function</span>
 
@@ -680,7 +680,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="f-03">f</h2>
+<h2 id="f-03"><a href="#f-03">f</a></h2>
 <div>
 <span>struct param function</span>
 
@@ -722,7 +722,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="f-04">f</h2>
+<h2 id="f-04"><a href="#f-04">f</a></h2>
 <div>
 <span>Decltype function</span>
 
@@ -764,7 +764,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="f-0b5">f</h2>
+<h2 id="f-0b5"><a href="#f-0b5">f</a></h2>
 <div>
 <span>struct param function</span>
 
@@ -806,7 +806,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="f-010">f</h2>
+<h2 id="f-010"><a href="#f-010">f</a></h2>
 <div>
 <span>Enum param function</span>
 
@@ -848,7 +848,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="f-081">f</h2>
+<h2 id="f-081"><a href="#f-081">f</a></h2>
 <div>
 <span>Qualified identifier param function</span>
 
@@ -890,7 +890,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="g-0f">g</h2>
+<h2 id="g-0f"><a href="#g-0f">g</a></h2>
 <div>
 <span><code>g</code> overloads</span>
 
@@ -984,7 +984,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="g-05">g</h2>
+<h2 id="g-05"><a href="#g-05">g</a></h2>
 <div>
 <span>struct param function</span>
 
@@ -1025,7 +1025,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="g-09c">g</h2>
+<h2 id="g-09c"><a href="#g-09c">g</a></h2>
 <div>
 <span>Qualified identifier param function</span>
 
@@ -1066,7 +1066,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="g-0b">g</h2>
+<h2 id="g-0b"><a href="#g-0b">g</a></h2>
 <div>
 <span>Auto function</span>
 
@@ -1107,7 +1107,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="g-04c">g</h2>
+<h2 id="g-04c"><a href="#g-04c">g</a></h2>
 <div>
 <span>Enum param function</span>
 
@@ -1148,7 +1148,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="g-096">g</h2>
+<h2 id="g-096"><a href="#g-096">g</a></h2>
 <div>
 <span>Variadic function</span>
 
@@ -1189,7 +1189,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="g-04a">g</h2>
+<h2 id="g-04a"><a href="#g-04a">g</a></h2>
 <div>
 <span>Non-variadic function</span>
 
@@ -1230,7 +1230,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="g-0c">g</h2>
+<h2 id="g-0c"><a href="#g-0c">g</a></h2>
 <div>
 <span>Decltype function</span>
 
diff --git a/test-files/golden-tests/javadoc/copydoc/qualified.html b/test-files/golden-tests/javadoc/copydoc/qualified.html
index 94962f04c..72fe4d1d1 100644
--- a/test-files/golden-tests/javadoc/copydoc/qualified.html
+++ b/test-files/golden-tests/javadoc/copydoc/qualified.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -39,7 +39,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="N">N</h2>
+<h2 id="N"><a href="#N">N</a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -57,7 +57,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="N-A"><a href="#N">N</a>::A</h2>
+<h2 id="N-A"><a href="#N-A">N::A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -103,7 +103,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="N-A-B"><a href="#N">N</a>::<a href="#N-A">A</a>::B</h2>
+<h2 id="N-A-B"><a href="#N-A-B">N::A::B</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -120,7 +120,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="N-A-f-05"><a href="#N">N</a>::<a href="#N-A">A</a>::f</h2>
+<h2 id="N-A-f-05"><a href="#N-A-f-05">N::A::f</a></h2>
 <div>
 <span>Reference function</span>
 
@@ -216,7 +216,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="N-A-f-0a"><a href="#N">N</a>::<a href="#N-A">A</a>::f</h2>
+<h2 id="N-A-f-0a"><a href="#N-A-f-0a">N::A::f</a></h2>
 <div>
 <span>Reference function</span>
 
@@ -257,7 +257,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="N-A-f-0b"><a href="#N">N</a>::<a href="#N-A">A</a>::f</h2>
+<h2 id="N-A-f-0b"><a href="#N-A-f-0b">N::A::f</a></h2>
 <div>
 <span>Reference function</span>
 
@@ -298,7 +298,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="N-A-f-0e"><a href="#N">N</a>::<a href="#N-A">A</a>::f</h2>
+<h2 id="N-A-f-0e"><a href="#N-A-f-0e">N::A::f</a></h2>
 <div>
 <span>Reference function</span>
 
@@ -339,7 +339,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="N-A-f-00"><a href="#N">N</a>::<a href="#N-A">A</a>::f</h2>
+<h2 id="N-A-f-00"><a href="#N-A-f-00">N::A::f</a></h2>
 <div>
 <span>Reference function</span>
 
@@ -380,7 +380,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="N-A-f-02"><a href="#N">N</a>::<a href="#N-A">A</a>::f</h2>
+<h2 id="N-A-f-02"><a href="#N-A-f-02">N::A::f</a></h2>
 <div>
 <span>Reference function</span>
 
@@ -421,7 +421,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="N-A-f-092"><a href="#N">N</a>::<a href="#N-A">A</a>::f</h2>
+<h2 id="N-A-f-092"><a href="#N-A-f-092">N::A::f</a></h2>
 <div>
 <span>Reference function</span>
 
@@ -462,7 +462,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="N-A-f-097"><a href="#N">N</a>::<a href="#N-A">A</a>::f</h2>
+<h2 id="N-A-f-097"><a href="#N-A-f-097">N::A::f</a></h2>
 <div>
 <span>Reference function</span>
 
@@ -503,7 +503,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="N-A-f-07"><a href="#N">N</a>::<a href="#N-A">A</a>::f</h2>
+<h2 id="N-A-f-07"><a href="#N-A-f-07">N::A::f</a></h2>
 <div>
 <span>Reference function</span>
 
@@ -544,7 +544,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="N-A-g-06e"><a href="#N">N</a>::<a href="#N-A">A</a>::g</h2>
+<h2 id="N-A-g-06e"><a href="#N-A-g-06e">N::A::g</a></h2>
 <div>
 <span><code>g</code> overloads</span>
 
@@ -592,7 +592,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="N-A-g-0a"><a href="#N">N</a>::<a href="#N-A">A</a>::g</h2>
+<h2 id="N-A-g-0a"><a href="#N-A-g-0a">N::A::g</a></h2>
 <div>
 <span>Reference function</span>
 
@@ -633,7 +633,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="N-A-g-06c"><a href="#N">N</a>::<a href="#N-A">A</a>::g</h2>
+<h2 id="N-A-g-06c"><a href="#N-A-g-06c">N::A::g</a></h2>
 <div>
 <span>Fail</span>
 
@@ -674,7 +674,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="N-A-h-05"><a href="#N">N</a>::<a href="#N-A">A</a>::h</h2>
+<h2 id="N-A-h-05"><a href="#N-A-h-05">N::A::h</a></h2>
 <div>
 <span><code>h</code> overloads</span>
 
@@ -722,7 +722,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="N-A-h-0f"><a href="#N">N</a>::<a href="#N-A">A</a>::h</h2>
+<h2 id="N-A-h-0f"><a href="#N-A-h-0f">N::A::h</a></h2>
 <div>
 <span>Reference function</span>
 
@@ -763,7 +763,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="N-A-h-06"><a href="#N">N</a>::<a href="#N-A">A</a>::h</h2>
+<h2 id="N-A-h-06"><a href="#N-A-h-06">N::A::h</a></h2>
 <div>
 <span>Fail</span>
 
@@ -804,7 +804,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="param_t">param_t</h2>
+<h2 id="param_t"><a href="#param_t">param_t</a></h2>
 <div>
 <span>Helper class for distinct parameter types</span>
 
diff --git a/test-files/golden-tests/javadoc/copydoc/qualifiers.html b/test-files/golden-tests/javadoc/copydoc/qualifiers.html
index d9cb10a8a..546679e22 100644
--- a/test-files/golden-tests/javadoc/copydoc/qualifiers.html
+++ b/test-files/golden-tests/javadoc/copydoc/qualifiers.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,7 +25,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -74,7 +74,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-const_iterator"><a href="#A">A</a>::const_iterator</h2>
+<h2 id="A-const_iterator"><a href="#A-const_iterator">A::const_iterator</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -91,7 +91,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-iterator"><a href="#A">A</a>::iterator</h2>
+<h2 id="A-iterator"><a href="#A-iterator">A::iterator</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -108,7 +108,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-begin-03"><a href="#A">A</a>::begin</h2>
+<h2 id="A-begin-03"><a href="#A-begin-03">A::begin</a></h2>
 <div>
 <span><code>begin</code> overloads</span>
 
@@ -146,7 +146,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="A-begin-06"><a href="#A">A</a>::begin</h2>
+<h2 id="A-begin-06"><a href="#A-begin-06">A::begin</a></h2>
 <div>
 <span>Returns an iterator to the beginning</span>
 
@@ -174,7 +174,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="A-begin-0c"><a href="#A">A</a>::begin</h2>
+<h2 id="A-begin-0c"><a href="#A-begin-0c">A::begin</a></h2>
 <div>
 <span>Return a const iterator to the beginning</span>
 
@@ -202,7 +202,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="A-cbegin"><a href="#A">A</a>::cbegin</h2>
+<h2 id="A-cbegin"><a href="#A-cbegin">A::cbegin</a></h2>
 <div>
 <span>Return a const iterator to the beginning</span>
 
@@ -230,7 +230,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="A-crvalue"><a href="#A">A</a>::crvalue</h2>
+<h2 id="A-crvalue"><a href="#A-crvalue">A::crvalue</a></h2>
 <div>
 <span>An const rvalue reference to A</span>
 
@@ -254,7 +254,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="A-ref-05f"><a href="#A">A</a>::ref</h2>
+<h2 id="A-ref-05f"><a href="#A-ref-05f">A::ref</a></h2>
 <div>
 <span><code>ref</code> overloads</span>
 
@@ -305,7 +305,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="A-ref-051"><a href="#A">A</a>::ref</h2>
+<h2 id="A-ref-051"><a href="#A-ref-051">A::ref</a></h2>
 <div>
 <span>An lvalue reference to A</span>
 
@@ -329,7 +329,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="A-ref-0e"><a href="#A">A</a>::ref</h2>
+<h2 id="A-ref-0e"><a href="#A-ref-0e">A::ref</a></h2>
 <div>
 <span>An rvalue reference to A</span>
 
@@ -353,7 +353,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="A-ref-04"><a href="#A">A</a>::ref</h2>
+<h2 id="A-ref-04"><a href="#A-ref-04">A::ref</a></h2>
 <div>
 <span>An const lvalue reference to A</span>
 
@@ -377,7 +377,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="A-ref-07"><a href="#A">A</a>::ref</h2>
+<h2 id="A-ref-07"><a href="#A-ref-07">A::ref</a></h2>
 <div>
 <span>An const rvalue reference to A</span>
 
@@ -401,7 +401,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="A-rvalue"><a href="#A">A</a>::rvalue</h2>
+<h2 id="A-rvalue"><a href="#A-rvalue">A::rvalue</a></h2>
 <div>
 <span>An rvalue reference to A</span>
 
diff --git a/test-files/golden-tests/javadoc/copydoc/template-arguments.adoc b/test-files/golden-tests/javadoc/copydoc/template-arguments.adoc
index d7aadf22c..5bbd0f612 100644
--- a/test-files/golden-tests/javadoc/copydoc/template-arguments.adoc
+++ b/test-files/golden-tests/javadoc/copydoc/template-arguments.adoc
@@ -189,7 +189,7 @@ struct B;
 |===
 
 [#A-B-09]
-== <<A,A>>::B&lt;int&gt;
+== <<A,A>>::<<A-B-08,B>>&lt;int&gt;
 
 Specialization of B for int&period;
 
@@ -204,7 +204,7 @@ struct <<A-B-08,B>>&lt;int&gt;;
 ----
 
 [#A-B-0c]
-== <<A,A>>::B&lt;int, 2&gt;
+== <<A,A>>::<<A-B-08,B>>&lt;int, 2&gt;
 
 Specialization of B for int with value 2&period;
 
@@ -248,7 +248,7 @@ struct C;
 |===
 
 [#A-C-0f]
-== <<A,A>>::C&lt;<<A-D,D>>, true&gt;
+== <<A,A>>::<<A-C-05,C>>&lt;<<A-D,D>>, true&gt;
 
 Specialization of C for D with true&period;
 
@@ -263,7 +263,7 @@ struct <<A-C-05,C>>&lt;<<A-D,D>>, true&gt;;
 ----
 
 [#A-C-0c]
-== <<A,A>>::C&lt;int, true&gt;
+== <<A,A>>::<<A-C-05,C>>&lt;int, true&gt;
 
 Specialization of C for int with true&period;
 
diff --git a/test-files/golden-tests/javadoc/copydoc/template-arguments.html b/test-files/golden-tests/javadoc/copydoc/template-arguments.html
index 727de9fa7..597d042da 100644
--- a/test-files/golden-tests/javadoc/copydoc/template-arguments.html
+++ b/test-files/golden-tests/javadoc/copydoc/template-arguments.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,7 +25,7 @@ <h2>Namespaces</h2>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -56,7 +56,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-BInt"><a href="#A">A</a>::BInt</h2>
+<h2 id="A-BInt"><a href="#A-BInt">A::BInt</a></h2>
 <div>
 <span>Specialization of B for int.</span>
 
@@ -75,7 +75,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-BInt2"><a href="#A">A</a>::BInt2</h2>
+<h2 id="A-BInt2"><a href="#A-BInt2">A::BInt2</a></h2>
 <div>
 <span>Specialization of B for int with value 2.</span>
 
@@ -94,7 +94,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-B_t"><a href="#A">A</a>::B_t</h2>
+<h2 id="A-B_t"><a href="#A-B_t">A::B_t</a></h2>
 <div>
 <span>Main class template for B.</span>
 
@@ -133,7 +133,7 @@ <h3>Template Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="A-CDTrue"><a href="#A">A</a>::CDTrue</h2>
+<h2 id="A-CDTrue"><a href="#A-CDTrue">A::CDTrue</a></h2>
 <div>
 <span>Specialization of C for D with true.</span>
 
@@ -152,7 +152,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-CIntTrue"><a href="#A">A</a>::CIntTrue</h2>
+<h2 id="A-CIntTrue"><a href="#A-CIntTrue">A::CIntTrue</a></h2>
 <div>
 <span>Specialization of C for D with true.</span>
 
@@ -171,7 +171,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-C_t"><a href="#A">A</a>::C_t</h2>
+<h2 id="A-C_t"><a href="#A-C_t">A::C_t</a></h2>
 <div>
 <span>Main class template for C.</span>
 
@@ -210,7 +210,7 @@ <h3>Template Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="A-B-08"><a href="#A">A</a>::B</h2>
+<h2 id="A-B-08"><a href="#A-B-08">A::B</a></h2>
 <div>
 <span>Main class template for B.</span>
 
@@ -255,7 +255,7 @@ <h3>Template Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="A-B-09"><a href="#A">A</a>::B&lt;int&gt;</h2>
+<h2 id="A-B-09"><a href="#A-B-09">A::B&lt;int&gt;</a></h2>
 <div>
 <span>Specialization of B for int.</span>
 
@@ -277,7 +277,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-B-0c"><a href="#A">A</a>::B&lt;int, 2&gt;</h2>
+<h2 id="A-B-0c"><a href="#A-B-0c">A::B&lt;int, 2&gt;</a></h2>
 <div>
 <span>Specialization of B for int with value 2.</span>
 
@@ -299,7 +299,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-C-05"><a href="#A">A</a>::C</h2>
+<h2 id="A-C-05"><a href="#A-C-05">A::C</a></h2>
 <div>
 <span>Main class template for C.</span>
 
@@ -344,7 +344,7 @@ <h3>Template Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="A-C-0f"><a href="#A">A</a>::C&lt;<a href="#A-D">D</a>, true&gt;</h2>
+<h2 id="A-C-0f"><a href="#A-C-0f">A::C&lt;D, true&gt;</a></h2>
 <div>
 <span>Specialization of C for D with true.</span>
 
@@ -366,7 +366,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-C-0c"><a href="#A">A</a>::C&lt;int, true&gt;</h2>
+<h2 id="A-C-0c"><a href="#A-C-0c">A::C&lt;int, true&gt;</a></h2>
 <div>
 <span>Specialization of C for int with true.</span>
 
@@ -388,7 +388,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-D"><a href="#A">A</a>::D</h2>
+<h2 id="A-D"><a href="#A-D">A::D</a></h2>
 <div>
 <span>Helper struct D.</span>
 
diff --git a/test-files/golden-tests/javadoc/inline/styled.html b/test-files/golden-tests/javadoc/inline/styled.html
index 6e02fc507..a4cb83ba7 100644
--- a/test-files/golden-tests/javadoc/inline/styled.html
+++ b/test-files/golden-tests/javadoc/inline/styled.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -26,7 +26,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 <div>
 <span>Brief for A</span>
 
@@ -66,7 +66,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="A-compare"><a href="#A">A</a>::compare</h2>
+<h2 id="A-compare"><a href="#A-compare">A::compare</a></h2>
 <div>
 <span>Compare function</span>
 
diff --git a/test-files/golden-tests/javadoc/link/link.html b/test-files/golden-tests/javadoc/link/link.html
index ca9168013..5ea1d47dc 100644
--- a/test-files/golden-tests/javadoc/link/link.html
+++ b/test-files/golden-tests/javadoc/link/link.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -26,7 +26,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="f">f</h2>
+<h2 id="f"><a href="#f">f</a></h2>
 <div>
 <span>A function with a link</span>
 
diff --git a/test-files/golden-tests/javadoc/lists/li.html b/test-files/golden-tests/javadoc/lists/li.html
index eb95d8e4d..276699cc1 100644
--- a/test-files/golden-tests/javadoc/lists/li.html
+++ b/test-files/golden-tests/javadoc/lists/li.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -26,7 +26,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="f">f</h2>
+<h2 id="f"><a href="#f">f</a></h2>
 <div>
 <span>A function</span>
 
diff --git a/test-files/golden-tests/javadoc/lists/listitem.html b/test-files/golden-tests/javadoc/lists/listitem.html
index 74991ae64..dd0e4ee49 100644
--- a/test-files/golden-tests/javadoc/lists/listitem.html
+++ b/test-files/golden-tests/javadoc/lists/listitem.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -29,7 +29,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="f0">f0</h2>
+<h2 id="f0"><a href="#f0">f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -51,7 +51,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="f1">f1</h2>
+<h2 id="f1"><a href="#f1">f1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -74,7 +74,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="f2">f2</h2>
+<h2 id="f2"><a href="#f2">f2</a></h2>
 <div>
 <span>brief</span>
 
@@ -101,7 +101,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="f3">f3</h2>
+<h2 id="f3"><a href="#f3">f3</a></h2>
 <div>
 <span>brief</span>
 
diff --git a/test-files/golden-tests/javadoc/paragraph/par-1.html b/test-files/golden-tests/javadoc/paragraph/par-1.html
index 5e64c1b52..e8ae64082 100644
--- a/test-files/golden-tests/javadoc/paragraph/par-1.html
+++ b/test-files/golden-tests/javadoc/paragraph/par-1.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -29,7 +29,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="f1">f1</h2>
+<h2 id="f1"><a href="#f1">f1</a></h2>
 <div>
 <span>Brief</span>
 
@@ -57,7 +57,7 @@ <h3>Custom par</h3>
 </div>
 <div>
 <div>
-<h2 id="f2">f2</h2>
+<h2 id="f2"><a href="#f2">f2</a></h2>
 <div>
 <span>Brief</span>
 
@@ -85,7 +85,7 @@ <h3>Custom par</h3>
 </div>
 <div>
 <div>
-<h2 id="f3">f3</h2>
+<h2 id="f3"><a href="#f3">f3</a></h2>
 <div>
 <span>Brief</span>
 
@@ -112,7 +112,7 @@ <h3>Custom par</h3>
 </div>
 <div>
 <div>
-<h2 id="f4">f4</h2>
+<h2 id="f4"><a href="#f4">f4</a></h2>
 <div>
 <span>Brief</span>
 
diff --git a/test-files/golden-tests/javadoc/paragraph/para-1.html b/test-files/golden-tests/javadoc/paragraph/para-1.html
index 3c34e2843..83b38a546 100644
--- a/test-files/golden-tests/javadoc/paragraph/para-1.html
+++ b/test-files/golden-tests/javadoc/paragraph/para-1.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -29,7 +29,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="f1">f1</h2>
+<h2 id="f1"><a href="#f1">f1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -45,7 +45,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f2">f2</h2>
+<h2 id="f2"><a href="#f2">f2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -61,7 +61,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f3">f3</h2>
+<h2 id="f3"><a href="#f3">f3</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -77,7 +77,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f4">f4</h2>
+<h2 id="f4"><a href="#f4">f4</a></h2>
 <div>
 <span>brief</span>
 
diff --git a/test-files/golden-tests/javadoc/paragraph/para-2.html b/test-files/golden-tests/javadoc/paragraph/para-2.html
index a2a11648e..1932ce2b1 100644
--- a/test-files/golden-tests/javadoc/paragraph/para-2.html
+++ b/test-files/golden-tests/javadoc/paragraph/para-2.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -26,7 +26,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="f1">f1</h2>
+<h2 id="f1"><a href="#f1">f1</a></h2>
 <div>
 <span>brief</span>
 
diff --git a/test-files/golden-tests/javadoc/paragraph/para-3.html b/test-files/golden-tests/javadoc/paragraph/para-3.html
index 879898b5c..1587b5065 100644
--- a/test-files/golden-tests/javadoc/paragraph/para-3.html
+++ b/test-files/golden-tests/javadoc/paragraph/para-3.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -26,7 +26,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="my_function">my_function</h2>
+<h2 id="my_function"><a href="#my_function">my_function</a></h2>
 <div>
 <span>A function</span>
 
diff --git a/test-files/golden-tests/javadoc/param/param-1.html b/test-files/golden-tests/javadoc/param/param-1.html
index a0bfdaf06..d5a6694db 100644
--- a/test-files/golden-tests/javadoc/param/param-1.html
+++ b/test-files/golden-tests/javadoc/param/param-1.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -30,7 +30,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="f0">f0</h2>
+<h2 id="f0"><a href="#f0">f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -63,7 +63,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="f1">f1</h2>
+<h2 id="f1"><a href="#f1">f1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -96,7 +96,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="f2">f2</h2>
+<h2 id="f2"><a href="#f2">f2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -129,7 +129,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="f3">f3</h2>
+<h2 id="f3"><a href="#f3">f3</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -162,7 +162,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="f4">f4</h2>
+<h2 id="f4"><a href="#f4">f4</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/javadoc/param/param-direction.html b/test-files/golden-tests/javadoc/param/param-direction.html
index f16bccb4e..b9c062172 100644
--- a/test-files/golden-tests/javadoc/param/param-direction.html
+++ b/test-files/golden-tests/javadoc/param/param-direction.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -35,7 +35,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="f">f</h2>
+<h2 id="f"><a href="#f">f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -68,7 +68,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="g">g</h2>
+<h2 id="g"><a href="#g">g</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -107,7 +107,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="h">h</h2>
+<h2 id="h"><a href="#h">h</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -146,7 +146,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="i">i</h2>
+<h2 id="i"><a href="#i">i</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -185,7 +185,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="j">j</h2>
+<h2 id="j"><a href="#j">j</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -224,7 +224,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="k">k</h2>
+<h2 id="k"><a href="#k">k</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -268,7 +268,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="l">l</h2>
+<h2 id="l"><a href="#l">l</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -313,7 +313,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="m">m</h2>
+<h2 id="m"><a href="#m">m</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -352,7 +352,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="n">n</h2>
+<h2 id="n"><a href="#n">n</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -385,7 +385,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="o">o</h2>
+<h2 id="o"><a href="#o">o</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/javadoc/param/param-duplicate.html b/test-files/golden-tests/javadoc/param/param-duplicate.html
index e8ff2d32c..a88112c0c 100644
--- a/test-files/golden-tests/javadoc/param/param-duplicate.html
+++ b/test-files/golden-tests/javadoc/param/param-duplicate.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -31,7 +31,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="f0">f0</h2>
+<h2 id="f0"><a href="#f0">f0</a></h2>
 <div>
 <span>f0 brief</span>
 
@@ -58,7 +58,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="f1">f1</h2>
+<h2 id="f1"><a href="#f1">f1</a></h2>
 <div>
 <span>f1 brief</span>
 
@@ -85,7 +85,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="g0">g0</h2>
+<h2 id="g0"><a href="#g0">g0</a></h2>
 <div>
 <span>g0 brief</span>
 
@@ -126,7 +126,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="g1">g1</h2>
+<h2 id="g1"><a href="#g1">g1</a></h2>
 <div>
 <span>g1 brief</span>
 
@@ -167,7 +167,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="h0">h0</h2>
+<h2 id="h0"><a href="#h0">h0</a></h2>
 <div>
 <span>h0 brief</span>
 
@@ -209,7 +209,7 @@ <h3>Template Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="h1">h1</h2>
+<h2 id="h1"><a href="#h1">h1</a></h2>
 <div>
 <span>h1 brief</span>
 
diff --git a/test-files/golden-tests/javadoc/param/param.html b/test-files/golden-tests/javadoc/param/param.html
index c2a11a6c3..ac5657032 100644
--- a/test-files/golden-tests/javadoc/param/param.html
+++ b/test-files/golden-tests/javadoc/param/param.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -29,7 +29,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="f">f</h2>
+<h2 id="f"><a href="#f">f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -62,7 +62,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="g">g</h2>
+<h2 id="g"><a href="#g">g</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -101,7 +101,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="h">h</h2>
+<h2 id="h"><a href="#h">h</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -145,7 +145,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="i">i</h2>
+<h2 id="i"><a href="#i">i</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/javadoc/pre/pre-post.html b/test-files/golden-tests/javadoc/pre/pre-post.html
index ed1916453..bc2b3645b 100644
--- a/test-files/golden-tests/javadoc/pre/pre-post.html
+++ b/test-files/golden-tests/javadoc/pre/pre-post.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -26,7 +26,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="f">f</h2>
+<h2 id="f"><a href="#f">f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/javadoc/ref/broken-ref.html b/test-files/golden-tests/javadoc/ref/broken-ref.html
index 10669094b..574d5dd1d 100644
--- a/test-files/golden-tests/javadoc/ref/broken-ref.html
+++ b/test-files/golden-tests/javadoc/ref/broken-ref.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -27,7 +27,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="f0">f0</h2>
+<h2 id="f0"><a href="#f0">f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -43,7 +43,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f1">f1</h2>
+<h2 id="f1"><a href="#f1">f1</a></h2>
 <div>
 <span>See <a href="#f0"><code>f0</code></a></span>
 
diff --git a/test-files/golden-tests/javadoc/ref/punctuation.html b/test-files/golden-tests/javadoc/ref/punctuation.html
index 81239dd18..45d3d5390 100644
--- a/test-files/golden-tests/javadoc/ref/punctuation.html
+++ b/test-files/golden-tests/javadoc/ref/punctuation.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -28,7 +28,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="f0">f0</h2>
+<h2 id="f0"><a href="#f0">f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -44,7 +44,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f1">f1</h2>
+<h2 id="f1"><a href="#f1">f1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -60,7 +60,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f2">f2</h2>
+<h2 id="f2"><a href="#f2">f2</a></h2>
 <div>
 <span>See <a href="#f0"><code>f0</code></a>, <a href="#f1"><code>f1</code></a>.</span>
 
diff --git a/test-files/golden-tests/javadoc/ref/ref.html b/test-files/golden-tests/javadoc/ref/ref.html
index 6947c373b..09203b136 100644
--- a/test-files/golden-tests/javadoc/ref/ref.html
+++ b/test-files/golden-tests/javadoc/ref/ref.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -54,7 +54,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -89,7 +89,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-B"><a href="#A">A</a>::B</h2>
+<h2 id="A-B"><a href="#A-B">A::B</a></h2>
 <div>
 <span>See <a href="#A-f1"><code>f1</code></a></span>
 
@@ -129,7 +129,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="A-B-f2"><a href="#A">A</a>::<a href="#A-B">B</a>::f2</h2>
+<h2 id="A-B-f2"><a href="#A-B-f2">A::B::f2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -145,7 +145,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-C"><a href="#A">A</a>::C</h2>
+<h2 id="A-C"><a href="#A-C">A::C</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -191,7 +191,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="A-C-f3"><a href="#A">A</a>::<a href="#A-C">C</a>::f3</h2>
+<h2 id="A-C-f3"><a href="#A-C-f3">A::C::f3</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -207,7 +207,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-C-f4"><a href="#A">A</a>::<a href="#A-C">C</a>::f4</h2>
+<h2 id="A-C-f4"><a href="#A-C-f4">A::C::f4</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -223,7 +223,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-D"><a href="#A">A</a>::D</h2>
+<h2 id="A-D"><a href="#A-D">A::D</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -283,7 +283,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-D-E"><a href="#A">A</a>::<a href="#A-D">D</a>::E</h2>
+<h2 id="A-D-E"><a href="#A-D-E">A::D::E</a></h2>
 <div>
 <span>See <a href="#A-C-f3"><code>f3</code></a></span>
 
@@ -309,7 +309,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="A-D-f4"><a href="#A">A</a>::<a href="#A-D">D</a>::f4</h2>
+<h2 id="A-D-f4"><a href="#A-D-f4">A::D::f4</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -325,7 +325,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-f1"><a href="#A">A</a>::f1</h2>
+<h2 id="A-f1"><a href="#A-f1">A::f1</a></h2>
 <div>
 <span>See <a href="#f0"><code>f0</code></a></span>
 
@@ -349,7 +349,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="F">F</h2>
+<h2 id="F"><a href="#F">F</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -417,7 +417,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="F-operator_assign"><a href="#F">F</a>::operator&#x3D;</h2>
+<h2 id="F-operator_assign"><a href="#F-operator_assign">F::operator&#x3D;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -433,7 +433,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="F-operator_mod"><a href="#F">F</a>::operator%</h2>
+<h2 id="F-operator_mod"><a href="#F-operator_mod">F::operator%</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -449,7 +449,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="F-operator_mod_eq"><a href="#F">F</a>::operator%&#x3D;</h2>
+<h2 id="F-operator_mod_eq"><a href="#F-operator_mod_eq">F::operator%&#x3D;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -465,7 +465,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="F-operator_bitand"><a href="#F">F</a>::operator&amp;</h2>
+<h2 id="F-operator_bitand"><a href="#F-operator_bitand">F::operator&amp;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -481,7 +481,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="F-operator_and"><a href="#F">F</a>::operator&amp;&amp;</h2>
+<h2 id="F-operator_and"><a href="#F-operator_and">F::operator&amp;&amp;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -497,7 +497,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="F-operator_and_eq"><a href="#F">F</a>::operator&amp;&#x3D;</h2>
+<h2 id="F-operator_and_eq"><a href="#F-operator_and_eq">F::operator&amp;&#x3D;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -513,7 +513,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="F-operator_call"><a href="#F">F</a>::operator()</h2>
+<h2 id="F-operator_call"><a href="#F-operator_call">F::operator()</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -529,7 +529,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="F-operator_star"><a href="#F">F</a>::operator*</h2>
+<h2 id="F-operator_star"><a href="#F-operator_star">F::operator*</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -545,7 +545,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="F-operator_star_eq"><a href="#F">F</a>::operator*&#x3D;</h2>
+<h2 id="F-operator_star_eq"><a href="#F-operator_star_eq">F::operator*&#x3D;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -561,7 +561,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="F-operator_plus"><a href="#F">F</a>::operator+</h2>
+<h2 id="F-operator_plus"><a href="#F-operator_plus">F::operator+</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -577,7 +577,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="F-operator_inc"><a href="#F">F</a>::operator++</h2>
+<h2 id="F-operator_inc"><a href="#F-operator_inc">F::operator++</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -593,7 +593,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="F-operator_plus_eq"><a href="#F">F</a>::operator+&#x3D;</h2>
+<h2 id="F-operator_plus_eq"><a href="#F-operator_plus_eq">F::operator+&#x3D;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -609,7 +609,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="F-operator_comma"><a href="#F">F</a>::operator,</h2>
+<h2 id="F-operator_comma"><a href="#F-operator_comma">F::operator,</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -625,7 +625,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="F-operator_minus"><a href="#F">F</a>::operator-</h2>
+<h2 id="F-operator_minus"><a href="#F-operator_minus">F::operator-</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -641,7 +641,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="F-operator_dec"><a href="#F">F</a>::operator--</h2>
+<h2 id="F-operator_dec"><a href="#F-operator_dec">F::operator--</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -657,7 +657,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="F-operator_minus_eq"><a href="#F">F</a>::operator-&#x3D;</h2>
+<h2 id="F-operator_minus_eq"><a href="#F-operator_minus_eq">F::operator-&#x3D;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -673,7 +673,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="F-operator_ptr"><a href="#F">F</a>::operator-&gt;</h2>
+<h2 id="F-operator_ptr"><a href="#F-operator_ptr">F::operator-&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -689,7 +689,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="F-operator_ptrmem"><a href="#F">F</a>::operator-&gt;*</h2>
+<h2 id="F-operator_ptrmem"><a href="#F-operator_ptrmem">F::operator-&gt;*</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -705,7 +705,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="F-operator_slash"><a href="#F">F</a>::operator/</h2>
+<h2 id="F-operator_slash"><a href="#F-operator_slash">F::operator/</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -721,7 +721,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="F-operator_slash_eq"><a href="#F">F</a>::operator/&#x3D;</h2>
+<h2 id="F-operator_slash_eq"><a href="#F-operator_slash_eq">F::operator/&#x3D;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -737,7 +737,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="F-operator_lshift_eq"><a href="#F">F</a>::operator&lt;&lt;&#x3D;</h2>
+<h2 id="F-operator_lshift_eq"><a href="#F-operator_lshift_eq">F::operator&lt;&lt;&#x3D;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -753,7 +753,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="F-operator_rshift"><a href="#F">F</a>::operator&gt;&gt;</h2>
+<h2 id="F-operator_rshift"><a href="#F-operator_rshift">F::operator&gt;&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -769,7 +769,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="F-operator_rshift_eq"><a href="#F">F</a>::operator&gt;&gt;&#x3D;</h2>
+<h2 id="F-operator_rshift_eq"><a href="#F-operator_rshift_eq">F::operator&gt;&gt;&#x3D;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -785,7 +785,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="F-operator_subs"><a href="#F">F</a>::operator[]</h2>
+<h2 id="F-operator_subs"><a href="#F-operator_subs">F::operator[]</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -801,7 +801,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="F-operator_xor"><a href="#F">F</a>::operator^</h2>
+<h2 id="F-operator_xor"><a href="#F-operator_xor">F::operator^</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -817,7 +817,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="F-operator_xor_eq"><a href="#F">F</a>::operator^&#x3D;</h2>
+<h2 id="F-operator_xor_eq"><a href="#F-operator_xor_eq">F::operator^&#x3D;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -833,7 +833,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="F-operator_bitor"><a href="#F">F</a>::operator|</h2>
+<h2 id="F-operator_bitor"><a href="#F-operator_bitor">F::operator|</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -849,7 +849,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="F-operator_or_eq"><a href="#F">F</a>::operator|&#x3D;</h2>
+<h2 id="F-operator_or_eq"><a href="#F-operator_or_eq">F::operator|&#x3D;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -865,7 +865,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="F-operator_or"><a href="#F">F</a>::operator||</h2>
+<h2 id="F-operator_or"><a href="#F-operator_or">F::operator||</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -881,7 +881,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="F-operator_bitnot"><a href="#F">F</a>::operator~</h2>
+<h2 id="F-operator_bitnot"><a href="#F-operator_bitnot">F::operator~</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -897,7 +897,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="F-operator_lshift"><a href="#F">F</a>::operator&lt;&lt;</h2>
+<h2 id="F-operator_lshift"><a href="#F-operator_lshift">F::operator&lt;&lt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -913,7 +913,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="F-operator_not"><a href="#F">F</a>::operator!</h2>
+<h2 id="F-operator_not"><a href="#F-operator_not">F::operator!</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -929,7 +929,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="F-operator_eq"><a href="#F">F</a>::operator&#x3D;&#x3D;</h2>
+<h2 id="F-operator_eq"><a href="#F-operator_eq">F::operator&#x3D;&#x3D;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -945,7 +945,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="F-operator_not_eq"><a href="#F">F</a>::operator!&#x3D;</h2>
+<h2 id="F-operator_not_eq"><a href="#F-operator_not_eq">F::operator!&#x3D;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -961,7 +961,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="F-operator_lt"><a href="#F">F</a>::operator&lt;</h2>
+<h2 id="F-operator_lt"><a href="#F-operator_lt">F::operator&lt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -977,7 +977,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="F-operator_le"><a href="#F">F</a>::operator&lt;&#x3D;</h2>
+<h2 id="F-operator_le"><a href="#F-operator_le">F::operator&lt;&#x3D;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -993,7 +993,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="F-operator_gt"><a href="#F">F</a>::operator&gt;</h2>
+<h2 id="F-operator_gt"><a href="#F-operator_gt">F::operator&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1009,7 +1009,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="F-operator_ge"><a href="#F">F</a>::operator&gt;&#x3D;</h2>
+<h2 id="F-operator_ge"><a href="#F-operator_ge">F::operator&gt;&#x3D;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1025,7 +1025,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="F-operator_3way"><a href="#F">F</a>::operator&lt;&#x3D;&gt;</h2>
+<h2 id="F-operator_3way"><a href="#F-operator_3way">F::operator&lt;&#x3D;&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1041,7 +1041,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f0">f0</h2>
+<h2 id="f0"><a href="#f0">f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1057,7 +1057,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f5">f5</h2>
+<h2 id="f5"><a href="#f5">f5</a></h2>
 <div>
 <span>See <a href="#A-f1"><code>A::f1</code></a></span>
 
@@ -1081,7 +1081,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="f6">f6</h2>
+<h2 id="f6"><a href="#f6">f6</a></h2>
 <div>
 <span>See <a href="#F-operator_bitnot"><code>F::operator~</code></a></span>
 
diff --git a/test-files/golden-tests/javadoc/relates/relates.html b/test-files/golden-tests/javadoc/relates/relates.html
index 07cd57cc8..36d1fb0db 100644
--- a/test-files/golden-tests/javadoc/relates/relates.html
+++ b/test-files/golden-tests/javadoc/relates/relates.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -41,7 +41,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 <div>
 <span>A brief for A.</span>
 
@@ -76,7 +76,7 @@ <h2>Non-Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="B">B</h2>
+<h2 id="B"><a href="#B">B</a></h2>
 <div>
 <span>A brief for B</span>
 
@@ -97,7 +97,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f">f</h2>
+<h2 id="f"><a href="#f">f</a></h2>
 <div>
 <span>A brief for f.</span>
 
diff --git a/test-files/golden-tests/javadoc/returns/returns.html b/test-files/golden-tests/javadoc/returns/returns.html
index 321d01f55..5dde3fc9f 100644
--- a/test-files/golden-tests/javadoc/returns/returns.html
+++ b/test-files/golden-tests/javadoc/returns/returns.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -41,7 +41,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="pair">pair</h2>
+<h2 id="pair"><a href="#pair">pair</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -89,7 +89,7 @@ <h2>Non-Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="pair-first"><a href="#pair">pair</a>::first</h2>
+<h2 id="pair-first"><a href="#pair-first">pair::first</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -104,7 +104,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="pair-second"><a href="#pair">pair</a>::second</h2>
+<h2 id="pair-second"><a href="#pair-second">pair::second</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -119,7 +119,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f">f</h2>
+<h2 id="f"><a href="#f">f</a></h2>
 <div>
 <span>A function with a single return value.</span>
 
@@ -143,7 +143,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="g">g</h2>
+<h2 id="g"><a href="#g">g</a></h2>
 <div>
 <span>A function with multiple return values.</span>
 
diff --git a/test-files/golden-tests/javadoc/throw/throw.html b/test-files/golden-tests/javadoc/throw/throw.html
index 303847b75..721daa7bb 100644
--- a/test-files/golden-tests/javadoc/throw/throw.html
+++ b/test-files/golden-tests/javadoc/throw/throw.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -26,7 +26,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="f">f</h2>
+<h2 id="f"><a href="#f">f</a></h2>
 <div>
 <span>brief</span>
 
diff --git a/test-files/golden-tests/javadoc/tparam/tparam-1.html b/test-files/golden-tests/javadoc/tparam/tparam-1.html
index 008194ded..069cd8f25 100644
--- a/test-files/golden-tests/javadoc/tparam/tparam-1.html
+++ b/test-files/golden-tests/javadoc/tparam/tparam-1.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -27,7 +27,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="f0">f0</h2>
+<h2 id="f0"><a href="#f0">f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -61,7 +61,7 @@ <h3>Template Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="f1">f1</h2>
+<h2 id="f1"><a href="#f1">f1</a></h2>
 <div>
 <span>brief</span>
 
diff --git a/test-files/golden-tests/output/canonical_1.html b/test-files/golden-tests/output/canonical_1.html
index 1fe75cf19..9f70086ce 100644
--- a/test-files/golden-tests/output/canonical_1.html
+++ b/test-files/golden-tests/output/canonical_1.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -32,7 +32,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -49,7 +49,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="B">B</h2>
+<h2 id="B"><a href="#B">B</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -66,7 +66,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="Ba">Ba</h2>
+<h2 id="Ba"><a href="#Ba">Ba</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -83,7 +83,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="Bx">Bx</h2>
+<h2 id="Bx"><a href="#Bx">Bx</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -100,7 +100,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="a">a</h2>
+<h2 id="a"><a href="#a">a</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -117,7 +117,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="b">b</h2>
+<h2 id="b"><a href="#b">b</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -134,7 +134,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="bA">bA</h2>
+<h2 id="bA"><a href="#bA">bA</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -151,7 +151,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="ba">ba</h2>
+<h2 id="ba"><a href="#ba">ba</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/snippets/distance.html b/test-files/golden-tests/snippets/distance.html
index 7909175e4..d78eeef02 100644
--- a/test-files/golden-tests/snippets/distance.html
+++ b/test-files/golden-tests/snippets/distance.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="distance">distance</h2>
+<h2 id="distance"><a href="#distance">distance</a></h2>
 <div>
 <span>Return the distance between two points</span>
 
diff --git a/test-files/golden-tests/snippets/is_prime.html b/test-files/golden-tests/snippets/is_prime.html
index 03bcfb747..b894b072d 100644
--- a/test-files/golden-tests/snippets/is_prime.html
+++ b/test-files/golden-tests/snippets/is_prime.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="is_prime">is_prime</h2>
+<h2 id="is_prime"><a href="#is_prime">is_prime</a></h2>
 <div>
 <span>Return true if a number is prime.</span>
 
diff --git a/test-files/golden-tests/snippets/sqrt.html b/test-files/golden-tests/snippets/sqrt.html
index a82a80644..4105c8c96 100644
--- a/test-files/golden-tests/snippets/sqrt.html
+++ b/test-files/golden-tests/snippets/sqrt.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="sqrt">sqrt</h2>
+<h2 id="sqrt"><a href="#sqrt">sqrt</a></h2>
 <div>
 <span>Computes the square root of an integral value.</span>
 
diff --git a/test-files/golden-tests/snippets/terminate.html b/test-files/golden-tests/snippets/terminate.html
index 992ca8f66..dace77678 100644
--- a/test-files/golden-tests/snippets/terminate.html
+++ b/test-files/golden-tests/snippets/terminate.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="terminate">terminate</h2>
+<h2 id="terminate"><a href="#terminate">terminate</a></h2>
 <div>
 <span>Exit the program.</span>
 
diff --git a/test-files/golden-tests/symbols/concept/concept.html b/test-files/golden-tests/symbols/concept/concept.html
index 76864dd15..534649c41 100644
--- a/test-files/golden-tests/symbols/concept/concept.html
+++ b/test-files/golden-tests/symbols/concept/concept.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -51,7 +51,7 @@ <h2>Concepts</h2>
 </div>
 <div>
 <div>
-<h2 id="f">f</h2>
+<h2 id="f"><a href="#f">f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -68,7 +68,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="x">x</h2>
+<h2 id="x"><a href="#x">x</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -83,7 +83,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="C">C</h2>
+<h2 id="C"><a href="#C">C</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/concept/requires-clause.html b/test-files/golden-tests/symbols/concept/requires-clause.html
index 37edf9263..9d7e1ca69 100644
--- a/test-files/golden-tests/symbols/concept/requires-clause.html
+++ b/test-files/golden-tests/symbols/concept/requires-clause.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -41,7 +41,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-0c">A</h2>
+<h2 id="A-0c"><a href="#A-0c">A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -60,7 +60,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-08">A</h2>
+<h2 id="A-08"><a href="#A-08">A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -79,7 +79,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f">f</h2>
+<h2 id="f"><a href="#f">f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -97,7 +97,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="g-0f">g</h2>
+<h2 id="g-0f"><a href="#g-0f">g</a></h2>
 </div>
 <div>
 <h3>Synopses</h3>
@@ -138,7 +138,7 @@ <h3>Synopses</h3>
 </div>
 <div>
 <div>
-<h2 id="g-04">g</h2>
+<h2 id="g-04"><a href="#g-04">g</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -156,7 +156,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="g-00">g</h2>
+<h2 id="g-00"><a href="#g-00">g</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -174,7 +174,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="g-03">g</h2>
+<h2 id="g-03"><a href="#g-03">g</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/enum/enum.html b/test-files/golden-tests/symbols/enum/enum.html
index efc0374c7..21252a8af 100644
--- a/test-files/golden-tests/symbols/enum/enum.html
+++ b/test-files/golden-tests/symbols/enum/enum.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Enums</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -29,7 +29,7 @@ <h2>Enums</h2>
 </div>
 <div>
 <div>
-<h2 id="E0">E0</h2>
+<h2 id="E0"><a href="#E0">E0</a></h2>
 <div>
 <span>E0 brief.</span>
 
@@ -73,7 +73,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="E1">E1</h2>
+<h2 id="E1"><a href="#E1">E1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -109,7 +109,7 @@ <h3>Members</h3>
 </div>
 <div>
 <div>
-<h2 id="E2">E2</h2>
+<h2 id="E2"><a href="#E2">E2</a></h2>
 <div>
 <span>E2 brief.</span>
 
@@ -153,7 +153,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="E3">E3</h2>
+<h2 id="E3"><a href="#E3">E3</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/function/attributes-2.html b/test-files/golden-tests/symbols/function/attributes-2.html
index 8f3f4bf24..4077e9d8f 100644
--- a/test-files/golden-tests/symbols/function/attributes-2.html
+++ b/test-files/golden-tests/symbols/function/attributes-2.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,7 +25,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="f">f</h2>
+<h2 id="f"><a href="#f">f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/function/attributes_1.html b/test-files/golden-tests/symbols/function/attributes_1.html
index b794901ce..719b8266b 100644
--- a/test-files/golden-tests/symbols/function/attributes_1.html
+++ b/test-files/golden-tests/symbols/function/attributes_1.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,7 +25,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="f">f</h2>
+<h2 id="f"><a href="#f">f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/function/auto.html b/test-files/golden-tests/symbols/function/auto.html
index 9416ed928..55a126e4a 100644
--- a/test-files/golden-tests/symbols/function/auto.html
+++ b/test-files/golden-tests/symbols/function/auto.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -26,7 +26,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="f">f</h2>
+<h2 id="f"><a href="#f">f</a></h2>
 <div>
 <span>A function that uses auto</span>
 
diff --git a/test-files/golden-tests/symbols/function/explicit-conv-operator.html b/test-files/golden-tests/symbols/function/explicit-conv-operator.html
index c719ab515..38a8fe1db 100644
--- a/test-files/golden-tests/symbols/function/explicit-conv-operator.html
+++ b/test-files/golden-tests/symbols/function/explicit-conv-operator.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -28,7 +28,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="Explicit">Explicit</h2>
+<h2 id="Explicit"><a href="#Explicit">Explicit</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -59,7 +59,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="Explicit-2conversion"><a href="#Explicit">Explicit</a>::operator bool</h2>
+<h2 id="Explicit-2conversion"><a href="#Explicit-2conversion">Explicit::operator bool</a></h2>
 <div>
 <span>Conversion to <code>bool</code></span>
 
@@ -83,7 +83,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="ExplicitExpression">ExplicitExpression</h2>
+<h2 id="ExplicitExpression"><a href="#ExplicitExpression">ExplicitExpression</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -115,7 +115,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="ExplicitExpression-2conversion"><a href="#ExplicitExpression">ExplicitExpression</a>::operator bool</h2>
+<h2 id="ExplicitExpression-2conversion"><a href="#ExplicitExpression-2conversion">ExplicitExpression::operator bool</a></h2>
 <div>
 <span>Conversion to <code>bool</code></span>
 
@@ -139,7 +139,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="ExplicitFalse">ExplicitFalse</h2>
+<h2 id="ExplicitFalse"><a href="#ExplicitFalse">ExplicitFalse</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -170,7 +170,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="ExplicitFalse-2conversion"><a href="#ExplicitFalse">ExplicitFalse</a>::operator bool</h2>
+<h2 id="ExplicitFalse-2conversion"><a href="#ExplicitFalse-2conversion">ExplicitFalse::operator bool</a></h2>
 <div>
 <span>Conversion to <code>bool</code></span>
 
@@ -194,7 +194,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="ExplicitTrue">ExplicitTrue</h2>
+<h2 id="ExplicitTrue"><a href="#ExplicitTrue">ExplicitTrue</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -225,7 +225,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="ExplicitTrue-2conversion"><a href="#ExplicitTrue">ExplicitTrue</a>::operator bool</h2>
+<h2 id="ExplicitTrue-2conversion"><a href="#ExplicitTrue-2conversion">ExplicitTrue::operator bool</a></h2>
 <div>
 <span>Conversion to <code>bool</code></span>
 
diff --git a/test-files/golden-tests/symbols/function/explicit-ctor.html b/test-files/golden-tests/symbols/function/explicit-ctor.html
index 9ca9c4295..6ea5074fe 100644
--- a/test-files/golden-tests/symbols/function/explicit-ctor.html
+++ b/test-files/golden-tests/symbols/function/explicit-ctor.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -28,7 +28,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="Explicit">Explicit</h2>
+<h2 id="Explicit"><a href="#Explicit">Explicit</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -59,7 +59,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="Explicit-2constructor-04"><a href="#Explicit">Explicit</a>::Explicit</h2>
+<h2 id="Explicit-2constructor-04"><a href="#Explicit-2constructor-04">Explicit::Explicit</a></h2>
 <div>
 <span>Constructors</span>
 
@@ -108,7 +108,7 @@ <h3>Synopses</h3>
 </div>
 <div>
 <div>
-<h2 id="Explicit-2constructor-02"><a href="#Explicit">Explicit</a>::Explicit</h2>
+<h2 id="Explicit-2constructor-02"><a href="#Explicit-2constructor-02">Explicit::Explicit</a></h2>
 <div>
 <span>Default constructor</span>
 
@@ -128,7 +128,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="Explicit-2constructor-00"><a href="#Explicit">Explicit</a>::Explicit</h2>
+<h2 id="Explicit-2constructor-00"><a href="#Explicit-2constructor-00">Explicit::Explicit</a></h2>
 <div>
 <span>Copy constructor</span>
 
@@ -165,7 +165,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="Explicit-2constructor-0b"><a href="#Explicit">Explicit</a>::Explicit</h2>
+<h2 id="Explicit-2constructor-0b"><a href="#Explicit-2constructor-0b">Explicit::Explicit</a></h2>
 <div>
 <span>Move constructor</span>
 
@@ -202,7 +202,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="Explicit-2constructor-03"><a href="#Explicit">Explicit</a>::Explicit</h2>
+<h2 id="Explicit-2constructor-03"><a href="#Explicit-2constructor-03">Explicit::Explicit</a></h2>
 <div>
 <span>Constructor</span>
 
@@ -224,7 +224,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="ExplicitExpression">ExplicitExpression</h2>
+<h2 id="ExplicitExpression"><a href="#ExplicitExpression">ExplicitExpression</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -256,7 +256,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="ExplicitExpression-2constructor-07"><a href="#ExplicitExpression">ExplicitExpression</a>::ExplicitExpression</h2>
+<h2 id="ExplicitExpression-2constructor-07"><a href="#ExplicitExpression-2constructor-07">ExplicitExpression::ExplicitExpression</a></h2>
 <div>
 <span>Constructors</span>
 
@@ -305,7 +305,7 @@ <h3>Synopses</h3>
 </div>
 <div>
 <div>
-<h2 id="ExplicitExpression-2constructor-0b"><a href="#ExplicitExpression">ExplicitExpression</a>::ExplicitExpression</h2>
+<h2 id="ExplicitExpression-2constructor-0b"><a href="#ExplicitExpression-2constructor-0b">ExplicitExpression::ExplicitExpression</a></h2>
 <div>
 <span>Default constructor</span>
 
@@ -325,7 +325,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="ExplicitExpression-2constructor-04"><a href="#ExplicitExpression">ExplicitExpression</a>::ExplicitExpression</h2>
+<h2 id="ExplicitExpression-2constructor-04"><a href="#ExplicitExpression-2constructor-04">ExplicitExpression::ExplicitExpression</a></h2>
 <div>
 <span>Copy constructor</span>
 
@@ -362,7 +362,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="ExplicitExpression-2constructor-08"><a href="#ExplicitExpression">ExplicitExpression</a>::ExplicitExpression</h2>
+<h2 id="ExplicitExpression-2constructor-08"><a href="#ExplicitExpression-2constructor-08">ExplicitExpression::ExplicitExpression</a></h2>
 <div>
 <span>Move constructor</span>
 
@@ -399,7 +399,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="ExplicitExpression-2constructor-02"><a href="#ExplicitExpression">ExplicitExpression</a>::ExplicitExpression</h2>
+<h2 id="ExplicitExpression-2constructor-02"><a href="#ExplicitExpression-2constructor-02">ExplicitExpression::ExplicitExpression</a></h2>
 <div>
 <span>Constructor</span>
 
@@ -421,7 +421,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="ExplicitFalse">ExplicitFalse</h2>
+<h2 id="ExplicitFalse"><a href="#ExplicitFalse">ExplicitFalse</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -452,7 +452,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="ExplicitFalse-2constructor-07"><a href="#ExplicitFalse">ExplicitFalse</a>::ExplicitFalse</h2>
+<h2 id="ExplicitFalse-2constructor-07"><a href="#ExplicitFalse-2constructor-07">ExplicitFalse::ExplicitFalse</a></h2>
 <div>
 <span>Constructors</span>
 
@@ -501,7 +501,7 @@ <h3>Synopses</h3>
 </div>
 <div>
 <div>
-<h2 id="ExplicitFalse-2constructor-01"><a href="#ExplicitFalse">ExplicitFalse</a>::ExplicitFalse</h2>
+<h2 id="ExplicitFalse-2constructor-01"><a href="#ExplicitFalse-2constructor-01">ExplicitFalse::ExplicitFalse</a></h2>
 <div>
 <span>Default constructor</span>
 
@@ -521,7 +521,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="ExplicitFalse-2constructor-08"><a href="#ExplicitFalse">ExplicitFalse</a>::ExplicitFalse</h2>
+<h2 id="ExplicitFalse-2constructor-08"><a href="#ExplicitFalse-2constructor-08">ExplicitFalse::ExplicitFalse</a></h2>
 <div>
 <span>Copy constructor</span>
 
@@ -558,7 +558,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="ExplicitFalse-2constructor-0a"><a href="#ExplicitFalse">ExplicitFalse</a>::ExplicitFalse</h2>
+<h2 id="ExplicitFalse-2constructor-0a"><a href="#ExplicitFalse-2constructor-0a">ExplicitFalse::ExplicitFalse</a></h2>
 <div>
 <span>Move constructor</span>
 
@@ -595,7 +595,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="ExplicitFalse-2constructor-04"><a href="#ExplicitFalse">ExplicitFalse</a>::ExplicitFalse</h2>
+<h2 id="ExplicitFalse-2constructor-04"><a href="#ExplicitFalse-2constructor-04">ExplicitFalse::ExplicitFalse</a></h2>
 <div>
 <span>Constructor</span>
 
@@ -617,7 +617,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="ExplicitTrue">ExplicitTrue</h2>
+<h2 id="ExplicitTrue"><a href="#ExplicitTrue">ExplicitTrue</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -648,7 +648,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="ExplicitTrue-2constructor-01"><a href="#ExplicitTrue">ExplicitTrue</a>::ExplicitTrue</h2>
+<h2 id="ExplicitTrue-2constructor-01"><a href="#ExplicitTrue-2constructor-01">ExplicitTrue::ExplicitTrue</a></h2>
 <div>
 <span>Constructors</span>
 
@@ -697,7 +697,7 @@ <h3>Synopses</h3>
 </div>
 <div>
 <div>
-<h2 id="ExplicitTrue-2constructor-0d"><a href="#ExplicitTrue">ExplicitTrue</a>::ExplicitTrue</h2>
+<h2 id="ExplicitTrue-2constructor-0d"><a href="#ExplicitTrue-2constructor-0d">ExplicitTrue::ExplicitTrue</a></h2>
 <div>
 <span>Default constructor</span>
 
@@ -717,7 +717,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="ExplicitTrue-2constructor-04"><a href="#ExplicitTrue">ExplicitTrue</a>::ExplicitTrue</h2>
+<h2 id="ExplicitTrue-2constructor-04"><a href="#ExplicitTrue-2constructor-04">ExplicitTrue::ExplicitTrue</a></h2>
 <div>
 <span>Copy constructor</span>
 
@@ -754,7 +754,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="ExplicitTrue-2constructor-08"><a href="#ExplicitTrue">ExplicitTrue</a>::ExplicitTrue</h2>
+<h2 id="ExplicitTrue-2constructor-08"><a href="#ExplicitTrue-2constructor-08">ExplicitTrue::ExplicitTrue</a></h2>
 <div>
 <span>Move constructor</span>
 
@@ -791,7 +791,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="ExplicitTrue-2constructor-05"><a href="#ExplicitTrue">ExplicitTrue</a>::ExplicitTrue</h2>
+<h2 id="ExplicitTrue-2constructor-05"><a href="#ExplicitTrue-2constructor-05">ExplicitTrue::ExplicitTrue</a></h2>
 <div>
 <span>Constructor</span>
 
diff --git a/test-files/golden-tests/symbols/function/explicit-object-parameter.html b/test-files/golden-tests/symbols/function/explicit-object-parameter.html
index f07612c49..31960d557 100644
--- a/test-files/golden-tests/symbols/function/explicit-object-parameter.html
+++ b/test-files/golden-tests/symbols/function/explicit-object-parameter.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,7 +25,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="Optional">Optional</h2>
+<h2 id="Optional"><a href="#Optional">Optional</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -56,7 +56,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="Optional-value-0c"><a href="#Optional">Optional</a>::value</h2>
+<h2 id="Optional-value-0c"><a href="#Optional-value-0c">Optional::value</a></h2>
 </div>
 <div>
 <h3>Synopses</h3>
@@ -89,7 +89,7 @@ <h3>Synopses</h3>
 </div>
 <div>
 <div>
-<h2 id="Optional-value-05"><a href="#Optional">Optional</a>::value</h2>
+<h2 id="Optional-value-05"><a href="#Optional-value-05">Optional::value</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -107,7 +107,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="Optional-value-06"><a href="#Optional">Optional</a>::value</h2>
+<h2 id="Optional-value-06"><a href="#Optional-value-06">Optional::value</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/function/function-parm-decay.html b/test-files/golden-tests/symbols/function/function-parm-decay.html
index 2583e6094..17c6e5e73 100644
--- a/test-files/golden-tests/symbols/function/function-parm-decay.html
+++ b/test-files/golden-tests/symbols/function/function-parm-decay.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -42,7 +42,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="T">T</h2>
+<h2 id="T"><a href="#T">T</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -57,7 +57,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="U">U</h2>
+<h2 id="U"><a href="#U">U</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -72,7 +72,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f">f</h2>
+<h2 id="f"><a href="#f">f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -88,7 +88,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="g">g</h2>
+<h2 id="g"><a href="#g">g</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -104,7 +104,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="h">h</h2>
+<h2 id="h"><a href="#h">h</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -120,7 +120,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="i">i</h2>
+<h2 id="i"><a href="#i">i</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/function/function-template-template.html b/test-files/golden-tests/symbols/function/function-template-template.html
index 81dc5442e..389e15ac2 100644
--- a/test-files/golden-tests/symbols/function/function-template-template.html
+++ b/test-files/golden-tests/symbols/function/function-template-template.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,7 +25,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="f">f</h2>
+<h2 id="f"><a href="#f">f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/function/function-template.html b/test-files/golden-tests/symbols/function/function-template.html
index 46ab5c29d..a6981fb8f 100644
--- a/test-files/golden-tests/symbols/function/function-template.html
+++ b/test-files/golden-tests/symbols/function/function-template.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -36,7 +36,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="f0">f0</h2>
+<h2 id="f0"><a href="#f0">f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -53,7 +53,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f1">f1</h2>
+<h2 id="f1"><a href="#f1">f1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -70,7 +70,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f2">f2</h2>
+<h2 id="f2"><a href="#f2">f2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -87,7 +87,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f3">f3</h2>
+<h2 id="f3"><a href="#f3">f3</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -106,7 +106,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="g0">g0</h2>
+<h2 id="g0"><a href="#g0">g0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -123,7 +123,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="g1">g1</h2>
+<h2 id="g1"><a href="#g1">g1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -140,7 +140,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="g2">g2</h2>
+<h2 id="g2"><a href="#g2">g2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -159,7 +159,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="h0">h0</h2>
+<h2 id="h0"><a href="#h0">h0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -175,7 +175,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="h1">h1</h2>
+<h2 id="h1"><a href="#h1">h1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -193,7 +193,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="i">i</h2>
+<h2 id="i"><a href="#i">i</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -212,7 +212,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="j0">j0</h2>
+<h2 id="j0"><a href="#j0">j0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -229,7 +229,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="j1">j1</h2>
+<h2 id="j1"><a href="#j1">j1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/function/function-tparm-decay.html b/test-files/golden-tests/symbols/function/function-tparm-decay.html
index 11fd15d9c..7c98f2623 100644
--- a/test-files/golden-tests/symbols/function/function-tparm-decay.html
+++ b/test-files/golden-tests/symbols/function/function-tparm-decay.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -42,7 +42,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="T">T</h2>
+<h2 id="T"><a href="#T">T</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -57,7 +57,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="U">U</h2>
+<h2 id="U"><a href="#U">U</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -72,7 +72,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f">f</h2>
+<h2 id="f"><a href="#f">f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -89,7 +89,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="g">g</h2>
+<h2 id="g"><a href="#g">g</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -106,7 +106,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="h">h</h2>
+<h2 id="h"><a href="#h">h</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -123,7 +123,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="i">i</h2>
+<h2 id="i"><a href="#i">i</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/function/mem-fn.html b/test-files/golden-tests/symbols/function/mem-fn.html
index 1c060f6a2..d0b0309a6 100644
--- a/test-files/golden-tests/symbols/function/mem-fn.html
+++ b/test-files/golden-tests/symbols/function/mem-fn.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -42,7 +42,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="T01">T01</h2>
+<h2 id="T01"><a href="#T01">T01</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -72,7 +72,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="T01-f"><a href="#T01">T01</a>::f</h2>
+<h2 id="T01-f"><a href="#T01-f">T01::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -88,7 +88,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="T02">T02</h2>
+<h2 id="T02"><a href="#T02">T02</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -118,7 +118,7 @@ <h2>Static Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="T02-f"><a href="#T02">T02</a>::f</h2>
+<h2 id="T02-f"><a href="#T02-f">T02::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -135,7 +135,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="T03">T03</h2>
+<h2 id="T03"><a href="#T03">T03</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -165,7 +165,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="T03-f"><a href="#T03">T03</a>::f</h2>
+<h2 id="T03-f"><a href="#T03-f">T03::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -181,7 +181,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="T04">T04</h2>
+<h2 id="T04"><a href="#T04">T04</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -211,7 +211,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="T04-f"><a href="#T04">T04</a>::f</h2>
+<h2 id="T04-f"><a href="#T04-f">T04::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -227,7 +227,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="T05">T05</h2>
+<h2 id="T05"><a href="#T05">T05</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -257,7 +257,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="T05-f"><a href="#T05">T05</a>::f</h2>
+<h2 id="T05-f"><a href="#T05-f">T05::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -273,7 +273,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="T06">T06</h2>
+<h2 id="T06"><a href="#T06">T06</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -303,7 +303,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="T06-f"><a href="#T06">T06</a>::f</h2>
+<h2 id="T06-f"><a href="#T06-f">T06::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -320,7 +320,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="T08">T08</h2>
+<h2 id="T08"><a href="#T08">T08</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -350,7 +350,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="T08-f"><a href="#T08">T08</a>::f</h2>
+<h2 id="T08-f"><a href="#T08-f">T08::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -366,7 +366,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="T09">T09</h2>
+<h2 id="T09"><a href="#T09">T09</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -396,7 +396,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="T09-f"><a href="#T09">T09</a>::f</h2>
+<h2 id="T09-f"><a href="#T09-f">T09::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -412,7 +412,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="T10">T10</h2>
+<h2 id="T10"><a href="#T10">T10</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -442,7 +442,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="T10-f"><a href="#T10">T10</a>::f</h2>
+<h2 id="T10-f"><a href="#T10-f">T10::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -458,7 +458,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="T11">T11</h2>
+<h2 id="T11"><a href="#T11">T11</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -488,7 +488,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="T11-f"><a href="#T11">T11</a>::f</h2>
+<h2 id="T11-f"><a href="#T11-f">T11::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -504,7 +504,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="T12">T12</h2>
+<h2 id="T12"><a href="#T12">T12</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -534,7 +534,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="T12-f"><a href="#T12">T12</a>::f</h2>
+<h2 id="T12-f"><a href="#T12-f">T12::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -550,7 +550,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="T13">T13</h2>
+<h2 id="T13"><a href="#T13">T13</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -580,7 +580,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="T13-f"><a href="#T13">T13</a>::f</h2>
+<h2 id="T13-f"><a href="#T13-f">T13::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -597,7 +597,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="T14">T14</h2>
+<h2 id="T14"><a href="#T14">T14</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -642,7 +642,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="T14-f"><a href="#T14">T14</a>::f</h2>
+<h2 id="T14-f"><a href="#T14-f">T14::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -659,7 +659,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="T15">T15</h2>
+<h2 id="T15"><a href="#T15">T15</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -689,7 +689,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="T15-f"><a href="#T15">T15</a>::f</h2>
+<h2 id="T15-f"><a href="#T15-f">T15::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -705,7 +705,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="T16">T16</h2>
+<h2 id="T16"><a href="#T16">T16</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -735,7 +735,7 @@ <h2>Static Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="T16-f"><a href="#T16">T16</a>::f</h2>
+<h2 id="T16-f"><a href="#T16-f">T16::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -752,7 +752,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="T17">T17</h2>
+<h2 id="T17"><a href="#T17">T17</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -797,7 +797,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="T17-f"><a href="#T17">T17</a>::f</h2>
+<h2 id="T17-f"><a href="#T17-f">T17::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -814,7 +814,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="U">U</h2>
+<h2 id="U"><a href="#U">U</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -873,7 +873,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="U-f1"><a href="#U">U</a>::f1</h2>
+<h2 id="U-f1"><a href="#U-f1">U::f1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -890,7 +890,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="U-f3"><a href="#U">U</a>::f3</h2>
+<h2 id="U-f3"><a href="#U-f3">U::f3</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -907,7 +907,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="U-f2"><a href="#U">U</a>::f2</h2>
+<h2 id="U-f2"><a href="#U-f2">U::f2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -925,7 +925,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="V">V</h2>
+<h2 id="V"><a href="#V">V</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -984,7 +984,7 @@ <h2>Static Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="V-f3"><a href="#V">V</a>::f3</h2>
+<h2 id="V-f3"><a href="#V-f3">V::f3</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/function/merge-params.html b/test-files/golden-tests/symbols/function/merge-params.html
index 9f9950a2e..219e25fb4 100644
--- a/test-files/golden-tests/symbols/function/merge-params.html
+++ b/test-files/golden-tests/symbols/function/merge-params.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -26,7 +26,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="f">f</h2>
+<h2 id="f"><a href="#f">f</a></h2>
 <div>
 <span>Function</span>
 
diff --git a/test-files/golden-tests/symbols/function/merge-tparams.html b/test-files/golden-tests/symbols/function/merge-tparams.html
index 44edea7f2..2aafa636f 100644
--- a/test-files/golden-tests/symbols/function/merge-tparams.html
+++ b/test-files/golden-tests/symbols/function/merge-tparams.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -26,7 +26,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="f">f</h2>
+<h2 id="f"><a href="#f">f</a></h2>
 <div>
 <span>Function</span>
 
diff --git a/test-files/golden-tests/symbols/function/noreturn.html b/test-files/golden-tests/symbols/function/noreturn.html
index 8ea7eef24..6eb8e46da 100644
--- a/test-files/golden-tests/symbols/function/noreturn.html
+++ b/test-files/golden-tests/symbols/function/noreturn.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -38,7 +38,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="T">T</h2>
+<h2 id="T"><a href="#T">T</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -99,7 +99,7 @@ <h2>Friends</h2>
 </div>
 <div>
 <div>
-<h2 id="T-f3"><a href="#T">T</a>::f3</h2>
+<h2 id="T-f3"><a href="#T-f3">T::f3</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -116,7 +116,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="T-f2"><a href="#T">T</a>::f2</h2>
+<h2 id="T-f2"><a href="#T-f2">T::f2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -134,7 +134,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f1">f1</h2>
+<h2 id="f1"><a href="#f1">f1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/function/overloaded-op-1.html b/test-files/golden-tests/symbols/function/overloaded-op-1.html
index 30091ef65..c8bf41a68 100644
--- a/test-files/golden-tests/symbols/function/overloaded-op-1.html
+++ b/test-files/golden-tests/symbols/function/overloaded-op-1.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,7 +25,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="T">T</h2>
+<h2 id="T"><a href="#T">T</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -56,7 +56,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="T-operator_plus"><a href="#T">T</a>::operator+</h2>
+<h2 id="T-operator_plus"><a href="#T-operator_plus">T::operator+</a></h2>
 <div>
 <span>Unary plus operator</span>
 
diff --git a/test-files/golden-tests/symbols/function/overloaded-op-2.html b/test-files/golden-tests/symbols/function/overloaded-op-2.html
index f82e273b7..2a940e394 100644
--- a/test-files/golden-tests/symbols/function/overloaded-op-2.html
+++ b/test-files/golden-tests/symbols/function/overloaded-op-2.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,7 +25,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="T">T</h2>
+<h2 id="T"><a href="#T">T</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -56,7 +56,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="T-operator_plus"><a href="#T">T</a>::operator+</h2>
+<h2 id="T-operator_plus"><a href="#T-operator_plus">T::operator+</a></h2>
 <div>
 <span>Addition operator</span>
 
diff --git a/test-files/golden-tests/symbols/function/sfinae.adoc b/test-files/golden-tests/symbols/function/sfinae.adoc
index 23f370edb..2f2be6002 100644
--- a/test-files/golden-tests/symbols/function/sfinae.adoc
+++ b/test-files/golden-tests/symbols/function/sfinae.adoc
@@ -21,7 +21,7 @@
 | <<A-09,`A`>> 
 | The partial specialization of A is enabled via a template parameter
 | <<A-02,`A&lt;T&gt;`>> 
-| Specialization for floating point types
+| Specialization for integral types
 | <<S-02,`S`>> 
 | SFINAE with std&colon;&colon;void&lowbar;t
 | <<S-08,`S&lt;T, std::void&lowbar;t&lt;T::a::b&gt;&gt;`>> 
@@ -109,9 +109,9 @@ class A;
 ----
 
 [#A-02]
-== A&lt;T&gt;
+== <<A-09,A>>&lt;T&gt;
 
-Specialization for floating point types
+Specialization for integral types
 
 === Synopsis
 
@@ -163,7 +163,7 @@ store(void const*);
 ----
 
 [#S-08]
-== S&lt;T, std::void&lowbar;t&lt;T::a::b&gt;&gt;
+== <<S-02,S>>&lt;T, std::void&lowbar;t&lt;T::a::b&gt;&gt;
 
 SFINAE with std&colon;&colon;void&lowbar;t
 
@@ -186,7 +186,7 @@ struct <<S-02,S>>&lt;T, std::void&lowbar;t&lt;T::a::b&gt;&gt;;
 |===
 
 [#S-08-store]
-== <<S-08,S>>&lt;T, std::void&lowbar;t&lt;T::a::b&gt;&gt;::store
+== <<S-08,S&lt;T, std::void&lowbar;t&lt;T::a::b&gt;&gt;>>::store
 
 === Synopsis
 
diff --git a/test-files/golden-tests/symbols/function/sfinae.cpp b/test-files/golden-tests/symbols/function/sfinae.cpp
index c07075297..c160b568e 100644
--- a/test-files/golden-tests/symbols/function/sfinae.cpp
+++ b/test-files/golden-tests/symbols/function/sfinae.cpp
@@ -68,7 +68,7 @@ void f10(T value);
 template<class T, class Enable = void>
 class A {};
 
-/// Specialization for floating point types
+/// Specialization for integral types
 template<class T>
 class A<T, std::enable_if_t<std::is_integral_v<T>>> {};
 
diff --git a/test-files/golden-tests/symbols/function/sfinae.html b/test-files/golden-tests/symbols/function/sfinae.html
index f3d94879b..2539a092d 100644
--- a/test-files/golden-tests/symbols/function/sfinae.html
+++ b/test-files/golden-tests/symbols/function/sfinae.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -33,7 +33,7 @@ <h2>Types</h2>
 <tbody>
 <tr>
 <td><a href="#A-09"><code>A</code></a> </td><td><span>The partial specialization of A is enabled via a template parameter</span></td></tr><tr>
-<td><a href="#A-02"><code>A&lt;T&gt;</code></a> </td><td><span>Specialization for floating point types</span></td></tr><tr>
+<td><a href="#A-02"><code>A&lt;T&gt;</code></a> </td><td><span>Specialization for integral types</span></td></tr><tr>
 <td><a href="#S-02"><code>S</code></a> </td><td><span>SFINAE with std::void_t</span></td></tr><tr>
 <td><a href="#S-08"><code>S&lt;T, std::void_t&lt;T::a::b&gt;&gt;</code></a> </td><td><span>SFINAE with std::void_t</span></td></tr>
 </tbody>
@@ -65,7 +65,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="B">B</h2>
+<h2 id="B"><a href="#B">B</a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -84,7 +84,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="B-C"><a href="#B">B</a>::C</h2>
+<h2 id="B-C"><a href="#B-C">B::C</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -115,7 +115,7 @@ <h2>Non-Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-09">A</h2>
+<h2 id="A-09"><a href="#A-09">A</a></h2>
 <div>
 <span>The partial specialization of A is enabled via a template parameter</span>
 
@@ -139,9 +139,9 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-02">A&lt;T&gt;</h2>
+<h2 id="A-02"><a href="#A-02">A&lt;T&gt;</a></h2>
 <div>
-<span>Specialization for floating point types</span>
+<span>Specialization for integral types</span>
 
 </div>
 </div>
@@ -162,7 +162,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S-02">S</h2>
+<h2 id="S-02"><a href="#S-02">S</a></h2>
 <div>
 <span>SFINAE with std::void_t</span>
 
@@ -199,7 +199,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S-02-store"><a href="#S-02">S</a>::store</h2>
+<h2 id="S-02-store"><a href="#S-02-store">S::store</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -215,7 +215,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S-08">S&lt;T, std::void_t&lt;T::a::b&gt;&gt;</h2>
+<h2 id="S-08"><a href="#S-08">S&lt;T, std::void_t&lt;T::a::b&gt;&gt;</a></h2>
 <div>
 <span>SFINAE with std::void_t</span>
 
@@ -250,7 +250,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S-08-store"><a href="#S-08">S</a>&lt;T, std::void_t&lt;T::a::b&gt;&gt;::store</h2>
+<h2 id="S-08-store"><a href="#S-08-store">S&lt;T, std::void_t&lt;T::a::b&gt;&gt;::store</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -266,7 +266,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f1">f1</h2>
+<h2 id="f1"><a href="#f1">f1</a></h2>
 <div>
 <span>Enabled via return type</span>
 
@@ -288,7 +288,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f10">f10</h2>
+<h2 id="f10"><a href="#f10">f10</a></h2>
 <div>
 <span>Enabled via type template parameter</span>
 
@@ -316,7 +316,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="f2">f2</h2>
+<h2 id="f2"><a href="#f2">f2</a></h2>
 <div>
 <span>Enabling a specified return type</span>
 
@@ -338,7 +338,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f3">f3</h2>
+<h2 id="f3"><a href="#f3">f3</a></h2>
 <div>
 <span>Enabling a specified return type in another namespace</span>
 
@@ -360,7 +360,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f4">f4</h2>
+<h2 id="f4"><a href="#f4">f4</a></h2>
 <div>
 <span>Enabled via return type with std::enable_if</span>
 
@@ -382,7 +382,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f5">f5</h2>
+<h2 id="f5"><a href="#f5">f5</a></h2>
 <div>
 <span>Enabled via a non-type template parameter with helper</span>
 
@@ -404,7 +404,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f6">f6</h2>
+<h2 id="f6"><a href="#f6">f6</a></h2>
 <div>
 <span>Enabled via a non-type template parameter without helper</span>
 
@@ -426,7 +426,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f7">f7</h2>
+<h2 id="f7"><a href="#f7">f7</a></h2>
 <div>
 <span>Enabled via a non-type template parameter using int instead of bool</span>
 
@@ -448,7 +448,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f8">f8</h2>
+<h2 id="f8"><a href="#f8">f8</a></h2>
 <div>
 <span>Enabled via parameter without helper</span>
 
@@ -470,7 +470,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f9">f9</h2>
+<h2 id="f9"><a href="#f9">f9</a></h2>
 <div>
 <span>Enabled via parameter with helper</span>
 
diff --git a/test-files/golden-tests/symbols/function/sfinae.xml b/test-files/golden-tests/symbols/function/sfinae.xml
index 39bf3e834..59abacf9d 100644
--- a/test-files/golden-tests/symbols/function/sfinae.xml
+++ b/test-files/golden-tests/symbols/function/sfinae.xml
@@ -31,7 +31,7 @@
       <file short-path="sfinae.cpp" source-path="sfinae.cpp" line="73" class="def"/>
       <doc>
         <brief>
-          <text>Specialization for floating point types</text>
+          <text>Specialization for integral types</text>
         </brief>
       </doc>
     </class>
diff --git a/test-files/golden-tests/symbols/function/spec-mem-implicit-instantiation.adoc b/test-files/golden-tests/symbols/function/spec-mem-implicit-instantiation.adoc
index 0c1e1e1eb..e19c48dc9 100644
--- a/test-files/golden-tests/symbols/function/spec-mem-implicit-instantiation.adoc
+++ b/test-files/golden-tests/symbols/function/spec-mem-implicit-instantiation.adoc
@@ -128,7 +128,7 @@ f();
 ----
 
 [#A-0f]
-== A&lt;bool&gt;
+== <<A-0e,A>>&lt;bool&gt;
 
 === Synopsis
 
@@ -160,7 +160,7 @@ struct <<A-0e,A>>&lt;bool&gt;;
 |===
 
 [#A-0f-B]
-== <<A-0f,A>>&lt;bool&gt;::B
+== <<A-0f,A&lt;bool&gt;>>::B
 
 === Synopsis
 
@@ -173,7 +173,7 @@ struct B;
 ----
 
 [#A-0f-C-00]
-== <<A-0f,A>>&lt;bool&gt;::C
+== <<A-0f,A&lt;bool&gt;>>::C
 
 === Synopsis
 
@@ -186,7 +186,7 @@ struct C;
 ----
 
 [#A-0f-C-01]
-== <<A-0f,A>>&lt;bool&gt;::C&lt;double*&gt;
+== <<A-0f,A&lt;bool&gt;>>::<<A-0e-C,C>>&lt;double*&gt;
 
 === Synopsis
 
@@ -207,7 +207,7 @@ struct <<A-0e-C,C>>&lt;double*&gt;;
 |===
 
 [#A-0f-C-01-j]
-== <<A-0f,A>>&lt;bool&gt;::<<A-0f-C-01,C>>&lt;double*&gt;::j
+== <<A-0f,A&lt;bool&gt;>>::<<A-0f-C-01,C&lt;double*&gt;>>::j
 
 === Synopsis
 
@@ -220,7 +220,7 @@ j();
 ----
 
 [#A-0f-C-0c]
-== <<A-0f,A>>&lt;bool&gt;::C&lt;U*&gt;
+== <<A-0f,A&lt;bool&gt;>>::<<A-0e-C,C>>&lt;U*&gt;
 
 === Synopsis
 
@@ -241,7 +241,7 @@ struct <<A-0e-C,C>>&lt;U*&gt;;
 |===
 
 [#A-0f-C-0c-j]
-== <<A-0f,A>>&lt;bool&gt;::<<A-0f-C-0c,C>>&lt;U*&gt;::j
+== <<A-0f,A&lt;bool&gt;>>::<<A-0f-C-0c,C&lt;U*&gt;>>::j
 
 === Synopsis
 
@@ -254,7 +254,7 @@ j();
 ----
 
 [#A-0f-f]
-== <<A-0f,A>>&lt;bool&gt;::f
+== <<A-0f,A&lt;bool&gt;>>::f
 
 === Synopsis
 
@@ -267,7 +267,7 @@ f();
 ----
 
 [#A-00b]
-== A&lt;short&gt;
+== <<A-0e,A>>&lt;short&gt;
 
 === Synopsis
 
@@ -297,7 +297,7 @@ struct <<A-0e,A>>&lt;short&gt;;
 |===
 
 [#A-00b-B]
-== <<A-00b,A>>&lt;short&gt;::B
+== <<A-00b,A&lt;short&gt;>>::B
 
 === Synopsis
 
@@ -310,7 +310,7 @@ struct B;
 ----
 
 [#A-00b-C]
-== <<A-00b,A>>&lt;short&gt;::C
+== <<A-00b,A&lt;short&gt;>>::C
 
 === Synopsis
 
@@ -331,7 +331,7 @@ struct C;
 |===
 
 [#A-00b-C-i]
-== <<A-00b,A>>&lt;short&gt;::<<A-00b-C,C>>::i
+== <<A-00b,A&lt;short&gt;>>::<<A-00b-C,C>>::i
 
 === Synopsis
 
@@ -344,7 +344,7 @@ i();
 ----
 
 [#A-00b-f]
-== <<A-00b,A>>&lt;short&gt;::f
+== <<A-00b,A&lt;short&gt;>>::f
 
 === Synopsis
 
@@ -357,7 +357,7 @@ f();
 ----
 
 [#A-000]
-== A&lt;int&gt;
+== <<A-0e,A>>&lt;int&gt;
 
 === Synopsis
 
@@ -388,7 +388,7 @@ struct <<A-0e,A>>&lt;int&gt;;
 |===
 
 [#A-000-B-03]
-== <<A-000,A>>&lt;int&gt;::B
+== <<A-000,A&lt;int&gt;>>::B
 
 === Synopsis
 
@@ -401,7 +401,7 @@ struct B;
 ----
 
 [#A-000-B-09]
-== <<A-000,A>>&lt;int&gt;::B&lt;long&gt;
+== <<A-000,A&lt;int&gt;>>::<<A-0e-B,B>>&lt;long&gt;
 
 === Synopsis
 
@@ -422,7 +422,7 @@ struct <<A-0e-B,B>>&lt;long&gt;;
 |===
 
 [#A-000-B-09-g]
-== <<A-000,A>>&lt;int&gt;::<<A-000-B-09,B>>&lt;long&gt;::g
+== <<A-000,A&lt;int&gt;>>::<<A-000-B-09,B&lt;long&gt;>>::g
 
 === Synopsis
 
@@ -435,7 +435,7 @@ g();
 ----
 
 [#A-000-C]
-== <<A-000,A>>&lt;int&gt;::C
+== <<A-000,A&lt;int&gt;>>::C
 
 === Synopsis
 
@@ -448,7 +448,7 @@ struct C;
 ----
 
 [#A-000-f]
-== <<A-000,A>>&lt;int&gt;::f
+== <<A-000,A&lt;int&gt;>>::f
 
 === Synopsis
 
@@ -516,7 +516,7 @@ k();
 ----
 
 [#D-E-0d]
-== <<D,D>>::E&lt;int&gt;
+== <<D,D>>::<<D-E-0e,E>>&lt;int&gt;
 
 === Synopsis
 
@@ -537,7 +537,7 @@ struct <<D-E-0e,E>>&lt;int&gt;;
 |===
 
 [#D-E-0d-k]
-== <<D,D>>::<<D-E-0d,E>>&lt;int&gt;::k
+== <<D,D>>::<<D-E-0d,E&lt;int&gt;>>::k
 
 === Synopsis
 
diff --git a/test-files/golden-tests/symbols/function/spec-mem-implicit-instantiation.html b/test-files/golden-tests/symbols/function/spec-mem-implicit-instantiation.html
index 09b7db118..798c7e057 100644
--- a/test-files/golden-tests/symbols/function/spec-mem-implicit-instantiation.html
+++ b/test-files/golden-tests/symbols/function/spec-mem-implicit-instantiation.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -29,7 +29,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-0e">A</h2>
+<h2 id="A-0e"><a href="#A-0e">A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -74,7 +74,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-0e-B"><a href="#A-0e">A</a>::B</h2>
+<h2 id="A-0e-B"><a href="#A-0e-B">A::B</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -105,7 +105,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-0e-B-g"><a href="#A-0e">A</a>::<a href="#A-0e-B">B</a>::g</h2>
+<h2 id="A-0e-B-g"><a href="#A-0e-B-g">A::B::g</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -121,7 +121,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-0e-C"><a href="#A-0e">A</a>::C</h2>
+<h2 id="A-0e-C"><a href="#A-0e-C">A::C</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -152,7 +152,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-0e-C-h"><a href="#A-0e">A</a>::<a href="#A-0e-C">C</a>::h</h2>
+<h2 id="A-0e-C-h"><a href="#A-0e-C-h">A::C::h</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -168,7 +168,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-0e-f"><a href="#A-0e">A</a>::f</h2>
+<h2 id="A-0e-f"><a href="#A-0e-f">A::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -184,7 +184,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-0f">A&lt;bool&gt;</h2>
+<h2 id="A-0f"><a href="#A-0f">A&lt;bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -231,7 +231,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-0f-B"><a href="#A-0f">A</a>&lt;bool&gt;::B</h2>
+<h2 id="A-0f-B"><a href="#A-0f-B">A&lt;bool&gt;::B</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -249,7 +249,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-0f-C-00"><a href="#A-0f">A</a>&lt;bool&gt;::C</h2>
+<h2 id="A-0f-C-00"><a href="#A-0f-C-00">A&lt;bool&gt;::C</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -267,7 +267,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-0f-C-01"><a href="#A-0f">A</a>&lt;bool&gt;::C&lt;double*&gt;</h2>
+<h2 id="A-0f-C-01"><a href="#A-0f-C-01">A&lt;bool&gt;::C&lt;double*&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -298,7 +298,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-0f-C-01-j"><a href="#A-0f">A</a>&lt;bool&gt;::<a href="#A-0f-C-01">C</a>&lt;double*&gt;::j</h2>
+<h2 id="A-0f-C-01-j"><a href="#A-0f-C-01-j">A&lt;bool&gt;::C&lt;double*&gt;::j</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -314,7 +314,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-0f-C-0c"><a href="#A-0f">A</a>&lt;bool&gt;::C&lt;U*&gt;</h2>
+<h2 id="A-0f-C-0c"><a href="#A-0f-C-0c">A&lt;bool&gt;::C&lt;U*&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -345,7 +345,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-0f-C-0c-j"><a href="#A-0f">A</a>&lt;bool&gt;::<a href="#A-0f-C-0c">C</a>&lt;U*&gt;::j</h2>
+<h2 id="A-0f-C-0c-j"><a href="#A-0f-C-0c-j">A&lt;bool&gt;::C&lt;U*&gt;::j</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -361,7 +361,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-0f-f"><a href="#A-0f">A</a>&lt;bool&gt;::f</h2>
+<h2 id="A-0f-f"><a href="#A-0f-f">A&lt;bool&gt;::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -377,7 +377,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-00b">A&lt;short&gt;</h2>
+<h2 id="A-00b"><a href="#A-00b">A&lt;short&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -422,7 +422,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-00b-B"><a href="#A-00b">A</a>&lt;short&gt;::B</h2>
+<h2 id="A-00b-B"><a href="#A-00b-B">A&lt;short&gt;::B</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -440,7 +440,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-00b-C"><a href="#A-00b">A</a>&lt;short&gt;::C</h2>
+<h2 id="A-00b-C"><a href="#A-00b-C">A&lt;short&gt;::C</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -471,7 +471,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-00b-C-i"><a href="#A-00b">A</a>&lt;short&gt;::<a href="#A-00b-C">C</a>::i</h2>
+<h2 id="A-00b-C-i"><a href="#A-00b-C-i">A&lt;short&gt;::C::i</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -487,7 +487,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-00b-f"><a href="#A-00b">A</a>&lt;short&gt;::f</h2>
+<h2 id="A-00b-f"><a href="#A-00b-f">A&lt;short&gt;::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -503,7 +503,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-000">A&lt;int&gt;</h2>
+<h2 id="A-000"><a href="#A-000">A&lt;int&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -549,7 +549,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-000-B-03"><a href="#A-000">A</a>&lt;int&gt;::B</h2>
+<h2 id="A-000-B-03"><a href="#A-000-B-03">A&lt;int&gt;::B</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -567,7 +567,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-000-B-09"><a href="#A-000">A</a>&lt;int&gt;::B&lt;long&gt;</h2>
+<h2 id="A-000-B-09"><a href="#A-000-B-09">A&lt;int&gt;::B&lt;long&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -598,7 +598,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-000-B-09-g"><a href="#A-000">A</a>&lt;int&gt;::<a href="#A-000-B-09">B</a>&lt;long&gt;::g</h2>
+<h2 id="A-000-B-09-g"><a href="#A-000-B-09-g">A&lt;int&gt;::B&lt;long&gt;::g</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -614,7 +614,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-000-C"><a href="#A-000">A</a>&lt;int&gt;::C</h2>
+<h2 id="A-000-C"><a href="#A-000-C">A&lt;int&gt;::C</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -632,7 +632,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-000-f"><a href="#A-000">A</a>&lt;int&gt;::f</h2>
+<h2 id="A-000-f"><a href="#A-000-f">A&lt;int&gt;::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -648,7 +648,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="D">D</h2>
+<h2 id="D"><a href="#D">D</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -679,7 +679,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="D-E-0e"><a href="#D">D</a>::E</h2>
+<h2 id="D-E-0e"><a href="#D-E-0e">D::E</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -710,7 +710,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="D-E-0e-k"><a href="#D">D</a>::<a href="#D-E-0e">E</a>::k</h2>
+<h2 id="D-E-0e-k"><a href="#D-E-0e-k">D::E::k</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -726,7 +726,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="D-E-0d"><a href="#D">D</a>::E&lt;int&gt;</h2>
+<h2 id="D-E-0d"><a href="#D-E-0d">D::E&lt;int&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -757,7 +757,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="D-E-0d-k"><a href="#D">D</a>::<a href="#D-E-0d">E</a>&lt;int&gt;::k</h2>
+<h2 id="D-E-0d-k"><a href="#D-E-0d-k">D::E&lt;int&gt;::k</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/function/type-resolution.html b/test-files/golden-tests/symbols/function/type-resolution.html
index 321952cde..8704db59b 100644
--- a/test-files/golden-tests/symbols/function/type-resolution.html
+++ b/test-files/golden-tests/symbols/function/type-resolution.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -86,7 +86,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="C">C</h2>
+<h2 id="C"><a href="#C">C</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -101,7 +101,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="D">D</h2>
+<h2 id="D"><a href="#D">D</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -116,7 +116,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="E">E</h2>
+<h2 id="E"><a href="#E">E</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -132,7 +132,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -149,7 +149,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="B">B</h2>
+<h2 id="B"><a href="#B">B</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -169,7 +169,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f0">f0</h2>
+<h2 id="f0"><a href="#f0">f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -185,7 +185,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f1">f1</h2>
+<h2 id="f1"><a href="#f1">f1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -201,7 +201,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f2">f2</h2>
+<h2 id="f2"><a href="#f2">f2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -217,7 +217,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f3">f3</h2>
+<h2 id="f3"><a href="#f3">f3</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -233,7 +233,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f4">f4</h2>
+<h2 id="f4"><a href="#f4">f4</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -249,7 +249,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f5">f5</h2>
+<h2 id="f5"><a href="#f5">f5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -265,7 +265,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f6">f6</h2>
+<h2 id="f6"><a href="#f6">f6</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -281,7 +281,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f7">f7</h2>
+<h2 id="f7"><a href="#f7">f7</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -297,7 +297,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f8">f8</h2>
+<h2 id="f8"><a href="#f8">f8</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -313,7 +313,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="g0">g0</h2>
+<h2 id="g0"><a href="#g0">g0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -329,7 +329,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="g1">g1</h2>
+<h2 id="g1"><a href="#g1">g1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -345,7 +345,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="g2">g2</h2>
+<h2 id="g2"><a href="#g2">g2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -361,7 +361,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="g3">g3</h2>
+<h2 id="g3"><a href="#g3">g3</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -377,7 +377,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="g4">g4</h2>
+<h2 id="g4"><a href="#g4">g4</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -393,7 +393,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="g5">g5</h2>
+<h2 id="g5"><a href="#g5">g5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -409,7 +409,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="g6">g6</h2>
+<h2 id="g6"><a href="#g6">g6</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -425,7 +425,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="g7">g7</h2>
+<h2 id="g7"><a href="#g7">g7</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -441,7 +441,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="g8">g8</h2>
+<h2 id="g8"><a href="#g8">g8</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -457,7 +457,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="h0">h0</h2>
+<h2 id="h0"><a href="#h0">h0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -473,7 +473,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="h1">h1</h2>
+<h2 id="h1"><a href="#h1">h1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -489,7 +489,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="h2">h2</h2>
+<h2 id="h2"><a href="#h2">h2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -505,7 +505,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="h3">h3</h2>
+<h2 id="h3"><a href="#h3">h3</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -521,7 +521,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="h4">h4</h2>
+<h2 id="h4"><a href="#h4">h4</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -537,7 +537,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="h5">h5</h2>
+<h2 id="h5"><a href="#h5">h5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -553,7 +553,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="h6">h6</h2>
+<h2 id="h6"><a href="#h6">h6</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -569,7 +569,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="h7">h7</h2>
+<h2 id="h7"><a href="#h7">h7</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -585,7 +585,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="h8">h8</h2>
+<h2 id="h8"><a href="#h8">h8</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -601,7 +601,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="i0">i0</h2>
+<h2 id="i0"><a href="#i0">i0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -617,7 +617,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="i1">i1</h2>
+<h2 id="i1"><a href="#i1">i1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -633,7 +633,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="i2">i2</h2>
+<h2 id="i2"><a href="#i2">i2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -649,7 +649,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="i3">i3</h2>
+<h2 id="i3"><a href="#i3">i3</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -665,7 +665,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="i4">i4</h2>
+<h2 id="i4"><a href="#i4">i4</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -681,7 +681,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="i5">i5</h2>
+<h2 id="i5"><a href="#i5">i5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -697,7 +697,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="i6">i6</h2>
+<h2 id="i6"><a href="#i6">i6</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -713,7 +713,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="i7">i7</h2>
+<h2 id="i7"><a href="#i7">i7</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -729,7 +729,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="i8">i8</h2>
+<h2 id="i8"><a href="#i8">i8</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -745,7 +745,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="j0">j0</h2>
+<h2 id="j0"><a href="#j0">j0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -761,7 +761,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="j1">j1</h2>
+<h2 id="j1"><a href="#j1">j1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -777,7 +777,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="j2">j2</h2>
+<h2 id="j2"><a href="#j2">j2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -793,7 +793,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="j3">j3</h2>
+<h2 id="j3"><a href="#j3">j3</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -809,7 +809,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="j4">j4</h2>
+<h2 id="j4"><a href="#j4">j4</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -825,7 +825,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="j5">j5</h2>
+<h2 id="j5"><a href="#j5">j5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -841,7 +841,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="j6">j6</h2>
+<h2 id="j6"><a href="#j6">j6</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -857,7 +857,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="j7">j7</h2>
+<h2 id="j7"><a href="#j7">j7</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -873,7 +873,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="j8">j8</h2>
+<h2 id="j8"><a href="#j8">j8</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/function/variadic-function.html b/test-files/golden-tests/symbols/function/variadic-function.html
index 55daf42a7..3ac013bbd 100644
--- a/test-files/golden-tests/symbols/function/variadic-function.html
+++ b/test-files/golden-tests/symbols/function/variadic-function.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -41,7 +41,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="T">T</h2>
+<h2 id="T"><a href="#T">T</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -56,7 +56,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="U">U</h2>
+<h2 id="U"><a href="#U">U</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -71,7 +71,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="C">C</h2>
+<h2 id="C"><a href="#C">C</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -91,7 +91,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f">f</h2>
+<h2 id="f"><a href="#f">f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -107,7 +107,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="g">g</h2>
+<h2 id="g"><a href="#g">g</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/guide/explicit-deduct-guide.html b/test-files/golden-tests/symbols/guide/explicit-deduct-guide.html
index 1b08ea50d..de9d0039a 100644
--- a/test-files/golden-tests/symbols/guide/explicit-deduct-guide.html
+++ b/test-files/golden-tests/symbols/guide/explicit-deduct-guide.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -41,7 +41,7 @@ <h2>Deduction Guides</h2>
 </div>
 <div>
 <div>
-<h2 id="X-0e">X</h2>
+<h2 id="X-0e"><a href="#X-0e">X</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -59,7 +59,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="X-0d"><a href="#X-0e">X</a>&lt;0&gt;</h2>
+<h2 id="X-0d"><a href="#X-0d">X&lt;0&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -74,7 +74,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="X-00"><a href="#X-0e">X</a>&lt;0&gt;</h2>
+<h2 id="X-00"><a href="#X-00">X&lt;0&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -89,7 +89,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="X-0b"><a href="#X-0e">X</a>&lt;0&gt;</h2>
+<h2 id="X-0b"><a href="#X-0b">X&lt;0&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -104,7 +104,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="X-06"><a href="#X-0e">X</a>&lt;0&gt;</h2>
+<h2 id="X-06"><a href="#X-06">X&lt;0&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/namespace-alias/namespace-alias-1.html b/test-files/golden-tests/symbols/namespace-alias/namespace-alias-1.html
index 3eeb42385..492341c42 100644
--- a/test-files/golden-tests/symbols/namespace-alias/namespace-alias-1.html
+++ b/test-files/golden-tests/symbols/namespace-alias/namespace-alias-1.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -38,7 +38,7 @@ <h2>Namespace Aliases</h2>
 </div>
 <div>
 <div>
-<h2 id="LongName">LongName</h2>
+<h2 id="LongName"><a href="#LongName">LongName</a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -56,7 +56,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="LongName-A"><a href="#LongName">LongName</a>::A</h2>
+<h2 id="LongName-A"><a href="#LongName-A">LongName::A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -73,7 +73,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/namespace-alias/namespace-alias-2.html b/test-files/golden-tests/symbols/namespace-alias/namespace-alias-2.html
index c196be999..861b4c61c 100644
--- a/test-files/golden-tests/symbols/namespace-alias/namespace-alias-2.html
+++ b/test-files/golden-tests/symbols/namespace-alias/namespace-alias-2.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -39,7 +39,7 @@ <h2>Namespace Aliases</h2>
 </div>
 <div>
 <div>
-<h2 id="LongName">LongName</h2>
+<h2 id="LongName"><a href="#LongName">LongName</a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -57,7 +57,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="LongName-A"><a href="#LongName">LongName</a>::A</h2>
+<h2 id="LongName-A"><a href="#LongName-A">LongName::A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -74,7 +74,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -89,7 +89,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="B">B</h2>
+<h2 id="B"><a href="#B">B</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/namespace-alias/namespace-alias-3.html b/test-files/golden-tests/symbols/namespace-alias/namespace-alias-3.html
index 2d38ccb56..61a8bc688 100644
--- a/test-files/golden-tests/symbols/namespace-alias/namespace-alias-3.html
+++ b/test-files/golden-tests/symbols/namespace-alias/namespace-alias-3.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -39,7 +39,7 @@ <h2>Namespace Aliases</h2>
 </div>
 <div>
 <div>
-<h2 id="LongName">LongName</h2>
+<h2 id="LongName"><a href="#LongName">LongName</a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -57,7 +57,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="LongName-A"><a href="#LongName">LongName</a>::A</h2>
+<h2 id="LongName-A"><a href="#LongName-A">LongName::A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -74,7 +74,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -89,7 +89,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="B">B</h2>
+<h2 id="B"><a href="#B">B</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/namespace/namespace.adoc b/test-files/golden-tests/symbols/namespace/namespace.adoc
index 6cb628bea..f26369e54 100644
--- a/test-files/golden-tests/symbols/namespace/namespace.adoc
+++ b/test-files/golden-tests/symbols/namespace/namespace.adoc
@@ -9,13 +9,13 @@
 [cols=1]
 |===
 | Name
-| <<00namespace,`&lt;unnamed&gt;`>> 
+| <<_00namespace,`Unnamed namespace`>> 
 | <<A,`A`>> 
 | <<D,`D`>> 
 | <<I,`I`>> 
 |===
 
-[#00namespace]
+[#_00namespace]
 == Unnamed namespace
 
 === Namespaces
@@ -23,8 +23,8 @@
 [cols=1]
 |===
 | Name
-| <<00namespace-G,`G`>> 
-| <<00namespace-H,`H`>> 
+| <<_00namespace-G,`G`>> 
+| <<_00namespace-H,`H`>> 
 |===
 
 === Functions
@@ -32,10 +32,10 @@
 [cols=1]
 |===
 | Name
-| <<00namespace-f10,`f10`>> 
+| <<_00namespace-f10,`f10`>> 
 |===
 
-[#00namespace-G]
+[#_00namespace-G]
 == G
 
 === Functions
@@ -43,11 +43,11 @@
 [cols=1]
 |===
 | Name
-| <<00namespace-G-f11,`f11`>> 
+| <<_00namespace-G-f11,`f11`>> 
 |===
 
-[#00namespace-G-f11]
-== <<00namespace-G,G>>::f11
+[#_00namespace-G-f11]
+== <<_00namespace-G,G>>::f11
 
 === Synopsis
 
@@ -59,7 +59,7 @@ void
 f11();
 ----
 
-[#00namespace-H]
+[#_00namespace-H]
 == H
 
 === Functions
@@ -67,11 +67,11 @@ f11();
 [cols=1]
 |===
 | Name
-| <<00namespace-H-f12,`f12`>> 
+| <<_00namespace-H-f12,`f12`>> 
 |===
 
-[#00namespace-H-f12]
-== <<00namespace-H,H>>::f12
+[#_00namespace-H-f12]
+== <<_00namespace-H,H>>::f12
 
 === Synopsis
 
@@ -83,7 +83,7 @@ void
 f12();
 ----
 
-[#00namespace-f10]
+[#_00namespace-f10]
 == f10
 
 === Synopsis
@@ -104,7 +104,7 @@ f10();
 [cols=1]
 |===
 | Name
-| <<A-00namespace,`&lt;unnamed&gt;`>> 
+| <<A-_00namespace,`Unnamed namespace`>> 
 | <<A-B,`B`>> 
 | <<A-C,`C`>> 
 |===
@@ -117,18 +117,18 @@ f10();
 | <<A-f0,`f0`>> 
 |===
 
-[#A-00namespace]
-== Unnamed namespace
+[#A-_00namespace]
+== <<A,A>>::Unnamed namespace
 
 === Functions
 
 [cols=1]
 |===
 | Name
-| <<A-00namespace-f3,`f3`>> 
+| <<A-_00namespace-f3,`f3`>> 
 |===
 
-[#A-00namespace-f3]
+[#A-_00namespace-f3]
 == <<A,A>>::f3
 
 === Synopsis
@@ -210,7 +210,7 @@ f0();
 [cols=1]
 |===
 | Name
-| <<D-00namespace,`&lt;unnamed&gt;`>> 
+| <<D-_00namespace,`Unnamed namespace`>> 
 | <<D-E,`E`>> 
 | <<D-F,`F`>> 
 |===
@@ -223,18 +223,18 @@ f0();
 | <<D-f5,`f5`>> 
 |===
 
-[#D-00namespace]
-== Unnamed namespace
+[#D-_00namespace]
+== <<D,D>>::Unnamed namespace
 
 === Functions
 
 [cols=1]
 |===
 | Name
-| <<D-00namespace-f8,`f8`>> 
+| <<D-_00namespace-f8,`f8`>> 
 |===
 
-[#D-00namespace-f8]
+[#D-_00namespace-f8]
 == <<D,D>>::f8
 
 === Synopsis
@@ -316,21 +316,21 @@ f5();
 [cols=1]
 |===
 | Name
-| <<I-00namespace,`&lt;unnamed&gt;`>> 
+| <<I-_00namespace,`Unnamed namespace`>> 
 |===
 
-[#I-00namespace]
-== Unnamed namespace
+[#I-_00namespace]
+== <<I,I>>::Unnamed namespace
 
 === Functions
 
 [cols=1]
 |===
 | Name
-| <<I-00namespace-f14,`f14`>> 
+| <<I-_00namespace-f14,`f14`>> 
 |===
 
-[#I-00namespace-f14]
+[#I-_00namespace-f14]
 == <<I,I>>::f14
 
 === Synopsis
diff --git a/test-files/golden-tests/symbols/namespace/namespace.html b/test-files/golden-tests/symbols/namespace/namespace.html
index 19729b2ab..823cec416 100644
--- a/test-files/golden-tests/symbols/namespace/namespace.html
+++ b/test-files/golden-tests/symbols/namespace/namespace.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -18,7 +18,7 @@ <h2>Namespaces</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#00namespace"><code>&lt;unnamed&gt;</code></a> </td></tr><tr>
+<td><a href="#_00namespace"><code>Unnamed namespace</code></a> </td></tr><tr>
 <td><a href="#A"><code>A</code></a> </td></tr><tr>
 <td><a href="#D"><code>D</code></a> </td></tr><tr>
 <td><a href="#I"><code>I</code></a> </td></tr>
@@ -28,7 +28,7 @@ <h2>Namespaces</h2>
 </div>
 <div>
 <div>
-<h2 id="00namespace">Unnamed namespace</h2>
+<h2 id="_00namespace"><a href="#_00namespace"></a></h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -39,8 +39,8 @@ <h2>Namespaces</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#00namespace-G"><code>G</code></a> </td></tr><tr>
-<td><a href="#00namespace-H"><code>H</code></a> </td></tr>
+<td><a href="#_00namespace-G"><code>G</code></a> </td></tr><tr>
+<td><a href="#_00namespace-H"><code>H</code></a> </td></tr>
 </tbody>
 </table>
 
@@ -53,14 +53,14 @@ <h2>Functions</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#00namespace-f10"><code>f10</code></a> </td></tr>
+<td><a href="#_00namespace-f10"><code>f10</code></a> </td></tr>
 </tbody>
 </table>
 
 </div>
 <div>
 <div>
-<h2 id="00namespace-G">G</h2>
+<h2 id="_00namespace-G"><a href="#_00namespace-G">::G</a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -71,14 +71,14 @@ <h2>Functions</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#00namespace-G-f11"><code>f11</code></a> </td></tr>
+<td><a href="#_00namespace-G-f11"><code>f11</code></a> </td></tr>
 </tbody>
 </table>
 
 </div>
 <div>
 <div>
-<h2 id="00namespace-G-f11"><a href="#00namespace-G">G</a>::f11</h2>
+<h2 id="_00namespace-G-f11"><a href="#_00namespace-G-f11">::G::f11</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -94,7 +94,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="00namespace-H">H</h2>
+<h2 id="_00namespace-H"><a href="#_00namespace-H">::H</a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -105,14 +105,14 @@ <h2>Functions</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#00namespace-H-f12"><code>f12</code></a> </td></tr>
+<td><a href="#_00namespace-H-f12"><code>f12</code></a> </td></tr>
 </tbody>
 </table>
 
 </div>
 <div>
 <div>
-<h2 id="00namespace-H-f12"><a href="#00namespace-H">H</a>::f12</h2>
+<h2 id="_00namespace-H-f12"><a href="#_00namespace-H-f12">::H::f12</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -128,7 +128,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="00namespace-f10">f10</h2>
+<h2 id="_00namespace-f10"><a href="#_00namespace-f10">::f10</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -144,7 +144,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -155,7 +155,7 @@ <h2>Namespaces</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#A-00namespace"><code>&lt;unnamed&gt;</code></a> </td></tr><tr>
+<td><a href="#A-_00namespace"><code>Unnamed namespace</code></a> </td></tr><tr>
 <td><a href="#A-B"><code>B</code></a> </td></tr><tr>
 <td><a href="#A-C"><code>C</code></a> </td></tr>
 </tbody>
@@ -177,7 +177,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-00namespace">Unnamed namespace</h2>
+<h2 id="A-_00namespace"><a href="#A-_00namespace">A::</a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -188,14 +188,14 @@ <h2>Functions</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#A-00namespace-f3"><code>f3</code></a> </td></tr>
+<td><a href="#A-_00namespace-f3"><code>f3</code></a> </td></tr>
 </tbody>
 </table>
 
 </div>
 <div>
 <div>
-<h2 id="A-00namespace-f3"><a href="#A">A</a>::f3</h2>
+<h2 id="A-_00namespace-f3"><a href="#A-_00namespace-f3">A::::f3</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -211,7 +211,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-B"><a href="#A">A</a>::B</h2>
+<h2 id="A-B"><a href="#A-B">A::B</a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -229,7 +229,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-B-f1"><a href="#A">A</a>::<a href="#A-B">B</a>::f1</h2>
+<h2 id="A-B-f1"><a href="#A-B-f1">A::B::f1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -245,7 +245,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-C"><a href="#A">A</a>::C</h2>
+<h2 id="A-C"><a href="#A-C">A::C</a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -263,7 +263,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-C-f2"><a href="#A">A</a>::<a href="#A-C">C</a>::f2</h2>
+<h2 id="A-C-f2"><a href="#A-C-f2">A::C::f2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -279,7 +279,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-f0"><a href="#A">A</a>::f0</h2>
+<h2 id="A-f0"><a href="#A-f0">A::f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -295,7 +295,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="D">D</h2>
+<h2 id="D"><a href="#D">D</a></h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -306,7 +306,7 @@ <h2>Namespaces</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#D-00namespace"><code>&lt;unnamed&gt;</code></a> </td></tr><tr>
+<td><a href="#D-_00namespace"><code>Unnamed namespace</code></a> </td></tr><tr>
 <td><a href="#D-E"><code>E</code></a> </td></tr><tr>
 <td><a href="#D-F"><code>F</code></a> </td></tr>
 </tbody>
@@ -328,7 +328,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="D-00namespace">Unnamed namespace</h2>
+<h2 id="D-_00namespace"><a href="#D-_00namespace">D::</a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -339,14 +339,14 @@ <h2>Functions</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#D-00namespace-f8"><code>f8</code></a> </td></tr>
+<td><a href="#D-_00namespace-f8"><code>f8</code></a> </td></tr>
 </tbody>
 </table>
 
 </div>
 <div>
 <div>
-<h2 id="D-00namespace-f8"><a href="#D">D</a>::f8</h2>
+<h2 id="D-_00namespace-f8"><a href="#D-_00namespace-f8">D::::f8</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -362,7 +362,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="D-E"><a href="#D">D</a>::E</h2>
+<h2 id="D-E"><a href="#D-E">D::E</a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -380,7 +380,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="D-E-f6"><a href="#D">D</a>::<a href="#D-E">E</a>::f6</h2>
+<h2 id="D-E-f6"><a href="#D-E-f6">D::E::f6</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -396,7 +396,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="D-F"><a href="#D">D</a>::F</h2>
+<h2 id="D-F"><a href="#D-F">D::F</a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -414,7 +414,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="D-F-f7"><a href="#D">D</a>::<a href="#D-F">F</a>::f7</h2>
+<h2 id="D-F-f7"><a href="#D-F-f7">D::F::f7</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -430,7 +430,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="D-f5"><a href="#D">D</a>::f5</h2>
+<h2 id="D-f5"><a href="#D-f5">D::f5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -446,7 +446,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="I">I</h2>
+<h2 id="I"><a href="#I">I</a></h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -457,14 +457,14 @@ <h2>Namespaces</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#I-00namespace"><code>&lt;unnamed&gt;</code></a> </td></tr>
+<td><a href="#I-_00namespace"><code>Unnamed namespace</code></a> </td></tr>
 </tbody>
 </table>
 
 </div>
 <div>
 <div>
-<h2 id="I-00namespace">Unnamed namespace</h2>
+<h2 id="I-_00namespace"><a href="#I-_00namespace">I::</a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -475,14 +475,14 @@ <h2>Functions</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#I-00namespace-f14"><code>f14</code></a> </td></tr>
+<td><a href="#I-_00namespace-f14"><code>f14</code></a> </td></tr>
 </tbody>
 </table>
 
 </div>
 <div>
 <div>
-<h2 id="I-00namespace-f14"><a href="#I">I</a>::f14</h2>
+<h2 id="I-_00namespace-f14"><a href="#I-_00namespace-f14">I::::f14</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/overloads/overloads-brief.html b/test-files/golden-tests/symbols/overloads/overloads-brief.html
index d9e187f80..97e26dd86 100644
--- a/test-files/golden-tests/symbols/overloads/overloads-brief.html
+++ b/test-files/golden-tests/symbols/overloads/overloads-brief.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -43,7 +43,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 <div>
 <span>Overload briefs from function or operator classes</span>
 
@@ -95,7 +95,7 @@ <h2>Non-Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-2constructor-0f"><a href="#A">A</a>::A</h2>
+<h2 id="A-2constructor-0f"><a href="#A-2constructor-0f">A::A</a></h2>
 <div>
 <span>Constructors</span>
 
@@ -141,7 +141,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="A-2constructor-03"><a href="#A">A</a>::A</h2>
+<h2 id="A-2constructor-03"><a href="#A-2constructor-03">A::A</a></h2>
 <div>
 <span>First constructor</span>
 
@@ -160,7 +160,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-2constructor-01"><a href="#A">A</a>::A</h2>
+<h2 id="A-2constructor-01"><a href="#A-2constructor-01">A::A</a></h2>
 <div>
 <span>Second constructor</span>
 
@@ -196,7 +196,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="A-operator_assign-04c"><a href="#A">A</a>::operator&#x3D;</h2>
+<h2 id="A-operator_assign-04c"><a href="#A-operator_assign-04c">A::operator&#x3D;</a></h2>
 <div>
 <span>Assignment operators</span>
 
@@ -248,7 +248,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="A-operator_assign-045"><a href="#A">A</a>::operator&#x3D;</h2>
+<h2 id="A-operator_assign-045"><a href="#A-operator_assign-045">A::operator&#x3D;</a></h2>
 <div>
 <span>Assign from A</span>
 
@@ -289,7 +289,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="A-operator_assign-06"><a href="#A">A</a>::operator&#x3D;</h2>
+<h2 id="A-operator_assign-06"><a href="#A-operator_assign-06">A::operator&#x3D;</a></h2>
 <div>
 <span>Assign from int</span>
 
@@ -330,7 +330,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="A-operator_plus-00"><a href="#A">A</a>::operator+</h2>
+<h2 id="A-operator_plus-00"><a href="#A-operator_plus-00">A::operator+</a></h2>
 <div>
 <span>Addition operators</span>
 
@@ -382,7 +382,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="A-operator_plus-0c"><a href="#A">A</a>::operator+</h2>
+<h2 id="A-operator_plus-0c"><a href="#A-operator_plus-0c">A::operator+</a></h2>
 <div>
 <span>Addition operator for ints</span>
 
@@ -423,7 +423,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="A-operator_plus-0e"><a href="#A">A</a>::operator+</h2>
+<h2 id="A-operator_plus-0e"><a href="#A-operator_plus-0e">A::operator+</a></h2>
 <div>
 <span>Addition operator for As</span>
 
@@ -464,7 +464,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="A-operator_minus-09"><a href="#A">A</a>::operator-</h2>
+<h2 id="A-operator_minus-09"><a href="#A-operator_minus-09">A::operator-</a></h2>
 <div>
 <span>Unary minus operators</span>
 
@@ -499,7 +499,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="A-operator_minus-02"><a href="#A">A</a>::operator-</h2>
+<h2 id="A-operator_minus-02"><a href="#A-operator_minus-02">A::operator-</a></h2>
 <div>
 <span>Unary operator- for A</span>
 
@@ -527,7 +527,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="A-operator_minus-0c"><a href="#A">A</a>::operator-</h2>
+<h2 id="A-operator_minus-0c"><a href="#A-operator_minus-0c">A::operator-</a></h2>
 <div>
 <span>Binary operator- for A</span>
 
@@ -572,7 +572,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="B">B</h2>
+<h2 id="B"><a href="#B">B</a></h2>
 <div>
 <span>Auxiliary class</span>
 
@@ -607,7 +607,7 @@ <h2>Non-Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="no_way_to_infer_this_brief-04">no_way_to_infer_this_brief</h2>
+<h2 id="no_way_to_infer_this_brief-04"><a href="#no_way_to_infer_this_brief-04">no_way_to_infer_this_brief</a></h2>
 <div>
 <span><code>no_way_to_infer_this_brief</code> overloads</span>
 
@@ -655,7 +655,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="no_way_to_infer_this_brief-02">no_way_to_infer_this_brief</h2>
+<h2 id="no_way_to_infer_this_brief-02"><a href="#no_way_to_infer_this_brief-02">no_way_to_infer_this_brief</a></h2>
 <div>
 <span>Function with no params</span>
 
@@ -675,7 +675,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="no_way_to_infer_this_brief-01">no_way_to_infer_this_brief</h2>
+<h2 id="no_way_to_infer_this_brief-01"><a href="#no_way_to_infer_this_brief-01">no_way_to_infer_this_brief</a></h2>
 <div>
 <span>Function with single param</span>
 
@@ -712,7 +712,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="operator_plus-09">operator+</h2>
+<h2 id="operator_plus-09"><a href="#operator_plus-09">operator+</a></h2>
 <div>
 <span>Unary plus operators</span>
 
@@ -747,7 +747,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="operator_plus-0d">operator+</h2>
+<h2 id="operator_plus-0d"><a href="#operator_plus-0d">operator+</a></h2>
 <div>
 <span>Unary operator for A</span>
 
@@ -788,7 +788,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="operator_plus-06">operator+</h2>
+<h2 id="operator_plus-06"><a href="#operator_plus-06">operator+</a></h2>
 <div>
 <span>Unary operator for B</span>
 
@@ -829,7 +829,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="sameBrief-07">sameBrief</h2>
+<h2 id="sameBrief-07"><a href="#sameBrief-07">sameBrief</a></h2>
 <div>
 <span>Function with same brief</span>
 
@@ -883,7 +883,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="sameBrief-0a">sameBrief</h2>
+<h2 id="sameBrief-0a"><a href="#sameBrief-0a">sameBrief</a></h2>
 <div>
 <span>Function with same brief</span>
 
@@ -920,7 +920,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="sameBrief-0e">sameBrief</h2>
+<h2 id="sameBrief-0e"><a href="#sameBrief-0e">sameBrief</a></h2>
 <div>
 <span>Function with same brief</span>
 
diff --git a/test-files/golden-tests/symbols/overloads/overloads-metadata.html b/test-files/golden-tests/symbols/overloads/overloads-metadata.html
index 271f52469..9b8435479 100644
--- a/test-files/golden-tests/symbols/overloads/overloads-metadata.html
+++ b/test-files/golden-tests/symbols/overloads/overloads-metadata.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -26,7 +26,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="f-0c">f</h2>
+<h2 id="f-0c"><a href="#f-0c">f</a></h2>
 <div>
 <span>Test function</span>
 
@@ -162,7 +162,7 @@ <h3>See Also</h3>
 </div>
 <div>
 <div>
-<h2 id="f-08">f</h2>
+<h2 id="f-08"><a href="#f-08">f</a></h2>
 <div>
 <span>Test function</span>
 
@@ -254,7 +254,7 @@ <h3>See Also</h3>
 </div>
 <div>
 <div>
-<h2 id="f-04">f</h2>
+<h2 id="f-04"><a href="#f-04">f</a></h2>
 <div>
 <span>Test function</span>
 
@@ -301,7 +301,7 @@ <h3>See Also</h3>
 </div>
 <div>
 <div>
-<h2 id="f-02">f</h2>
+<h2 id="f-02"><a href="#f-02">f</a></h2>
 <div>
 <span>Test function</span>
 
diff --git a/test-files/golden-tests/symbols/overloads/overloads-ostream.adoc b/test-files/golden-tests/symbols/overloads/overloads-ostream.adoc
index 3c260703c..ebd011d94 100644
--- a/test-files/golden-tests/symbols/overloads/overloads-ostream.adoc
+++ b/test-files/golden-tests/symbols/overloads/overloads-ostream.adoc
@@ -199,7 +199,7 @@ class B;
 |===
 | Name
 | Description
-| `<<ostream-operator_lshift-0d,operator&lt;&lt;>>`
+| `<<ostream-operator_lshift-0d,ostream::operator&lt;&lt;>>`
 | Stream insertion operator
 |===
 
diff --git a/test-files/golden-tests/symbols/overloads/overloads-ostream.html b/test-files/golden-tests/symbols/overloads/overloads-ostream.html
index 1e6eceda1..7ada57e89 100644
--- a/test-files/golden-tests/symbols/overloads/overloads-ostream.html
+++ b/test-files/golden-tests/symbols/overloads/overloads-ostream.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -26,7 +26,7 @@ <h2>Namespaces</h2>
 </div>
 <div>
 <div>
-<h2 id="left_shift">left_shift</h2>
+<h2 id="left_shift"><a href="#left_shift">left_shift</a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -57,7 +57,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="left_shift-A"><a href="#left_shift">left_shift</a>::A</h2>
+<h2 id="left_shift-A"><a href="#left_shift-A">left_shift::A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -88,7 +88,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="left_shift-A-operator_lshift-00"><a href="#left_shift">left_shift</a>::<a href="#left_shift-A">A</a>::operator&lt;&lt;</h2>
+<h2 id="left_shift-A-operator_lshift-00"><a href="#left_shift-A-operator_lshift-00">left_shift::A::operator&lt;&lt;</a></h2>
 <div>
 <span>Left shift operators</span>
 
@@ -119,7 +119,7 @@ <h3>Synopses</h3>
 </div>
 <div>
 <div>
-<h2 id="left_shift-A-operator_lshift-0f"><a href="#left_shift">left_shift</a>::<a href="#left_shift-A">A</a>::operator&lt;&lt;</h2>
+<h2 id="left_shift-A-operator_lshift-0f"><a href="#left_shift-A-operator_lshift-0f">left_shift::A::operator&lt;&lt;</a></h2>
 <div>
 <span>Left shift operator</span>
 
@@ -160,7 +160,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="left_shift-A-operator_lshift-0b"><a href="#left_shift">left_shift</a>::<a href="#left_shift-A">A</a>::operator&lt;&lt;</h2>
+<h2 id="left_shift-A-operator_lshift-0b"><a href="#left_shift-A-operator_lshift-0b">left_shift::A::operator&lt;&lt;</a></h2>
 <div>
 <span>Left shift operator</span>
 
@@ -201,7 +201,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="left_shift-operator_lshift"><a href="#left_shift">left_shift</a>::operator&lt;&lt;</h2>
+<h2 id="left_shift-operator_lshift"><a href="#left_shift-operator_lshift">left_shift::operator&lt;&lt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -219,7 +219,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="ostream">ostream</h2>
+<h2 id="ostream"><a href="#ostream">ostream</a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -253,7 +253,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="ostream-B"><a href="#ostream">ostream</a>::B</h2>
+<h2 id="ostream-B"><a href="#ostream-B">ostream::B</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -288,7 +288,7 @@ <h2>Friends</h2>
 </div>
 <div>
 <div>
-<h2 id="ostream-C"><a href="#ostream">ostream</a>::C</h2>
+<h2 id="ostream-C"><a href="#ostream-C">ostream::C</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -305,7 +305,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="ostream-OStream"><a href="#ostream">ostream</a>::OStream</h2>
+<h2 id="ostream-OStream"><a href="#ostream-OStream">ostream::OStream</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -322,7 +322,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="ostream-operator_lshift-0f"><a href="#ostream">ostream</a>::operator&lt;&lt;</h2>
+<h2 id="ostream-operator_lshift-0f"><a href="#ostream-operator_lshift-0f">ostream::operator&lt;&lt;</a></h2>
 <div>
 <span>Stream insertion operators</span>
 
@@ -357,7 +357,7 @@ <h3>Synopses</h3>
 </div>
 <div>
 <div>
-<h2 id="ostream-operator_lshift-0d"><a href="#ostream">ostream</a>::operator&lt;&lt;</h2>
+<h2 id="ostream-operator_lshift-0d"><a href="#ostream-operator_lshift-0d">ostream::operator&lt;&lt;</a></h2>
 <div>
 <span>Stream insertion operator</span>
 
@@ -404,7 +404,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="ostream-operator_lshift-0a"><a href="#ostream">ostream</a>::operator&lt;&lt;</h2>
+<h2 id="ostream-operator_lshift-0a"><a href="#ostream-operator_lshift-0a">ostream::operator&lt;&lt;</a></h2>
 <div>
 <span>Stream insertion operator</span>
 
diff --git a/test-files/golden-tests/symbols/overloads/overloads.html b/test-files/golden-tests/symbols/overloads/overloads.html
index 1581e845e..e3cc378d8 100644
--- a/test-files/golden-tests/symbols/overloads/overloads.html
+++ b/test-files/golden-tests/symbols/overloads/overloads.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -41,7 +41,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -108,7 +108,7 @@ <h2>Friends</h2>
 </div>
 <div>
 <div>
-<h2 id="A-f-07"><a href="#A">A</a>::f</h2>
+<h2 id="A-f-07"><a href="#A-f-07">A::f</a></h2>
 </div>
 <div>
 <h3>Synopses</h3>
@@ -135,7 +135,7 @@ <h3>Synopses</h3>
 </div>
 <div>
 <div>
-<h2 id="A-f-08"><a href="#A">A</a>::f</h2>
+<h2 id="A-f-08"><a href="#A-f-08">A::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -151,7 +151,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-f-0e"><a href="#A">A</a>::f</h2>
+<h2 id="A-f-0e"><a href="#A-f-0e">A::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -167,7 +167,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-g-0d"><a href="#A">A</a>::g</h2>
+<h2 id="A-g-0d"><a href="#A-g-0d">A::g</a></h2>
 </div>
 <div>
 <h3>Synopses</h3>
@@ -196,7 +196,7 @@ <h3>Synopses</h3>
 </div>
 <div>
 <div>
-<h2 id="A-g-0a"><a href="#A">A</a>::g</h2>
+<h2 id="A-g-0a"><a href="#A-g-0a">A::g</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -213,7 +213,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-g-01"><a href="#A">A</a>::g</h2>
+<h2 id="A-g-01"><a href="#A-g-01">A::g</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -230,7 +230,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="B">B</h2>
+<h2 id="B"><a href="#B">B</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -247,7 +247,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f-0c">f</h2>
+<h2 id="f-0c"><a href="#f-0c">f</a></h2>
 </div>
 <div>
 <h3>Synopses</h3>
@@ -274,7 +274,7 @@ <h3>Synopses</h3>
 </div>
 <div>
 <div>
-<h2 id="f-0b">f</h2>
+<h2 id="f-0b"><a href="#f-0b">f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -290,7 +290,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f-06">f</h2>
+<h2 id="f-06"><a href="#f-06">f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -306,7 +306,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="operator_eq-073">operator&#x3D;&#x3D;</h2>
+<h2 id="operator_eq-073"><a href="#operator_eq-073">operator&#x3D;&#x3D;</a></h2>
 <div>
 <span>Equality operators</span>
 
@@ -361,7 +361,7 @@ <h3>Synopses</h3>
 </div>
 <div>
 <div>
-<h2 id="operator_eq-0e">operator&#x3D;&#x3D;</h2>
+<h2 id="operator_eq-0e"><a href="#operator_eq-0e">operator&#x3D;&#x3D;</a></h2>
 <div>
 <span>Equality operator</span>
 
@@ -408,7 +408,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="operator_eq-0a">operator&#x3D;&#x3D;</h2>
+<h2 id="operator_eq-0a"><a href="#operator_eq-0a">operator&#x3D;&#x3D;</a></h2>
 <div>
 <span>Equality operator</span>
 
@@ -455,7 +455,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="operator_eq-08">operator&#x3D;&#x3D;</h2>
+<h2 id="operator_eq-08"><a href="#operator_eq-08">operator&#x3D;&#x3D;</a></h2>
 <div>
 <span>Equality operator</span>
 
@@ -502,7 +502,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="operator_eq-071">operator&#x3D;&#x3D;</h2>
+<h2 id="operator_eq-071"><a href="#operator_eq-071">operator&#x3D;&#x3D;</a></h2>
 <div>
 <span>Equality operator</span>
 
diff --git a/test-files/golden-tests/symbols/record/class-private-alias.html b/test-files/golden-tests/symbols/record/class-private-alias.html
index 349ce5cb9..bad93e5e6 100644
--- a/test-files/golden-tests/symbols/record/class-private-alias.html
+++ b/test-files/golden-tests/symbols/record/class-private-alias.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,7 +25,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="S">S</h2>
+<h2 id="S"><a href="#S">S</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -55,7 +55,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S-f"><a href="#S">S</a>::f</h2>
+<h2 id="S-f"><a href="#S-f">S::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/record/class-template-partial-spec.adoc b/test-files/golden-tests/symbols/record/class-template-partial-spec.adoc
index d38dca45f..e151a5fcf 100644
--- a/test-files/golden-tests/symbols/record/class-template-partial-spec.adoc
+++ b/test-files/golden-tests/symbols/record/class-template-partial-spec.adoc
@@ -51,7 +51,7 @@ struct B;
 ----
 
 [#A-B-04]
-== <<A,A>>::B&lt;T, long&gt;
+== <<A,A>>::<<A-B-0a,B>>&lt;T, long&gt;
 
 === Synopsis
 
@@ -64,7 +64,7 @@ struct <<A-B-0a,B>>&lt;T, long&gt;;
 ----
 
 [#A-B-06]
-== <<A,A>>::B&lt;U*, T&gt;
+== <<A,A>>::<<A-B-0a,B>>&lt;U*, T&gt;
 
 === Synopsis
 
diff --git a/test-files/golden-tests/symbols/record/class-template-partial-spec.html b/test-files/golden-tests/symbols/record/class-template-partial-spec.html
index f658cdf9a..f948d0c97 100644
--- a/test-files/golden-tests/symbols/record/class-template-partial-spec.html
+++ b/test-files/golden-tests/symbols/record/class-template-partial-spec.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,7 +25,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -58,7 +58,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-B-0a"><a href="#A">A</a>::B</h2>
+<h2 id="A-B-0a"><a href="#A-B-0a">A::B</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -78,7 +78,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-B-04"><a href="#A">A</a>::B&lt;T, long&gt;</h2>
+<h2 id="A-B-04"><a href="#A-B-04">A::B&lt;T, long&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -96,7 +96,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-B-06"><a href="#A">A</a>::B&lt;U*, T&gt;</h2>
+<h2 id="A-B-06"><a href="#A-B-06">A::B&lt;U*, T&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/record/class-template-spec.adoc b/test-files/golden-tests/symbols/record/class-template-spec.adoc
index 3c3e1ea14..cd67cb485 100644
--- a/test-files/golden-tests/symbols/record/class-template-spec.adoc
+++ b/test-files/golden-tests/symbols/record/class-template-spec.adoc
@@ -55,7 +55,7 @@ f();
 ----
 
 [#A-00]
-== A&lt;int&gt;
+== <<A-0e,A>>&lt;int&gt;
 
 === Synopsis
 
@@ -76,7 +76,7 @@ struct <<A-0e,A>>&lt;int&gt;;
 |===
 
 [#A-00-g]
-== <<A-00,A>>&lt;int&gt;::g
+== <<A-00,A&lt;int&gt;>>::g
 
 === Synopsis
 
@@ -89,7 +89,7 @@ g();
 ----
 
 [#A-0c]
-== A&lt;long&gt;
+== <<A-0e,A>>&lt;long&gt;
 
 === Synopsis
 
@@ -110,7 +110,7 @@ struct <<A-0e,A>>&lt;long&gt;;
 |===
 
 [#A-0c-h]
-== <<A-0c,A>>&lt;long&gt;::h
+== <<A-0c,A&lt;long&gt;>>::h
 
 === Synopsis
 
@@ -157,7 +157,7 @@ f();
 ----
 
 [#B-06]
-== B&lt;T&&gt;
+== <<B-00,B>>&lt;T&&gt;
 
 === Synopsis
 
@@ -178,7 +178,7 @@ struct <<B-00,B>>&lt;T&&gt;;
 |===
 
 [#B-06-h]
-== <<B-06,B>>&lt;T&&gt;::h
+== <<B-06,B&lt;T&&gt;>>::h
 
 === Synopsis
 
@@ -191,7 +191,7 @@ h();
 ----
 
 [#B-07]
-== B&lt;T*&gt;
+== <<B-00,B>>&lt;T*&gt;
 
 === Synopsis
 
@@ -212,7 +212,7 @@ struct <<B-00,B>>&lt;T*&gt;;
 |===
 
 [#B-07-g]
-== <<B-07,B>>&lt;T*&gt;::g
+== <<B-07,B&lt;T*&gt;>>::g
 
 === Synopsis
 
@@ -261,7 +261,7 @@ f();
 ----
 
 [#C-0a]
-== C&lt;int, int&gt;
+== <<C-0f,C>>&lt;int, int&gt;
 
 === Synopsis
 
@@ -282,7 +282,7 @@ struct <<C-0f,C>>&lt;int, int&gt;;
 |===
 
 [#C-0a-g]
-== <<C-0a,C>>&lt;int, int&gt;::g
+== <<C-0a,C&lt;int, int&gt;>>::g
 
 === Synopsis
 
@@ -295,7 +295,7 @@ g();
 ----
 
 [#C-0e]
-== C&lt;T*, int&gt;
+== <<C-0f,C>>&lt;T*, int&gt;
 
 === Synopsis
 
@@ -316,7 +316,7 @@ struct <<C-0f,C>>&lt;T*, int&gt;;
 |===
 
 [#C-0e-h]
-== <<C-0e,C>>&lt;T*, int&gt;::h
+== <<C-0e,C&lt;T*, int&gt;>>::h
 
 === Synopsis
 
diff --git a/test-files/golden-tests/symbols/record/class-template-spec.html b/test-files/golden-tests/symbols/record/class-template-spec.html
index 2eb7ca6d2..53c849588 100644
--- a/test-files/golden-tests/symbols/record/class-template-spec.html
+++ b/test-files/golden-tests/symbols/record/class-template-spec.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -33,7 +33,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-0e">A</h2>
+<h2 id="A-0e"><a href="#A-0e">A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -64,7 +64,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-0e-f"><a href="#A-0e">A</a>::f</h2>
+<h2 id="A-0e-f"><a href="#A-0e-f">A::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -80,7 +80,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-00">A&lt;int&gt;</h2>
+<h2 id="A-00"><a href="#A-00">A&lt;int&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -111,7 +111,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-00-g"><a href="#A-00">A</a>&lt;int&gt;::g</h2>
+<h2 id="A-00-g"><a href="#A-00-g">A&lt;int&gt;::g</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -127,7 +127,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-0c">A&lt;long&gt;</h2>
+<h2 id="A-0c"><a href="#A-0c">A&lt;long&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -158,7 +158,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-0c-h"><a href="#A-0c">A</a>&lt;long&gt;::h</h2>
+<h2 id="A-0c-h"><a href="#A-0c-h">A&lt;long&gt;::h</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -174,7 +174,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="B-00">B</h2>
+<h2 id="B-00"><a href="#B-00">B</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -205,7 +205,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="B-00-f"><a href="#B-00">B</a>::f</h2>
+<h2 id="B-00-f"><a href="#B-00-f">B::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -221,7 +221,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="B-06">B&lt;T&&gt;</h2>
+<h2 id="B-06"><a href="#B-06">B&lt;T&&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -252,7 +252,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="B-06-h"><a href="#B-06">B</a>&lt;T&&gt;::h</h2>
+<h2 id="B-06-h"><a href="#B-06-h">B&lt;T&&gt;::h</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -268,7 +268,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="B-07">B&lt;T*&gt;</h2>
+<h2 id="B-07"><a href="#B-07">B&lt;T*&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -299,7 +299,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="B-07-g"><a href="#B-07">B</a>&lt;T*&gt;::g</h2>
+<h2 id="B-07-g"><a href="#B-07-g">B&lt;T*&gt;::g</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -315,7 +315,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="C-0f">C</h2>
+<h2 id="C-0f"><a href="#C-0f">C</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -348,7 +348,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="C-0f-f"><a href="#C-0f">C</a>::f</h2>
+<h2 id="C-0f-f"><a href="#C-0f-f">C::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -364,7 +364,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="C-0a">C&lt;int, int&gt;</h2>
+<h2 id="C-0a"><a href="#C-0a">C&lt;int, int&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -395,7 +395,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="C-0a-g"><a href="#C-0a">C</a>&lt;int, int&gt;::g</h2>
+<h2 id="C-0a-g"><a href="#C-0a-g">C&lt;int, int&gt;::g</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -411,7 +411,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="C-0e">C&lt;T*, int&gt;</h2>
+<h2 id="C-0e"><a href="#C-0e">C&lt;T*, int&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -442,7 +442,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="C-0e-h"><a href="#C-0e">C</a>&lt;T*, int&gt;::h</h2>
+<h2 id="C-0e-h"><a href="#C-0e-h">C&lt;T*, int&gt;::h</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/record/class-template-specializations-1.adoc b/test-files/golden-tests/symbols/record/class-template-specializations-1.adoc
index c66558d1d..95af9c416 100644
--- a/test-files/golden-tests/symbols/record/class-template-specializations-1.adoc
+++ b/test-files/golden-tests/symbols/record/class-template-specializations-1.adoc
@@ -1858,7 +1858,7 @@ f0();
 ----
 
 [#S0-0be]
-== S0&lt;0&gt;
+== <<S0-0cf,S0>>&lt;0&gt;
 
 === Synopsis
 
@@ -1881,7 +1881,7 @@ struct <<S0-0cf,S0>>&lt;0&gt;;
 |===
 
 [#S0-08]
-== S0&lt;10&gt;
+== <<S0-0cf,S0>>&lt;10&gt;
 
 === Synopsis
 
@@ -1911,7 +1911,7 @@ struct <<S0-0cf,S0>>&lt;10&gt;;
 |===
 
 [#S0-08-S1]
-== <<S0-08,S0>>&lt;10&gt;::S1
+== <<S0-08,S0&lt;10&gt;>>::S1
 
 === Synopsis
 
@@ -1940,7 +1940,7 @@ struct S1;
 |===
 
 [#S0-08-S1-S2-0b]
-== <<S0-08,S0>>&lt;10&gt;::<<S0-08-S1,S1>>::S2
+== <<S0-08,S0&lt;10&gt;>>::<<S0-08-S1,S1>>::S2
 
 === Synopsis
 
@@ -1955,7 +1955,7 @@ struct S2;
 ----
 
 [#S0-08-S1-S2-08]
-== <<S0-08,S0>>&lt;10&gt;::<<S0-08-S1,S1>>::S2&lt;11&gt;
+== <<S0-08,S0&lt;10&gt;>>::<<S0-08-S1,S1>>::<<S0-0cf-S1-S2,S2>>&lt;11&gt;
 
 === Synopsis
 
@@ -1985,7 +1985,7 @@ struct <<S0-0cf-S1-S2,S2>>&lt;11&gt;;
 |===
 
 [#S0-08-S1-S2-08-S3]
-== <<S0-08,S0>>&lt;10&gt;::<<S0-08-S1,S1>>::<<S0-08-S1-S2-08,S2>>&lt;11&gt;::S3
+== <<S0-08,S0&lt;10&gt;>>::<<S0-08-S1,S1>>::<<S0-08-S1-S2-08,S2&lt;11&gt;>>::S3
 
 === Synopsis
 
@@ -1997,7 +1997,7 @@ struct S3;
 ----
 
 [#S0-08-S1-S2-08-S4]
-== <<S0-08,S0>>&lt;10&gt;::<<S0-08-S1,S1>>::<<S0-08-S1-S2-08,S2>>&lt;11&gt;::S4
+== <<S0-08,S0&lt;10&gt;>>::<<S0-08-S1,S1>>::<<S0-08-S1-S2-08,S2&lt;11&gt;>>::S4
 
 === Synopsis
 
@@ -2022,7 +2022,7 @@ struct S4;
 |===
 
 [#S0-08-S1-S2-08-f2]
-== <<S0-08,S0>>&lt;10&gt;::<<S0-08-S1,S1>>::<<S0-08-S1-S2-08,S2>>&lt;11&gt;::f2
+== <<S0-08,S0&lt;10&gt;>>::<<S0-08-S1,S1>>::<<S0-08-S1-S2-08,S2&lt;11&gt;>>::f2
 
 === Synopsis
 
@@ -2035,7 +2035,7 @@ f2();
 ----
 
 [#S0-08-S1-f1]
-== <<S0-08,S0>>&lt;10&gt;::<<S0-08-S1,S1>>::f1
+== <<S0-08,S0&lt;10&gt;>>::<<S0-08-S1,S1>>::f1
 
 === Synopsis
 
@@ -2048,7 +2048,7 @@ f1();
 ----
 
 [#S0-08-S5]
-== <<S0-08,S0>>&lt;10&gt;::S5
+== <<S0-08,S0&lt;10&gt;>>::S5
 
 === Synopsis
 
@@ -2063,7 +2063,7 @@ struct S5;
 ----
 
 [#S0-08-f0]
-== <<S0-08,S0>>&lt;10&gt;::f0
+== <<S0-08,S0&lt;10&gt;>>::f0
 
 === Synopsis
 
@@ -2076,7 +2076,7 @@ f0();
 ----
 
 [#S0-0e]
-== S0&lt;12&gt;
+== <<S0-0cf,S0>>&lt;12&gt;
 
 === Synopsis
 
@@ -2106,7 +2106,7 @@ struct <<S0-0cf,S0>>&lt;12&gt;;
 |===
 
 [#S0-0e-S1]
-== <<S0-0e,S0>>&lt;12&gt;::S1
+== <<S0-0e,S0&lt;12&gt;>>::S1
 
 === Synopsis
 
@@ -2135,7 +2135,7 @@ struct S1;
 |===
 
 [#S0-0e-S1-S2-09]
-== <<S0-0e,S0>>&lt;12&gt;::<<S0-0e-S1,S1>>::S2
+== <<S0-0e,S0&lt;12&gt;>>::<<S0-0e-S1,S1>>::S2
 
 === Synopsis
 
@@ -2150,7 +2150,7 @@ struct S2;
 ----
 
 [#S0-0e-S1-S2-02]
-== <<S0-0e,S0>>&lt;12&gt;::<<S0-0e-S1,S1>>::S2&lt;13&gt;
+== <<S0-0e,S0&lt;12&gt;>>::<<S0-0e-S1,S1>>::<<S0-0cf-S1-S2,S2>>&lt;13&gt;
 
 === Synopsis
 
@@ -2181,7 +2181,7 @@ struct <<S0-0cf-S1-S2,S2>>&lt;13&gt;;
 |===
 
 [#S0-0e-S1-S2-02-S3]
-== <<S0-0e,S0>>&lt;12&gt;::<<S0-0e-S1,S1>>::<<S0-0e-S1-S2-02,S2>>&lt;13&gt;::S3
+== <<S0-0e,S0&lt;12&gt;>>::<<S0-0e-S1,S1>>::<<S0-0e-S1-S2-02,S2&lt;13&gt;>>::S3
 
 === Synopsis
 
@@ -2193,7 +2193,7 @@ struct S3;
 ----
 
 [#S0-0e-S1-S2-02-S4-00]
-== <<S0-0e,S0>>&lt;12&gt;::<<S0-0e-S1,S1>>::<<S0-0e-S1-S2-02,S2>>&lt;13&gt;::S4
+== <<S0-0e,S0&lt;12&gt;>>::<<S0-0e-S1,S1>>::<<S0-0e-S1-S2-02,S2&lt;13&gt;>>::S4
 
 === Synopsis
 
@@ -2208,7 +2208,7 @@ struct S4;
 ----
 
 [#S0-0e-S1-S2-02-S4-0c]
-== <<S0-0e,S0>>&lt;12&gt;::<<S0-0e-S1,S1>>::<<S0-0e-S1-S2-02,S2>>&lt;13&gt;::S4&lt;14&gt;
+== <<S0-0e,S0&lt;12&gt;>>::<<S0-0e-S1,S1>>::<<S0-0e-S1-S2-02,S2&lt;13&gt;>>::<<S0-0cf-S1-S2-S4,S4>>&lt;14&gt;
 
 === Synopsis
 
@@ -2231,7 +2231,7 @@ struct <<S0-0cf-S1-S2-S4,S4>>&lt;14&gt;;
 |===
 
 [#S0-0e-S1-S2-02-f2]
-== <<S0-0e,S0>>&lt;12&gt;::<<S0-0e-S1,S1>>::<<S0-0e-S1-S2-02,S2>>&lt;13&gt;::f2
+== <<S0-0e,S0&lt;12&gt;>>::<<S0-0e-S1,S1>>::<<S0-0e-S1-S2-02,S2&lt;13&gt;>>::f2
 
 === Synopsis
 
@@ -2244,7 +2244,7 @@ f2();
 ----
 
 [#S0-0e-S1-f1]
-== <<S0-0e,S0>>&lt;12&gt;::<<S0-0e-S1,S1>>::f1
+== <<S0-0e,S0&lt;12&gt;>>::<<S0-0e-S1,S1>>::f1
 
 === Synopsis
 
@@ -2257,7 +2257,7 @@ f1();
 ----
 
 [#S0-0e-S5]
-== <<S0-0e,S0>>&lt;12&gt;::S5
+== <<S0-0e,S0&lt;12&gt;>>::S5
 
 === Synopsis
 
@@ -2272,7 +2272,7 @@ struct S5;
 ----
 
 [#S0-0e-f0]
-== <<S0-0e,S0>>&lt;12&gt;::f0
+== <<S0-0e,S0&lt;12&gt;>>::f0
 
 === Synopsis
 
@@ -2285,7 +2285,7 @@ f0();
 ----
 
 [#S0-09e4]
-== S0&lt;15&gt;
+== <<S0-0cf,S0>>&lt;15&gt;
 
 === Synopsis
 
@@ -2315,7 +2315,7 @@ struct <<S0-0cf,S0>>&lt;15&gt;;
 |===
 
 [#S0-09e4-S1]
-== <<S0-09e4,S0>>&lt;15&gt;::S1
+== <<S0-09e4,S0&lt;15&gt;>>::S1
 
 === Synopsis
 
@@ -2344,7 +2344,7 @@ struct S1;
 |===
 
 [#S0-09e4-S1-S2-07]
-== <<S0-09e4,S0>>&lt;15&gt;::<<S0-09e4-S1,S1>>::S2
+== <<S0-09e4,S0&lt;15&gt;>>::<<S0-09e4-S1,S1>>::S2
 
 === Synopsis
 
@@ -2359,7 +2359,7 @@ struct S2;
 ----
 
 [#S0-09e4-S1-S2-02]
-== <<S0-09e4,S0>>&lt;15&gt;::<<S0-09e4-S1,S1>>::S2&lt;16&gt;
+== <<S0-09e4,S0&lt;15&gt;>>::<<S0-09e4-S1,S1>>::<<S0-0cf-S1-S2,S2>>&lt;16&gt;
 
 === Synopsis
 
@@ -2391,7 +2391,7 @@ struct <<S0-0cf-S1-S2,S2>>&lt;16&gt;;
 |===
 
 [#S0-09e4-S1-S2-02-S3]
-== <<S0-09e4,S0>>&lt;15&gt;::<<S0-09e4-S1,S1>>::<<S0-09e4-S1-S2-02,S2>>&lt;16&gt;::S3
+== <<S0-09e4,S0&lt;15&gt;>>::<<S0-09e4-S1,S1>>::<<S0-09e4-S1-S2-02,S2&lt;16&gt;>>::S3
 
 === Synopsis
 
@@ -2403,7 +2403,7 @@ struct S3;
 ----
 
 [#S0-09e4-S1-S2-02-S4-00]
-== <<S0-09e4,S0>>&lt;15&gt;::<<S0-09e4-S1,S1>>::<<S0-09e4-S1-S2-02,S2>>&lt;16&gt;::S4
+== <<S0-09e4,S0&lt;15&gt;>>::<<S0-09e4-S1,S1>>::<<S0-09e4-S1-S2-02,S2&lt;16&gt;>>::S4
 
 === Synopsis
 
@@ -2428,7 +2428,7 @@ struct S4;
 |===
 
 [#S0-09e4-S1-S2-02-S4-02]
-== <<S0-09e4,S0>>&lt;15&gt;::<<S0-09e4-S1,S1>>::<<S0-09e4-S1-S2-02,S2>>&lt;16&gt;::S4&lt;17, int*&gt;
+== <<S0-09e4,S0&lt;15&gt;>>::<<S0-09e4-S1,S1>>::<<S0-09e4-S1-S2-02,S2&lt;16&gt;>>::<<S0-0cf-S1-S2-S4,S4>>&lt;17, int*&gt;
 
 === Synopsis
 
@@ -2451,7 +2451,7 @@ struct <<S0-0cf-S1-S2-S4,S4>>&lt;17, int*&gt;;
 |===
 
 [#S0-09e4-S1-S2-02-S4-07]
-== <<S0-09e4,S0>>&lt;15&gt;::<<S0-09e4-S1,S1>>::<<S0-09e4-S1-S2-02,S2>>&lt;16&gt;::S4&lt;17, T*&gt;
+== <<S0-09e4,S0&lt;15&gt;>>::<<S0-09e4-S1,S1>>::<<S0-09e4-S1-S2-02,S2&lt;16&gt;>>::<<S0-0cf-S1-S2-S4,S4>>&lt;17, T*&gt;
 
 === Synopsis
 
@@ -2464,7 +2464,7 @@ struct <<S0-0cf-S1-S2-S4,S4>>&lt;17, T*&gt;;
 ----
 
 [#S0-09e4-S1-S2-02-f2]
-== <<S0-09e4,S0>>&lt;15&gt;::<<S0-09e4-S1,S1>>::<<S0-09e4-S1-S2-02,S2>>&lt;16&gt;::f2
+== <<S0-09e4,S0&lt;15&gt;>>::<<S0-09e4-S1,S1>>::<<S0-09e4-S1-S2-02,S2&lt;16&gt;>>::f2
 
 === Synopsis
 
@@ -2477,7 +2477,7 @@ f2();
 ----
 
 [#S0-09e4-S1-f1]
-== <<S0-09e4,S0>>&lt;15&gt;::<<S0-09e4-S1,S1>>::f1
+== <<S0-09e4,S0&lt;15&gt;>>::<<S0-09e4-S1,S1>>::f1
 
 === Synopsis
 
@@ -2490,7 +2490,7 @@ f1();
 ----
 
 [#S0-09e4-S5]
-== <<S0-09e4,S0>>&lt;15&gt;::S5
+== <<S0-09e4,S0&lt;15&gt;>>::S5
 
 === Synopsis
 
@@ -2505,7 +2505,7 @@ struct S5;
 ----
 
 [#S0-09e4-f0]
-== <<S0-09e4,S0>>&lt;15&gt;::f0
+== <<S0-09e4,S0&lt;15&gt;>>::f0
 
 === Synopsis
 
@@ -2518,7 +2518,7 @@ f0();
 ----
 
 [#S0-07a]
-== S0&lt;18&gt;
+== <<S0-0cf,S0>>&lt;18&gt;
 
 === Synopsis
 
@@ -2548,7 +2548,7 @@ struct <<S0-0cf,S0>>&lt;18&gt;;
 |===
 
 [#S0-07a-S1]
-== <<S0-07a,S0>>&lt;18&gt;::S1
+== <<S0-07a,S0&lt;18&gt;>>::S1
 
 === Synopsis
 
@@ -2560,7 +2560,7 @@ struct S1;
 ----
 
 [#S0-07a-S5]
-== <<S0-07a,S0>>&lt;18&gt;::S5
+== <<S0-07a,S0&lt;18&gt;>>::S5
 
 === Synopsis
 
@@ -2585,7 +2585,7 @@ struct S5;
 |===
 
 [#S0-07a-f0]
-== <<S0-07a,S0>>&lt;18&gt;::f0
+== <<S0-07a,S0&lt;18&gt;>>::f0
 
 === Synopsis
 
@@ -2598,7 +2598,7 @@ f0();
 ----
 
 [#S0-0a7]
-== S0&lt;19&gt;
+== <<S0-0cf,S0>>&lt;19&gt;
 
 === Synopsis
 
@@ -2629,7 +2629,7 @@ struct <<S0-0cf,S0>>&lt;19&gt;;
 |===
 
 [#S0-0a7-S1]
-== <<S0-0a7,S0>>&lt;19&gt;::S1
+== <<S0-0a7,S0&lt;19&gt;>>::S1
 
 === Synopsis
 
@@ -2641,7 +2641,7 @@ struct S1;
 ----
 
 [#S0-0a7-S5-03]
-== <<S0-0a7,S0>>&lt;19&gt;::S5
+== <<S0-0a7,S0&lt;19&gt;>>::S5
 
 === Synopsis
 
@@ -2656,7 +2656,7 @@ struct S5;
 ----
 
 [#S0-0a7-S5-07]
-== <<S0-0a7,S0>>&lt;19&gt;::S5&lt;20&gt;
+== <<S0-0a7,S0&lt;19&gt;>>::<<S0-0cf-S5,S5>>&lt;20&gt;
 
 === Synopsis
 
@@ -2679,7 +2679,7 @@ struct <<S0-0cf-S5,S5>>&lt;20&gt;;
 |===
 
 [#S0-0a7-f0]
-== <<S0-0a7,S0>>&lt;19&gt;::f0
+== <<S0-0a7,S0&lt;19&gt;>>::f0
 
 === Synopsis
 
@@ -2692,7 +2692,7 @@ f0();
 ----
 
 [#S0-09c]
-== S0&lt;2&gt;
+== <<S0-0cf,S0>>&lt;2&gt;
 
 === Synopsis
 
@@ -2722,7 +2722,7 @@ struct <<S0-0cf,S0>>&lt;2&gt;;
 |===
 
 [#S0-09c-S1]
-== <<S0-09c,S0>>&lt;2&gt;::S1
+== <<S0-09c,S0&lt;2&gt;>>::S1
 
 === Synopsis
 
@@ -2744,7 +2744,7 @@ struct S1;
 |===
 
 [#S0-09c-S5]
-== <<S0-09c,S0>>&lt;2&gt;::S5
+== <<S0-09c,S0&lt;2&gt;>>::S5
 
 === Synopsis
 
@@ -2759,7 +2759,7 @@ struct S5;
 ----
 
 [#S0-09c-f0]
-== <<S0-09c,S0>>&lt;2&gt;::f0
+== <<S0-09c,S0&lt;2&gt;>>::f0
 
 === Synopsis
 
@@ -2772,7 +2772,7 @@ f0();
 ----
 
 [#S0-0314]
-== S0&lt;21&gt;
+== <<S0-0cf,S0>>&lt;21&gt;
 
 === Synopsis
 
@@ -2804,7 +2804,7 @@ struct <<S0-0cf,S0>>&lt;21&gt;;
 |===
 
 [#S0-0314-S1]
-== <<S0-0314,S0>>&lt;21&gt;::S1
+== <<S0-0314,S0&lt;21&gt;>>::S1
 
 === Synopsis
 
@@ -2816,7 +2816,7 @@ struct S1;
 ----
 
 [#S0-0314-S5-07]
-== <<S0-0314,S0>>&lt;21&gt;::S5
+== <<S0-0314,S0&lt;21&gt;>>::S5
 
 === Synopsis
 
@@ -2841,7 +2841,7 @@ struct S5;
 |===
 
 [#S0-0314-S5-03]
-== <<S0-0314,S0>>&lt;21&gt;::S5&lt;22, int*&gt;
+== <<S0-0314,S0&lt;21&gt;>>::<<S0-0cf-S5,S5>>&lt;22, int*&gt;
 
 === Synopsis
 
@@ -2864,7 +2864,7 @@ struct <<S0-0cf-S5,S5>>&lt;22, int*&gt;;
 |===
 
 [#S0-0314-S5-0b]
-== <<S0-0314,S0>>&lt;21&gt;::S5&lt;22, T*&gt;
+== <<S0-0314,S0&lt;21&gt;>>::<<S0-0cf-S5,S5>>&lt;22, T*&gt;
 
 === Synopsis
 
@@ -2877,7 +2877,7 @@ struct <<S0-0cf-S5,S5>>&lt;22, T*&gt;;
 ----
 
 [#S0-0314-f0]
-== <<S0-0314,S0>>&lt;21&gt;::f0
+== <<S0-0314,S0&lt;21&gt;>>::f0
 
 === Synopsis
 
@@ -2890,7 +2890,7 @@ f0();
 ----
 
 [#S0-058]
-== S0&lt;23&gt;
+== <<S0-0cf,S0>>&lt;23&gt;
 
 === Synopsis
 
@@ -2921,7 +2921,7 @@ struct <<S0-0cf,S0>>&lt;23&gt;;
 |===
 
 [#S0-058-S1]
-== <<S0-058,S0>>&lt;23&gt;::S1
+== <<S0-058,S0&lt;23&gt;>>::S1
 
 === Synopsis
 
@@ -2933,7 +2933,7 @@ struct S1;
 ----
 
 [#S0-058-S5-0b]
-== <<S0-058,S0>>&lt;23&gt;::S5
+== <<S0-058,S0&lt;23&gt;>>::S5
 
 === Synopsis
 
@@ -2948,7 +2948,7 @@ struct S5;
 ----
 
 [#S0-058-S5-09]
-== <<S0-058,S0>>&lt;23&gt;::S5&lt;24&gt;
+== <<S0-058,S0&lt;23&gt;>>::<<S0-0cf-S5,S5>>&lt;24&gt;
 
 === Synopsis
 
@@ -2977,7 +2977,7 @@ struct <<S0-0cf-S5,S5>>&lt;24&gt;;
 |===
 
 [#S0-058-S5-09-S6]
-== <<S0-058,S0>>&lt;23&gt;::<<S0-058-S5-09,S5>>&lt;24&gt;::S6
+== <<S0-058,S0&lt;23&gt;>>::<<S0-058-S5-09,S5&lt;24&gt;>>::S6
 
 === Synopsis
 
@@ -2999,7 +2999,7 @@ struct S6;
 |===
 
 [#S0-058-S5-09-f5]
-== <<S0-058,S0>>&lt;23&gt;::<<S0-058-S5-09,S5>>&lt;24&gt;::f5
+== <<S0-058,S0&lt;23&gt;>>::<<S0-058-S5-09,S5&lt;24&gt;>>::f5
 
 === Synopsis
 
@@ -3012,7 +3012,7 @@ f5();
 ----
 
 [#S0-058-f0]
-== <<S0-058,S0>>&lt;23&gt;::f0
+== <<S0-058,S0&lt;23&gt;>>::f0
 
 === Synopsis
 
@@ -3025,7 +3025,7 @@ f0();
 ----
 
 [#S0-0a2]
-== S0&lt;25&gt;
+== <<S0-0cf,S0>>&lt;25&gt;
 
 === Synopsis
 
@@ -3056,7 +3056,7 @@ struct <<S0-0cf,S0>>&lt;25&gt;;
 |===
 
 [#S0-0a2-S1]
-== <<S0-0a2,S0>>&lt;25&gt;::S1
+== <<S0-0a2,S0&lt;25&gt;>>::S1
 
 === Synopsis
 
@@ -3068,7 +3068,7 @@ struct S1;
 ----
 
 [#S0-0a2-S5-04]
-== <<S0-0a2,S0>>&lt;25&gt;::S5
+== <<S0-0a2,S0&lt;25&gt;>>::S5
 
 === Synopsis
 
@@ -3083,7 +3083,7 @@ struct S5;
 ----
 
 [#S0-0a2-S5-02]
-== <<S0-0a2,S0>>&lt;25&gt;::S5&lt;26&gt;
+== <<S0-0a2,S0&lt;25&gt;>>::<<S0-0cf-S5,S5>>&lt;26&gt;
 
 === Synopsis
 
@@ -3112,7 +3112,7 @@ struct <<S0-0cf-S5,S5>>&lt;26&gt;;
 |===
 
 [#S0-0a2-S5-02-S6]
-== <<S0-0a2,S0>>&lt;25&gt;::<<S0-0a2-S5-02,S5>>&lt;26&gt;::S6
+== <<S0-0a2,S0&lt;25&gt;>>::<<S0-0a2-S5-02,S5&lt;26&gt;>>::S6
 
 === Synopsis
 
@@ -3140,7 +3140,7 @@ struct S6;
 |===
 
 [#S0-0a2-S5-02-S6-S7]
-== <<S0-0a2,S0>>&lt;25&gt;::<<S0-0a2-S5-02,S5>>&lt;26&gt;::<<S0-0a2-S5-02-S6,S6>>::S7
+== <<S0-0a2,S0&lt;25&gt;>>::<<S0-0a2-S5-02,S5&lt;26&gt;>>::<<S0-0a2-S5-02-S6,S6>>::S7
 
 === Synopsis
 
@@ -3165,7 +3165,7 @@ struct S7;
 |===
 
 [#S0-0a2-S5-02-S6-f6]
-== <<S0-0a2,S0>>&lt;25&gt;::<<S0-0a2-S5-02,S5>>&lt;26&gt;::<<S0-0a2-S5-02-S6,S6>>::f6
+== <<S0-0a2,S0&lt;25&gt;>>::<<S0-0a2-S5-02,S5&lt;26&gt;>>::<<S0-0a2-S5-02-S6,S6>>::f6
 
 === Synopsis
 
@@ -3178,7 +3178,7 @@ f6();
 ----
 
 [#S0-0a2-S5-02-f5]
-== <<S0-0a2,S0>>&lt;25&gt;::<<S0-0a2-S5-02,S5>>&lt;26&gt;::f5
+== <<S0-0a2,S0&lt;25&gt;>>::<<S0-0a2-S5-02,S5&lt;26&gt;>>::f5
 
 === Synopsis
 
@@ -3191,7 +3191,7 @@ f5();
 ----
 
 [#S0-0a2-f0]
-== <<S0-0a2,S0>>&lt;25&gt;::f0
+== <<S0-0a2,S0&lt;25&gt;>>::f0
 
 === Synopsis
 
@@ -3204,7 +3204,7 @@ f0();
 ----
 
 [#S0-09e2]
-== S0&lt;27&gt;
+== <<S0-0cf,S0>>&lt;27&gt;
 
 === Synopsis
 
@@ -3235,7 +3235,7 @@ struct <<S0-0cf,S0>>&lt;27&gt;;
 |===
 
 [#S0-09e2-S1]
-== <<S0-09e2,S0>>&lt;27&gt;::S1
+== <<S0-09e2,S0&lt;27&gt;>>::S1
 
 === Synopsis
 
@@ -3247,7 +3247,7 @@ struct S1;
 ----
 
 [#S0-09e2-S5-0b]
-== <<S0-09e2,S0>>&lt;27&gt;::S5
+== <<S0-09e2,S0&lt;27&gt;>>::S5
 
 === Synopsis
 
@@ -3262,7 +3262,7 @@ struct S5;
 ----
 
 [#S0-09e2-S5-0c]
-== <<S0-09e2,S0>>&lt;27&gt;::S5&lt;28&gt;
+== <<S0-09e2,S0&lt;27&gt;>>::<<S0-0cf-S5,S5>>&lt;28&gt;
 
 === Synopsis
 
@@ -3291,7 +3291,7 @@ struct <<S0-0cf-S5,S5>>&lt;28&gt;;
 |===
 
 [#S0-09e2-S5-0c-S6]
-== <<S0-09e2,S0>>&lt;27&gt;::<<S0-09e2-S5-0c,S5>>&lt;28&gt;::S6
+== <<S0-09e2,S0&lt;27&gt;>>::<<S0-09e2-S5-0c,S5&lt;28&gt;>>::S6
 
 === Synopsis
 
@@ -3321,7 +3321,7 @@ struct S6;
 |===
 
 [#S0-09e2-S5-0c-S6-S7-0b]
-== <<S0-09e2,S0>>&lt;27&gt;::<<S0-09e2-S5-0c,S5>>&lt;28&gt;::<<S0-09e2-S5-0c-S6,S6>>::S7
+== <<S0-09e2,S0&lt;27&gt;>>::<<S0-09e2-S5-0c,S5&lt;28&gt;>>::<<S0-09e2-S5-0c-S6,S6>>::S7
 
 === Synopsis
 
@@ -3346,7 +3346,7 @@ struct S7;
 |===
 
 [#S0-09e2-S5-0c-S6-S7-0d]
-== <<S0-09e2,S0>>&lt;27&gt;::<<S0-09e2-S5-0c,S5>>&lt;28&gt;::<<S0-09e2-S5-0c-S6,S6>>::S7&lt;29, int*&gt;
+== <<S0-09e2,S0&lt;27&gt;>>::<<S0-09e2-S5-0c,S5&lt;28&gt;>>::<<S0-09e2-S5-0c-S6,S6>>::<<S0-0cf-S5-S6-S7,S7>>&lt;29, int*&gt;
 
 === Synopsis
 
@@ -3369,7 +3369,7 @@ struct <<S0-0cf-S5-S6-S7,S7>>&lt;29, int*&gt;;
 |===
 
 [#S0-09e2-S5-0c-S6-S7-0a]
-== <<S0-09e2,S0>>&lt;27&gt;::<<S0-09e2-S5-0c,S5>>&lt;28&gt;::<<S0-09e2-S5-0c-S6,S6>>::S7&lt;29, T*&gt;
+== <<S0-09e2,S0&lt;27&gt;>>::<<S0-09e2-S5-0c,S5&lt;28&gt;>>::<<S0-09e2-S5-0c-S6,S6>>::<<S0-0cf-S5-S6-S7,S7>>&lt;29, T*&gt;
 
 === Synopsis
 
@@ -3382,7 +3382,7 @@ struct <<S0-0cf-S5-S6-S7,S7>>&lt;29, T*&gt;;
 ----
 
 [#S0-09e2-S5-0c-S6-f6]
-== <<S0-09e2,S0>>&lt;27&gt;::<<S0-09e2-S5-0c,S5>>&lt;28&gt;::<<S0-09e2-S5-0c-S6,S6>>::f6
+== <<S0-09e2,S0&lt;27&gt;>>::<<S0-09e2-S5-0c,S5&lt;28&gt;>>::<<S0-09e2-S5-0c-S6,S6>>::f6
 
 === Synopsis
 
@@ -3395,7 +3395,7 @@ f6();
 ----
 
 [#S0-09e2-S5-0c-f5]
-== <<S0-09e2,S0>>&lt;27&gt;::<<S0-09e2-S5-0c,S5>>&lt;28&gt;::f5
+== <<S0-09e2,S0&lt;27&gt;>>::<<S0-09e2-S5-0c,S5&lt;28&gt;>>::f5
 
 === Synopsis
 
@@ -3408,7 +3408,7 @@ f5();
 ----
 
 [#S0-09e2-f0]
-== <<S0-09e2,S0>>&lt;27&gt;::f0
+== <<S0-09e2,S0&lt;27&gt;>>::f0
 
 === Synopsis
 
@@ -3421,7 +3421,7 @@ f0();
 ----
 
 [#S0-073]
-== S0&lt;3&gt;
+== <<S0-0cf,S0>>&lt;3&gt;
 
 === Synopsis
 
@@ -3451,7 +3451,7 @@ struct <<S0-0cf,S0>>&lt;3&gt;;
 |===
 
 [#S0-073-S1]
-== <<S0-073,S0>>&lt;3&gt;::S1
+== <<S0-073,S0&lt;3&gt;>>::S1
 
 === Synopsis
 
@@ -3479,7 +3479,7 @@ struct S1;
 |===
 
 [#S0-073-S1-S2]
-== <<S0-073,S0>>&lt;3&gt;::<<S0-073-S1,S1>>::S2
+== <<S0-073,S0&lt;3&gt;>>::<<S0-073-S1,S1>>::S2
 
 === Synopsis
 
@@ -3504,7 +3504,7 @@ struct S2;
 |===
 
 [#S0-073-S1-f1]
-== <<S0-073,S0>>&lt;3&gt;::<<S0-073-S1,S1>>::f1
+== <<S0-073,S0&lt;3&gt;>>::<<S0-073-S1,S1>>::f1
 
 === Synopsis
 
@@ -3517,7 +3517,7 @@ f1();
 ----
 
 [#S0-073-S5]
-== <<S0-073,S0>>&lt;3&gt;::S5
+== <<S0-073,S0&lt;3&gt;>>::S5
 
 === Synopsis
 
@@ -3532,7 +3532,7 @@ struct S5;
 ----
 
 [#S0-073-f0]
-== <<S0-073,S0>>&lt;3&gt;::f0
+== <<S0-073,S0&lt;3&gt;>>::f0
 
 === Synopsis
 
@@ -3545,7 +3545,7 @@ f0();
 ----
 
 [#S0-01]
-== S0&lt;30&gt;
+== <<S0-0cf,S0>>&lt;30&gt;
 
 === Synopsis
 
@@ -3576,7 +3576,7 @@ struct <<S0-0cf,S0>>&lt;30&gt;;
 |===
 
 [#S0-01-S1]
-== <<S0-01,S0>>&lt;30&gt;::S1
+== <<S0-01,S0&lt;30&gt;>>::S1
 
 === Synopsis
 
@@ -3588,7 +3588,7 @@ struct S1;
 ----
 
 [#S0-01-S5-07]
-== <<S0-01,S0>>&lt;30&gt;::S5
+== <<S0-01,S0&lt;30&gt;>>::S5
 
 === Synopsis
 
@@ -3603,7 +3603,7 @@ struct S5;
 ----
 
 [#S0-01-S5-04]
-== <<S0-01,S0>>&lt;30&gt;::S5&lt;31&gt;
+== <<S0-01,S0&lt;30&gt;>>::<<S0-0cf-S5,S5>>&lt;31&gt;
 
 === Synopsis
 
@@ -3632,7 +3632,7 @@ struct <<S0-0cf-S5,S5>>&lt;31&gt;;
 |===
 
 [#S0-01-S5-04-S6]
-== <<S0-01,S0>>&lt;30&gt;::<<S0-01-S5-04,S5>>&lt;31&gt;::S6
+== <<S0-01,S0&lt;30&gt;>>::<<S0-01-S5-04,S5&lt;31&gt;>>::S6
 
 === Synopsis
 
@@ -3661,7 +3661,7 @@ struct S6;
 |===
 
 [#S0-01-S5-04-S6-S7-0c]
-== <<S0-01,S0>>&lt;30&gt;::<<S0-01-S5-04,S5>>&lt;31&gt;::<<S0-01-S5-04-S6,S6>>::S7
+== <<S0-01,S0&lt;30&gt;>>::<<S0-01-S5-04,S5&lt;31&gt;>>::<<S0-01-S5-04-S6,S6>>::S7
 
 === Synopsis
 
@@ -3676,7 +3676,7 @@ struct S7;
 ----
 
 [#S0-01-S5-04-S6-S7-05]
-== <<S0-01,S0>>&lt;30&gt;::<<S0-01-S5-04,S5>>&lt;31&gt;::<<S0-01-S5-04-S6,S6>>::S7&lt;32&gt;
+== <<S0-01,S0&lt;30&gt;>>::<<S0-01-S5-04,S5&lt;31&gt;>>::<<S0-01-S5-04-S6,S6>>::<<S0-0cf-S5-S6-S7,S7>>&lt;32&gt;
 
 === Synopsis
 
@@ -3699,7 +3699,7 @@ struct <<S0-0cf-S5-S6-S7,S7>>&lt;32&gt;;
 |===
 
 [#S0-01-S5-04-S6-f6]
-== <<S0-01,S0>>&lt;30&gt;::<<S0-01-S5-04,S5>>&lt;31&gt;::<<S0-01-S5-04-S6,S6>>::f6
+== <<S0-01,S0&lt;30&gt;>>::<<S0-01-S5-04,S5&lt;31&gt;>>::<<S0-01-S5-04-S6,S6>>::f6
 
 === Synopsis
 
@@ -3712,7 +3712,7 @@ f6();
 ----
 
 [#S0-01-S5-04-f5]
-== <<S0-01,S0>>&lt;30&gt;::<<S0-01-S5-04,S5>>&lt;31&gt;::f5
+== <<S0-01,S0&lt;30&gt;>>::<<S0-01-S5-04,S5&lt;31&gt;>>::f5
 
 === Synopsis
 
@@ -3725,7 +3725,7 @@ f5();
 ----
 
 [#S0-01-f0]
-== <<S0-01,S0>>&lt;30&gt;::f0
+== <<S0-01,S0&lt;30&gt;>>::f0
 
 === Synopsis
 
@@ -3738,7 +3738,7 @@ f0();
 ----
 
 [#S0-09ee]
-== S0&lt;33&gt;
+== <<S0-0cf,S0>>&lt;33&gt;
 
 === Synopsis
 
@@ -3769,7 +3769,7 @@ struct <<S0-0cf,S0>>&lt;33&gt;;
 |===
 
 [#S0-09ee-S1]
-== <<S0-09ee,S0>>&lt;33&gt;::S1
+== <<S0-09ee,S0&lt;33&gt;>>::S1
 
 === Synopsis
 
@@ -3781,7 +3781,7 @@ struct S1;
 ----
 
 [#S0-09ee-S5-0b]
-== <<S0-09ee,S0>>&lt;33&gt;::S5
+== <<S0-09ee,S0&lt;33&gt;>>::S5
 
 === Synopsis
 
@@ -3796,7 +3796,7 @@ struct S5;
 ----
 
 [#S0-09ee-S5-02]
-== <<S0-09ee,S0>>&lt;33&gt;::S5&lt;34&gt;
+== <<S0-09ee,S0&lt;33&gt;>>::<<S0-0cf-S5,S5>>&lt;34&gt;
 
 === Synopsis
 
@@ -3825,7 +3825,7 @@ struct <<S0-0cf-S5,S5>>&lt;34&gt;;
 |===
 
 [#S0-09ee-S5-02-S6]
-== <<S0-09ee,S0>>&lt;33&gt;::<<S0-09ee-S5-02,S5>>&lt;34&gt;::S6
+== <<S0-09ee,S0&lt;33&gt;>>::<<S0-09ee-S5-02,S5&lt;34&gt;>>::S6
 
 === Synopsis
 
@@ -3854,7 +3854,7 @@ struct S6;
 |===
 
 [#S0-09ee-S5-02-S6-S7-09]
-== <<S0-09ee,S0>>&lt;33&gt;::<<S0-09ee-S5-02,S5>>&lt;34&gt;::<<S0-09ee-S5-02-S6,S6>>::S7
+== <<S0-09ee,S0&lt;33&gt;>>::<<S0-09ee-S5-02,S5&lt;34&gt;>>::<<S0-09ee-S5-02-S6,S6>>::S7
 
 === Synopsis
 
@@ -3869,7 +3869,7 @@ struct S7;
 ----
 
 [#S0-09ee-S5-02-S6-S7-03]
-== <<S0-09ee,S0>>&lt;33&gt;::<<S0-09ee-S5-02,S5>>&lt;34&gt;::<<S0-09ee-S5-02-S6,S6>>::S7&lt;35&gt;
+== <<S0-09ee,S0&lt;33&gt;>>::<<S0-09ee-S5-02,S5&lt;34&gt;>>::<<S0-09ee-S5-02-S6,S6>>::<<S0-0cf-S5-S6-S7,S7>>&lt;35&gt;
 
 === Synopsis
 
@@ -3899,7 +3899,7 @@ struct <<S0-0cf-S5-S6-S7,S7>>&lt;35&gt;;
 |===
 
 [#S0-09ee-S5-02-S6-S7-03-S8]
-== <<S0-09ee,S0>>&lt;33&gt;::<<S0-09ee-S5-02,S5>>&lt;34&gt;::<<S0-09ee-S5-02-S6,S6>>::<<S0-09ee-S5-02-S6-S7-03,S7>>&lt;35&gt;::S8
+== <<S0-09ee,S0&lt;33&gt;>>::<<S0-09ee-S5-02,S5&lt;34&gt;>>::<<S0-09ee-S5-02-S6,S6>>::<<S0-09ee-S5-02-S6-S7-03,S7&lt;35&gt;>>::S8
 
 === Synopsis
 
@@ -3921,7 +3921,7 @@ struct S8;
 |===
 
 [#S0-09ee-S5-02-S6-S7-03-S9]
-== <<S0-09ee,S0>>&lt;33&gt;::<<S0-09ee-S5-02,S5>>&lt;34&gt;::<<S0-09ee-S5-02-S6,S6>>::<<S0-09ee-S5-02-S6-S7-03,S7>>&lt;35&gt;::S9
+== <<S0-09ee,S0&lt;33&gt;>>::<<S0-09ee-S5-02,S5&lt;34&gt;>>::<<S0-09ee-S5-02-S6,S6>>::<<S0-09ee-S5-02-S6-S7-03,S7&lt;35&gt;>>::S9
 
 === Synopsis
 
@@ -3936,7 +3936,7 @@ struct S9;
 ----
 
 [#S0-09ee-S5-02-S6-S7-03-f7]
-== <<S0-09ee,S0>>&lt;33&gt;::<<S0-09ee-S5-02,S5>>&lt;34&gt;::<<S0-09ee-S5-02-S6,S6>>::<<S0-09ee-S5-02-S6-S7-03,S7>>&lt;35&gt;::f7
+== <<S0-09ee,S0&lt;33&gt;>>::<<S0-09ee-S5-02,S5&lt;34&gt;>>::<<S0-09ee-S5-02-S6,S6>>::<<S0-09ee-S5-02-S6-S7-03,S7&lt;35&gt;>>::f7
 
 === Synopsis
 
@@ -3949,7 +3949,7 @@ f7();
 ----
 
 [#S0-09ee-S5-02-S6-f6]
-== <<S0-09ee,S0>>&lt;33&gt;::<<S0-09ee-S5-02,S5>>&lt;34&gt;::<<S0-09ee-S5-02-S6,S6>>::f6
+== <<S0-09ee,S0&lt;33&gt;>>::<<S0-09ee-S5-02,S5&lt;34&gt;>>::<<S0-09ee-S5-02-S6,S6>>::f6
 
 === Synopsis
 
@@ -3962,7 +3962,7 @@ f6();
 ----
 
 [#S0-09ee-S5-02-f5]
-== <<S0-09ee,S0>>&lt;33&gt;::<<S0-09ee-S5-02,S5>>&lt;34&gt;::f5
+== <<S0-09ee,S0&lt;33&gt;>>::<<S0-09ee-S5-02,S5&lt;34&gt;>>::f5
 
 === Synopsis
 
@@ -3975,7 +3975,7 @@ f5();
 ----
 
 [#S0-09ee-f0]
-== <<S0-09ee,S0>>&lt;33&gt;::f0
+== <<S0-09ee,S0&lt;33&gt;>>::f0
 
 === Synopsis
 
@@ -3988,7 +3988,7 @@ f0();
 ----
 
 [#S0-033]
-== S0&lt;36&gt;
+== <<S0-0cf,S0>>&lt;36&gt;
 
 === Synopsis
 
@@ -4019,7 +4019,7 @@ struct <<S0-0cf,S0>>&lt;36&gt;;
 |===
 
 [#S0-033-S1]
-== <<S0-033,S0>>&lt;36&gt;::S1
+== <<S0-033,S0&lt;36&gt;>>::S1
 
 === Synopsis
 
@@ -4031,7 +4031,7 @@ struct S1;
 ----
 
 [#S0-033-S5-03]
-== <<S0-033,S0>>&lt;36&gt;::S5
+== <<S0-033,S0&lt;36&gt;>>::S5
 
 === Synopsis
 
@@ -4046,7 +4046,7 @@ struct S5;
 ----
 
 [#S0-033-S5-0f]
-== <<S0-033,S0>>&lt;36&gt;::S5&lt;37&gt;
+== <<S0-033,S0&lt;36&gt;>>::<<S0-0cf-S5,S5>>&lt;37&gt;
 
 === Synopsis
 
@@ -4075,7 +4075,7 @@ struct <<S0-0cf-S5,S5>>&lt;37&gt;;
 |===
 
 [#S0-033-S5-0f-S6]
-== <<S0-033,S0>>&lt;36&gt;::<<S0-033-S5-0f,S5>>&lt;37&gt;::S6
+== <<S0-033,S0&lt;36&gt;>>::<<S0-033-S5-0f,S5&lt;37&gt;>>::S6
 
 === Synopsis
 
@@ -4104,7 +4104,7 @@ struct S6;
 |===
 
 [#S0-033-S5-0f-S6-S7-05]
-== <<S0-033,S0>>&lt;36&gt;::<<S0-033-S5-0f,S5>>&lt;37&gt;::<<S0-033-S5-0f-S6,S6>>::S7
+== <<S0-033,S0&lt;36&gt;>>::<<S0-033-S5-0f,S5&lt;37&gt;>>::<<S0-033-S5-0f-S6,S6>>::S7
 
 === Synopsis
 
@@ -4119,7 +4119,7 @@ struct S7;
 ----
 
 [#S0-033-S5-0f-S6-S7-0d]
-== <<S0-033,S0>>&lt;36&gt;::<<S0-033-S5-0f,S5>>&lt;37&gt;::<<S0-033-S5-0f-S6,S6>>::S7&lt;38&gt;
+== <<S0-033,S0&lt;36&gt;>>::<<S0-033-S5-0f,S5&lt;37&gt;>>::<<S0-033-S5-0f-S6,S6>>::<<S0-0cf-S5-S6-S7,S7>>&lt;38&gt;
 
 === Synopsis
 
@@ -4149,7 +4149,7 @@ struct <<S0-0cf-S5-S6-S7,S7>>&lt;38&gt;;
 |===
 
 [#S0-033-S5-0f-S6-S7-0d-S8]
-== <<S0-033,S0>>&lt;36&gt;::<<S0-033-S5-0f,S5>>&lt;37&gt;::<<S0-033-S5-0f-S6,S6>>::<<S0-033-S5-0f-S6-S7-0d,S7>>&lt;38&gt;::S8
+== <<S0-033,S0&lt;36&gt;>>::<<S0-033-S5-0f,S5&lt;37&gt;>>::<<S0-033-S5-0f-S6,S6>>::<<S0-033-S5-0f-S6-S7-0d,S7&lt;38&gt;>>::S8
 
 === Synopsis
 
@@ -4161,7 +4161,7 @@ struct S8;
 ----
 
 [#S0-033-S5-0f-S6-S7-0d-S9]
-== <<S0-033,S0>>&lt;36&gt;::<<S0-033-S5-0f,S5>>&lt;37&gt;::<<S0-033-S5-0f-S6,S6>>::<<S0-033-S5-0f-S6-S7-0d,S7>>&lt;38&gt;::S9
+== <<S0-033,S0&lt;36&gt;>>::<<S0-033-S5-0f,S5&lt;37&gt;>>::<<S0-033-S5-0f-S6,S6>>::<<S0-033-S5-0f-S6-S7-0d,S7&lt;38&gt;>>::S9
 
 === Synopsis
 
@@ -4186,7 +4186,7 @@ struct S9;
 |===
 
 [#S0-033-S5-0f-S6-S7-0d-f7]
-== <<S0-033,S0>>&lt;36&gt;::<<S0-033-S5-0f,S5>>&lt;37&gt;::<<S0-033-S5-0f-S6,S6>>::<<S0-033-S5-0f-S6-S7-0d,S7>>&lt;38&gt;::f7
+== <<S0-033,S0&lt;36&gt;>>::<<S0-033-S5-0f,S5&lt;37&gt;>>::<<S0-033-S5-0f-S6,S6>>::<<S0-033-S5-0f-S6-S7-0d,S7&lt;38&gt;>>::f7
 
 === Synopsis
 
@@ -4199,7 +4199,7 @@ f7();
 ----
 
 [#S0-033-S5-0f-S6-f6]
-== <<S0-033,S0>>&lt;36&gt;::<<S0-033-S5-0f,S5>>&lt;37&gt;::<<S0-033-S5-0f-S6,S6>>::f6
+== <<S0-033,S0&lt;36&gt;>>::<<S0-033-S5-0f,S5&lt;37&gt;>>::<<S0-033-S5-0f-S6,S6>>::f6
 
 === Synopsis
 
@@ -4212,7 +4212,7 @@ f6();
 ----
 
 [#S0-033-S5-0f-f5]
-== <<S0-033,S0>>&lt;36&gt;::<<S0-033-S5-0f,S5>>&lt;37&gt;::f5
+== <<S0-033,S0&lt;36&gt;>>::<<S0-033-S5-0f,S5&lt;37&gt;>>::f5
 
 === Synopsis
 
@@ -4225,7 +4225,7 @@ f5();
 ----
 
 [#S0-033-f0]
-== <<S0-033,S0>>&lt;36&gt;::f0
+== <<S0-033,S0&lt;36&gt;>>::f0
 
 === Synopsis
 
@@ -4238,7 +4238,7 @@ f0();
 ----
 
 [#S0-06]
-== S0&lt;39&gt;
+== <<S0-0cf,S0>>&lt;39&gt;
 
 === Synopsis
 
@@ -4269,7 +4269,7 @@ struct <<S0-0cf,S0>>&lt;39&gt;;
 |===
 
 [#S0-06-S1]
-== <<S0-06,S0>>&lt;39&gt;::S1
+== <<S0-06,S0&lt;39&gt;>>::S1
 
 === Synopsis
 
@@ -4281,7 +4281,7 @@ struct S1;
 ----
 
 [#S0-06-S5-03]
-== <<S0-06,S0>>&lt;39&gt;::S5
+== <<S0-06,S0&lt;39&gt;>>::S5
 
 === Synopsis
 
@@ -4296,7 +4296,7 @@ struct S5;
 ----
 
 [#S0-06-S5-07]
-== <<S0-06,S0>>&lt;39&gt;::S5&lt;40&gt;
+== <<S0-06,S0&lt;39&gt;>>::<<S0-0cf-S5,S5>>&lt;40&gt;
 
 === Synopsis
 
@@ -4325,7 +4325,7 @@ struct <<S0-0cf-S5,S5>>&lt;40&gt;;
 |===
 
 [#S0-06-S5-07-S6]
-== <<S0-06,S0>>&lt;39&gt;::<<S0-06-S5-07,S5>>&lt;40&gt;::S6
+== <<S0-06,S0&lt;39&gt;>>::<<S0-06-S5-07,S5&lt;40&gt;>>::S6
 
 === Synopsis
 
@@ -4354,7 +4354,7 @@ struct S6;
 |===
 
 [#S0-06-S5-07-S6-S7-08]
-== <<S0-06,S0>>&lt;39&gt;::<<S0-06-S5-07,S5>>&lt;40&gt;::<<S0-06-S5-07-S6,S6>>::S7
+== <<S0-06,S0&lt;39&gt;>>::<<S0-06-S5-07,S5&lt;40&gt;>>::<<S0-06-S5-07-S6,S6>>::S7
 
 === Synopsis
 
@@ -4369,7 +4369,7 @@ struct S7;
 ----
 
 [#S0-06-S5-07-S6-S7-0a]
-== <<S0-06,S0>>&lt;39&gt;::<<S0-06-S5-07,S5>>&lt;40&gt;::<<S0-06-S5-07-S6,S6>>::S7&lt;41&gt;
+== <<S0-06,S0&lt;39&gt;>>::<<S0-06-S5-07,S5&lt;40&gt;>>::<<S0-06-S5-07-S6,S6>>::<<S0-0cf-S5-S6-S7,S7>>&lt;41&gt;
 
 === Synopsis
 
@@ -4401,7 +4401,7 @@ struct <<S0-0cf-S5-S6-S7,S7>>&lt;41&gt;;
 |===
 
 [#S0-06-S5-07-S6-S7-0a-S8]
-== <<S0-06,S0>>&lt;39&gt;::<<S0-06-S5-07,S5>>&lt;40&gt;::<<S0-06-S5-07-S6,S6>>::<<S0-06-S5-07-S6-S7-0a,S7>>&lt;41&gt;::S8
+== <<S0-06,S0&lt;39&gt;>>::<<S0-06-S5-07,S5&lt;40&gt;>>::<<S0-06-S5-07-S6,S6>>::<<S0-06-S5-07-S6-S7-0a,S7&lt;41&gt;>>::S8
 
 === Synopsis
 
@@ -4413,7 +4413,7 @@ struct S8;
 ----
 
 [#S0-06-S5-07-S6-S7-0a-S9-05]
-== <<S0-06,S0>>&lt;39&gt;::<<S0-06-S5-07,S5>>&lt;40&gt;::<<S0-06-S5-07-S6,S6>>::<<S0-06-S5-07-S6-S7-0a,S7>>&lt;41&gt;::S9
+== <<S0-06,S0&lt;39&gt;>>::<<S0-06-S5-07,S5&lt;40&gt;>>::<<S0-06-S5-07-S6,S6>>::<<S0-06-S5-07-S6-S7-0a,S7&lt;41&gt;>>::S9
 
 === Synopsis
 
@@ -4438,7 +4438,7 @@ struct S9;
 |===
 
 [#S0-06-S5-07-S6-S7-0a-S9-08]
-== <<S0-06,S0>>&lt;39&gt;::<<S0-06-S5-07,S5>>&lt;40&gt;::<<S0-06-S5-07-S6,S6>>::<<S0-06-S5-07-S6-S7-0a,S7>>&lt;41&gt;::S9&lt;42, int*&gt;
+== <<S0-06,S0&lt;39&gt;>>::<<S0-06-S5-07,S5&lt;40&gt;>>::<<S0-06-S5-07-S6,S6>>::<<S0-06-S5-07-S6-S7-0a,S7&lt;41&gt;>>::<<S0-0cf-S5-S6-S7-S9,S9>>&lt;42, int*&gt;
 
 === Synopsis
 
@@ -4461,7 +4461,7 @@ struct <<S0-0cf-S5-S6-S7-S9,S9>>&lt;42, int*&gt;;
 |===
 
 [#S0-06-S5-07-S6-S7-0a-S9-00]
-== <<S0-06,S0>>&lt;39&gt;::<<S0-06-S5-07,S5>>&lt;40&gt;::<<S0-06-S5-07-S6,S6>>::<<S0-06-S5-07-S6-S7-0a,S7>>&lt;41&gt;::S9&lt;42, T*&gt;
+== <<S0-06,S0&lt;39&gt;>>::<<S0-06-S5-07,S5&lt;40&gt;>>::<<S0-06-S5-07-S6,S6>>::<<S0-06-S5-07-S6-S7-0a,S7&lt;41&gt;>>::<<S0-0cf-S5-S6-S7-S9,S9>>&lt;42, T*&gt;
 
 === Synopsis
 
@@ -4474,7 +4474,7 @@ struct <<S0-0cf-S5-S6-S7-S9,S9>>&lt;42, T*&gt;;
 ----
 
 [#S0-06-S5-07-S6-S7-0a-f7]
-== <<S0-06,S0>>&lt;39&gt;::<<S0-06-S5-07,S5>>&lt;40&gt;::<<S0-06-S5-07-S6,S6>>::<<S0-06-S5-07-S6-S7-0a,S7>>&lt;41&gt;::f7
+== <<S0-06,S0&lt;39&gt;>>::<<S0-06-S5-07,S5&lt;40&gt;>>::<<S0-06-S5-07-S6,S6>>::<<S0-06-S5-07-S6-S7-0a,S7&lt;41&gt;>>::f7
 
 === Synopsis
 
@@ -4487,7 +4487,7 @@ f7();
 ----
 
 [#S0-06-S5-07-S6-f6]
-== <<S0-06,S0>>&lt;39&gt;::<<S0-06-S5-07,S5>>&lt;40&gt;::<<S0-06-S5-07-S6,S6>>::f6
+== <<S0-06,S0&lt;39&gt;>>::<<S0-06-S5-07,S5&lt;40&gt;>>::<<S0-06-S5-07-S6,S6>>::f6
 
 === Synopsis
 
@@ -4500,7 +4500,7 @@ f6();
 ----
 
 [#S0-06-S5-07-f5]
-== <<S0-06,S0>>&lt;39&gt;::<<S0-06-S5-07,S5>>&lt;40&gt;::f5
+== <<S0-06,S0&lt;39&gt;>>::<<S0-06-S5-07,S5&lt;40&gt;>>::f5
 
 === Synopsis
 
@@ -4513,7 +4513,7 @@ f5();
 ----
 
 [#S0-06-f0]
-== <<S0-06,S0>>&lt;39&gt;::f0
+== <<S0-06,S0&lt;39&gt;>>::f0
 
 === Synopsis
 
@@ -4526,7 +4526,7 @@ f0();
 ----
 
 [#S0-0a1]
-== S0&lt;4&gt;
+== <<S0-0cf,S0>>&lt;4&gt;
 
 === Synopsis
 
@@ -4556,7 +4556,7 @@ struct <<S0-0cf,S0>>&lt;4&gt;;
 |===
 
 [#S0-0a1-S1]
-== <<S0-0a1,S0>>&lt;4&gt;::S1
+== <<S0-0a1,S0&lt;4&gt;>>::S1
 
 === Synopsis
 
@@ -4585,7 +4585,7 @@ struct S1;
 |===
 
 [#S0-0a1-S1-S2-00]
-== <<S0-0a1,S0>>&lt;4&gt;::<<S0-0a1-S1,S1>>::S2
+== <<S0-0a1,S0&lt;4&gt;>>::<<S0-0a1-S1,S1>>::S2
 
 === Synopsis
 
@@ -4600,7 +4600,7 @@ struct S2;
 ----
 
 [#S0-0a1-S1-S2-0f]
-== <<S0-0a1,S0>>&lt;4&gt;::<<S0-0a1-S1,S1>>::S2&lt;5&gt;
+== <<S0-0a1,S0&lt;4&gt;>>::<<S0-0a1-S1,S1>>::<<S0-0cf-S1-S2,S2>>&lt;5&gt;
 
 === Synopsis
 
@@ -4623,7 +4623,7 @@ struct <<S0-0cf-S1-S2,S2>>&lt;5&gt;;
 |===
 
 [#S0-0a1-S1-f1]
-== <<S0-0a1,S0>>&lt;4&gt;::<<S0-0a1-S1,S1>>::f1
+== <<S0-0a1,S0&lt;4&gt;>>::<<S0-0a1-S1,S1>>::f1
 
 === Synopsis
 
@@ -4636,7 +4636,7 @@ f1();
 ----
 
 [#S0-0a1-S5]
-== <<S0-0a1,S0>>&lt;4&gt;::S5
+== <<S0-0a1,S0&lt;4&gt;>>::S5
 
 === Synopsis
 
@@ -4651,7 +4651,7 @@ struct S5;
 ----
 
 [#S0-0a1-f0]
-== <<S0-0a1,S0>>&lt;4&gt;::f0
+== <<S0-0a1,S0&lt;4&gt;>>::f0
 
 === Synopsis
 
@@ -4664,7 +4664,7 @@ f0();
 ----
 
 [#S0-0ba]
-== S0&lt;43&gt;
+== <<S0-0cf,S0>>&lt;43&gt;
 
 === Synopsis
 
@@ -4695,7 +4695,7 @@ struct <<S0-0cf,S0>>&lt;43&gt;;
 |===
 
 [#S0-0ba-S1]
-== <<S0-0ba,S0>>&lt;43&gt;::S1
+== <<S0-0ba,S0&lt;43&gt;>>::S1
 
 === Synopsis
 
@@ -4707,7 +4707,7 @@ struct S1;
 ----
 
 [#S0-0ba-S5-0f]
-== <<S0-0ba,S0>>&lt;43&gt;::S5
+== <<S0-0ba,S0&lt;43&gt;>>::S5
 
 === Synopsis
 
@@ -4722,7 +4722,7 @@ struct S5;
 ----
 
 [#S0-0ba-S5-08]
-== <<S0-0ba,S0>>&lt;43&gt;::S5&lt;44&gt;
+== <<S0-0ba,S0&lt;43&gt;>>::<<S0-0cf-S5,S5>>&lt;44&gt;
 
 === Synopsis
 
@@ -4751,7 +4751,7 @@ struct <<S0-0cf-S5,S5>>&lt;44&gt;;
 |===
 
 [#S0-0ba-S5-08-S6]
-== <<S0-0ba,S0>>&lt;43&gt;::<<S0-0ba-S5-08,S5>>&lt;44&gt;::S6
+== <<S0-0ba,S0&lt;43&gt;>>::<<S0-0ba-S5-08,S5&lt;44&gt;>>::S6
 
 === Synopsis
 
@@ -4780,7 +4780,7 @@ struct S6;
 |===
 
 [#S0-0ba-S5-08-S6-S7-04]
-== <<S0-0ba,S0>>&lt;43&gt;::<<S0-0ba-S5-08,S5>>&lt;44&gt;::<<S0-0ba-S5-08-S6,S6>>::S7
+== <<S0-0ba,S0&lt;43&gt;>>::<<S0-0ba-S5-08,S5&lt;44&gt;>>::<<S0-0ba-S5-08-S6,S6>>::S7
 
 === Synopsis
 
@@ -4795,7 +4795,7 @@ struct S7;
 ----
 
 [#S0-0ba-S5-08-S6-S7-02]
-== <<S0-0ba,S0>>&lt;43&gt;::<<S0-0ba-S5-08,S5>>&lt;44&gt;::<<S0-0ba-S5-08-S6,S6>>::S7&lt;45&gt;
+== <<S0-0ba,S0&lt;43&gt;>>::<<S0-0ba-S5-08,S5&lt;44&gt;>>::<<S0-0ba-S5-08-S6,S6>>::<<S0-0cf-S5-S6-S7,S7>>&lt;45&gt;
 
 === Synopsis
 
@@ -4826,7 +4826,7 @@ struct <<S0-0cf-S5-S6-S7,S7>>&lt;45&gt;;
 |===
 
 [#S0-0ba-S5-08-S6-S7-02-S8]
-== <<S0-0ba,S0>>&lt;43&gt;::<<S0-0ba-S5-08,S5>>&lt;44&gt;::<<S0-0ba-S5-08-S6,S6>>::<<S0-0ba-S5-08-S6-S7-02,S7>>&lt;45&gt;::S8
+== <<S0-0ba,S0&lt;43&gt;>>::<<S0-0ba-S5-08,S5&lt;44&gt;>>::<<S0-0ba-S5-08-S6,S6>>::<<S0-0ba-S5-08-S6-S7-02,S7&lt;45&gt;>>::S8
 
 === Synopsis
 
@@ -4838,7 +4838,7 @@ struct S8;
 ----
 
 [#S0-0ba-S5-08-S6-S7-02-S9-0b]
-== <<S0-0ba,S0>>&lt;43&gt;::<<S0-0ba-S5-08,S5>>&lt;44&gt;::<<S0-0ba-S5-08-S6,S6>>::<<S0-0ba-S5-08-S6-S7-02,S7>>&lt;45&gt;::S9
+== <<S0-0ba,S0&lt;43&gt;>>::<<S0-0ba-S5-08,S5&lt;44&gt;>>::<<S0-0ba-S5-08-S6,S6>>::<<S0-0ba-S5-08-S6-S7-02,S7&lt;45&gt;>>::S9
 
 === Synopsis
 
@@ -4853,7 +4853,7 @@ struct S9;
 ----
 
 [#S0-0ba-S5-08-S6-S7-02-S9-0f]
-== <<S0-0ba,S0>>&lt;43&gt;::<<S0-0ba-S5-08,S5>>&lt;44&gt;::<<S0-0ba-S5-08-S6,S6>>::<<S0-0ba-S5-08-S6-S7-02,S7>>&lt;45&gt;::S9&lt;46&gt;
+== <<S0-0ba,S0&lt;43&gt;>>::<<S0-0ba-S5-08,S5&lt;44&gt;>>::<<S0-0ba-S5-08-S6,S6>>::<<S0-0ba-S5-08-S6-S7-02,S7&lt;45&gt;>>::<<S0-0cf-S5-S6-S7-S9,S9>>&lt;46&gt;
 
 === Synopsis
 
@@ -4876,7 +4876,7 @@ struct <<S0-0cf-S5-S6-S7-S9,S9>>&lt;46&gt;;
 |===
 
 [#S0-0ba-S5-08-S6-S7-02-f7]
-== <<S0-0ba,S0>>&lt;43&gt;::<<S0-0ba-S5-08,S5>>&lt;44&gt;::<<S0-0ba-S5-08-S6,S6>>::<<S0-0ba-S5-08-S6-S7-02,S7>>&lt;45&gt;::f7
+== <<S0-0ba,S0&lt;43&gt;>>::<<S0-0ba-S5-08,S5&lt;44&gt;>>::<<S0-0ba-S5-08-S6,S6>>::<<S0-0ba-S5-08-S6-S7-02,S7&lt;45&gt;>>::f7
 
 === Synopsis
 
@@ -4889,7 +4889,7 @@ f7();
 ----
 
 [#S0-0ba-S5-08-S6-f6]
-== <<S0-0ba,S0>>&lt;43&gt;::<<S0-0ba-S5-08,S5>>&lt;44&gt;::<<S0-0ba-S5-08-S6,S6>>::f6
+== <<S0-0ba,S0&lt;43&gt;>>::<<S0-0ba-S5-08,S5&lt;44&gt;>>::<<S0-0ba-S5-08-S6,S6>>::f6
 
 === Synopsis
 
@@ -4902,7 +4902,7 @@ f6();
 ----
 
 [#S0-0ba-S5-08-f5]
-== <<S0-0ba,S0>>&lt;43&gt;::<<S0-0ba-S5-08,S5>>&lt;44&gt;::f5
+== <<S0-0ba,S0&lt;43&gt;>>::<<S0-0ba-S5-08,S5&lt;44&gt;>>::f5
 
 === Synopsis
 
@@ -4915,7 +4915,7 @@ f5();
 ----
 
 [#S0-0ba-f0]
-== <<S0-0ba,S0>>&lt;43&gt;::f0
+== <<S0-0ba,S0&lt;43&gt;>>::f0
 
 === Synopsis
 
@@ -4928,7 +4928,7 @@ f0();
 ----
 
 [#S0-07e]
-== S0&lt;6&gt;
+== <<S0-0cf,S0>>&lt;6&gt;
 
 === Synopsis
 
@@ -4958,7 +4958,7 @@ struct <<S0-0cf,S0>>&lt;6&gt;;
 |===
 
 [#S0-07e-S1]
-== <<S0-07e,S0>>&lt;6&gt;::S1
+== <<S0-07e,S0&lt;6&gt;>>::S1
 
 === Synopsis
 
@@ -4988,7 +4988,7 @@ struct S1;
 |===
 
 [#S0-07e-S1-S2-04]
-== <<S0-07e,S0>>&lt;6&gt;::<<S0-07e-S1,S1>>::S2
+== <<S0-07e,S0&lt;6&gt;>>::<<S0-07e-S1,S1>>::S2
 
 === Synopsis
 
@@ -5013,7 +5013,7 @@ struct S2;
 |===
 
 [#S0-07e-S1-S2-07]
-== <<S0-07e,S0>>&lt;6&gt;::<<S0-07e-S1,S1>>::S2&lt;7, int*&gt;
+== <<S0-07e,S0&lt;6&gt;>>::<<S0-07e-S1,S1>>::<<S0-0cf-S1-S2,S2>>&lt;7, int*&gt;
 
 === Synopsis
 
@@ -5036,7 +5036,7 @@ struct <<S0-0cf-S1-S2,S2>>&lt;7, int*&gt;;
 |===
 
 [#S0-07e-S1-S2-06]
-== <<S0-07e,S0>>&lt;6&gt;::<<S0-07e-S1,S1>>::S2&lt;7, T*&gt;
+== <<S0-07e,S0&lt;6&gt;>>::<<S0-07e-S1,S1>>::<<S0-0cf-S1-S2,S2>>&lt;7, T*&gt;
 
 === Synopsis
 
@@ -5049,7 +5049,7 @@ struct <<S0-0cf-S1-S2,S2>>&lt;7, T*&gt;;
 ----
 
 [#S0-07e-S1-f1]
-== <<S0-07e,S0>>&lt;6&gt;::<<S0-07e-S1,S1>>::f1
+== <<S0-07e,S0&lt;6&gt;>>::<<S0-07e-S1,S1>>::f1
 
 === Synopsis
 
@@ -5062,7 +5062,7 @@ f1();
 ----
 
 [#S0-07e-S5]
-== <<S0-07e,S0>>&lt;6&gt;::S5
+== <<S0-07e,S0&lt;6&gt;>>::S5
 
 === Synopsis
 
@@ -5077,7 +5077,7 @@ struct S5;
 ----
 
 [#S0-07e-f0]
-== <<S0-07e,S0>>&lt;6&gt;::f0
+== <<S0-07e,S0&lt;6&gt;>>::f0
 
 === Synopsis
 
@@ -5090,7 +5090,7 @@ f0();
 ----
 
 [#S0-0a3]
-== S0&lt;8&gt;
+== <<S0-0cf,S0>>&lt;8&gt;
 
 === Synopsis
 
@@ -5120,7 +5120,7 @@ struct <<S0-0cf,S0>>&lt;8&gt;;
 |===
 
 [#S0-0a3-S1]
-== <<S0-0a3,S0>>&lt;8&gt;::S1
+== <<S0-0a3,S0&lt;8&gt;>>::S1
 
 === Synopsis
 
@@ -5149,7 +5149,7 @@ struct S1;
 |===
 
 [#S0-0a3-S1-S2-0b]
-== <<S0-0a3,S0>>&lt;8&gt;::<<S0-0a3-S1,S1>>::S2
+== <<S0-0a3,S0&lt;8&gt;>>::<<S0-0a3-S1,S1>>::S2
 
 === Synopsis
 
@@ -5164,7 +5164,7 @@ struct S2;
 ----
 
 [#S0-0a3-S1-S2-0c]
-== <<S0-0a3,S0>>&lt;8&gt;::<<S0-0a3-S1,S1>>::S2&lt;9&gt;
+== <<S0-0a3,S0&lt;8&gt;>>::<<S0-0a3-S1,S1>>::<<S0-0cf-S1-S2,S2>>&lt;9&gt;
 
 === Synopsis
 
@@ -5194,7 +5194,7 @@ struct <<S0-0cf-S1-S2,S2>>&lt;9&gt;;
 |===
 
 [#S0-0a3-S1-S2-0c-S3]
-== <<S0-0a3,S0>>&lt;8&gt;::<<S0-0a3-S1,S1>>::<<S0-0a3-S1-S2-0c,S2>>&lt;9&gt;::S3
+== <<S0-0a3,S0&lt;8&gt;>>::<<S0-0a3-S1,S1>>::<<S0-0a3-S1-S2-0c,S2&lt;9&gt;>>::S3
 
 === Synopsis
 
@@ -5216,7 +5216,7 @@ struct S3;
 |===
 
 [#S0-0a3-S1-S2-0c-S4]
-== <<S0-0a3,S0>>&lt;8&gt;::<<S0-0a3-S1,S1>>::<<S0-0a3-S1-S2-0c,S2>>&lt;9&gt;::S4
+== <<S0-0a3,S0&lt;8&gt;>>::<<S0-0a3-S1,S1>>::<<S0-0a3-S1-S2-0c,S2&lt;9&gt;>>::S4
 
 === Synopsis
 
@@ -5231,7 +5231,7 @@ struct S4;
 ----
 
 [#S0-0a3-S1-S2-0c-f2]
-== <<S0-0a3,S0>>&lt;8&gt;::<<S0-0a3-S1,S1>>::<<S0-0a3-S1-S2-0c,S2>>&lt;9&gt;::f2
+== <<S0-0a3,S0&lt;8&gt;>>::<<S0-0a3-S1,S1>>::<<S0-0a3-S1-S2-0c,S2&lt;9&gt;>>::f2
 
 === Synopsis
 
@@ -5244,7 +5244,7 @@ f2();
 ----
 
 [#S0-0a3-S1-f1]
-== <<S0-0a3,S0>>&lt;8&gt;::<<S0-0a3-S1,S1>>::f1
+== <<S0-0a3,S0&lt;8&gt;>>::<<S0-0a3-S1,S1>>::f1
 
 === Synopsis
 
@@ -5257,7 +5257,7 @@ f1();
 ----
 
 [#S0-0a3-S5]
-== <<S0-0a3,S0>>&lt;8&gt;::S5
+== <<S0-0a3,S0&lt;8&gt;>>::S5
 
 === Synopsis
 
@@ -5272,7 +5272,7 @@ struct S5;
 ----
 
 [#S0-0a3-f0]
-== <<S0-0a3,S0>>&lt;8&gt;::f0
+== <<S0-0a3,S0&lt;8&gt;>>::f0
 
 === Synopsis
 
@@ -5285,7 +5285,7 @@ f0();
 ----
 
 [#S0-020a]
-== S0&lt;1, int*&gt;
+== <<S0-0cf,S0>>&lt;1, int*&gt;
 
 === Synopsis
 
@@ -5308,7 +5308,7 @@ struct <<S0-0cf,S0>>&lt;1, int*&gt;;
 |===
 
 [#S0-05a]
-== S0&lt;10, bool&gt;
+== <<S0-0cf,S0>>&lt;10, bool&gt;
 
 === Synopsis
 
@@ -5338,7 +5338,7 @@ struct <<S0-0cf,S0>>&lt;10, bool&gt;;
 |===
 
 [#S0-05a-S1]
-== <<S0-05a,S0>>&lt;10, bool&gt;::S1
+== <<S0-05a,S0&lt;10, bool&gt;>>::S1
 
 === Synopsis
 
@@ -5367,7 +5367,7 @@ struct S1;
 |===
 
 [#S0-05a-S1-S2-07]
-== <<S0-05a,S0>>&lt;10, bool&gt;::<<S0-05a-S1,S1>>::S2
+== <<S0-05a,S0&lt;10, bool&gt;>>::<<S0-05a-S1,S1>>::S2
 
 === Synopsis
 
@@ -5382,7 +5382,7 @@ struct S2;
 ----
 
 [#S0-05a-S1-S2-0b]
-== <<S0-05a,S0>>&lt;10, bool&gt;::<<S0-05a-S1,S1>>::S2&lt;11, bool&gt;
+== <<S0-05a,S0&lt;10, bool&gt;>>::<<S0-05a-S1,S1>>::<<S0-0cf-S1-S2,S2>>&lt;11, bool&gt;
 
 === Synopsis
 
@@ -5411,7 +5411,7 @@ struct <<S0-0cf-S1-S2,S2>>&lt;11, bool&gt;;
 |===
 
 [#S0-05a-S1-S2-0b-S3]
-== <<S0-05a,S0>>&lt;10, bool&gt;::<<S0-05a-S1,S1>>::<<S0-05a-S1-S2-0b,S2>>&lt;11, bool&gt;::S3
+== <<S0-05a,S0&lt;10, bool&gt;>>::<<S0-05a-S1,S1>>::<<S0-05a-S1-S2-0b,S2&lt;11, bool&gt;>>::S3
 
 === Synopsis
 
@@ -5423,7 +5423,7 @@ struct S3;
 ----
 
 [#S0-05a-S1-S2-0b-f2]
-== <<S0-05a,S0>>&lt;10, bool&gt;::<<S0-05a-S1,S1>>::<<S0-05a-S1-S2-0b,S2>>&lt;11, bool&gt;::f2
+== <<S0-05a,S0&lt;10, bool&gt;>>::<<S0-05a-S1,S1>>::<<S0-05a-S1-S2-0b,S2&lt;11, bool&gt;>>::f2
 
 === Synopsis
 
@@ -5436,7 +5436,7 @@ f2();
 ----
 
 [#S0-05a-S1-f1]
-== <<S0-05a,S0>>&lt;10, bool&gt;::<<S0-05a-S1,S1>>::f1
+== <<S0-05a,S0&lt;10, bool&gt;>>::<<S0-05a-S1,S1>>::f1
 
 === Synopsis
 
@@ -5449,7 +5449,7 @@ f1();
 ----
 
 [#S0-05a-S5]
-== <<S0-05a,S0>>&lt;10, bool&gt;::S5
+== <<S0-05a,S0&lt;10, bool&gt;>>::S5
 
 === Synopsis
 
@@ -5464,7 +5464,7 @@ struct S5;
 ----
 
 [#S0-05a-f0]
-== <<S0-05a,S0>>&lt;10, bool&gt;::f0
+== <<S0-05a,S0&lt;10, bool&gt;>>::f0
 
 === Synopsis
 
@@ -5477,7 +5477,7 @@ f0();
 ----
 
 [#S0-0cd]
-== S0&lt;12, bool&gt;
+== <<S0-0cf,S0>>&lt;12, bool&gt;
 
 === Synopsis
 
@@ -5507,7 +5507,7 @@ struct <<S0-0cf,S0>>&lt;12, bool&gt;;
 |===
 
 [#S0-0cd-S1]
-== <<S0-0cd,S0>>&lt;12, bool&gt;::S1
+== <<S0-0cd,S0&lt;12, bool&gt;>>::S1
 
 === Synopsis
 
@@ -5536,7 +5536,7 @@ struct S1;
 |===
 
 [#S0-0cd-S1-S2-0e]
-== <<S0-0cd,S0>>&lt;12, bool&gt;::<<S0-0cd-S1,S1>>::S2
+== <<S0-0cd,S0&lt;12, bool&gt;>>::<<S0-0cd-S1,S1>>::S2
 
 === Synopsis
 
@@ -5551,7 +5551,7 @@ struct S2;
 ----
 
 [#S0-0cd-S1-S2-05]
-== <<S0-0cd,S0>>&lt;12, bool&gt;::<<S0-0cd-S1,S1>>::S2&lt;13, bool&gt;
+== <<S0-0cd,S0&lt;12, bool&gt;>>::<<S0-0cd-S1,S1>>::<<S0-0cf-S1-S2,S2>>&lt;13, bool&gt;
 
 === Synopsis
 
@@ -5580,7 +5580,7 @@ struct <<S0-0cf-S1-S2,S2>>&lt;13, bool&gt;;
 |===
 
 [#S0-0cd-S1-S2-05-S3]
-== <<S0-0cd,S0>>&lt;12, bool&gt;::<<S0-0cd-S1,S1>>::<<S0-0cd-S1-S2-05,S2>>&lt;13, bool&gt;::S3
+== <<S0-0cd,S0&lt;12, bool&gt;>>::<<S0-0cd-S1,S1>>::<<S0-0cd-S1-S2-05,S2&lt;13, bool&gt;>>::S3
 
 === Synopsis
 
@@ -5592,7 +5592,7 @@ struct S3;
 ----
 
 [#S0-0cd-S1-S2-05-f2]
-== <<S0-0cd,S0>>&lt;12, bool&gt;::<<S0-0cd-S1,S1>>::<<S0-0cd-S1-S2-05,S2>>&lt;13, bool&gt;::f2
+== <<S0-0cd,S0&lt;12, bool&gt;>>::<<S0-0cd-S1,S1>>::<<S0-0cd-S1-S2-05,S2&lt;13, bool&gt;>>::f2
 
 === Synopsis
 
@@ -5605,7 +5605,7 @@ f2();
 ----
 
 [#S0-0cd-S1-f1]
-== <<S0-0cd,S0>>&lt;12, bool&gt;::<<S0-0cd-S1,S1>>::f1
+== <<S0-0cd,S0&lt;12, bool&gt;>>::<<S0-0cd-S1,S1>>::f1
 
 === Synopsis
 
@@ -5618,7 +5618,7 @@ f1();
 ----
 
 [#S0-0cd-S5]
-== <<S0-0cd,S0>>&lt;12, bool&gt;::S5
+== <<S0-0cd,S0&lt;12, bool&gt;>>::S5
 
 === Synopsis
 
@@ -5633,7 +5633,7 @@ struct S5;
 ----
 
 [#S0-0cd-f0]
-== <<S0-0cd,S0>>&lt;12, bool&gt;::f0
+== <<S0-0cd,S0&lt;12, bool&gt;>>::f0
 
 === Synopsis
 
@@ -5646,7 +5646,7 @@ f0();
 ----
 
 [#S0-000]
-== S0&lt;15, bool&gt;
+== <<S0-0cf,S0>>&lt;15, bool&gt;
 
 === Synopsis
 
@@ -5676,7 +5676,7 @@ struct <<S0-0cf,S0>>&lt;15, bool&gt;;
 |===
 
 [#S0-000-S1]
-== <<S0-000,S0>>&lt;15, bool&gt;::S1
+== <<S0-000,S0&lt;15, bool&gt;>>::S1
 
 === Synopsis
 
@@ -5705,7 +5705,7 @@ struct S1;
 |===
 
 [#S0-000-S1-S2-08]
-== <<S0-000,S0>>&lt;15, bool&gt;::<<S0-000-S1,S1>>::S2
+== <<S0-000,S0&lt;15, bool&gt;>>::<<S0-000-S1,S1>>::S2
 
 === Synopsis
 
@@ -5720,7 +5720,7 @@ struct S2;
 ----
 
 [#S0-000-S1-S2-03]
-== <<S0-000,S0>>&lt;15, bool&gt;::<<S0-000-S1,S1>>::S2&lt;16, bool&gt;
+== <<S0-000,S0&lt;15, bool&gt;>>::<<S0-000-S1,S1>>::<<S0-0cf-S1-S2,S2>>&lt;16, bool&gt;
 
 === Synopsis
 
@@ -5749,7 +5749,7 @@ struct <<S0-0cf-S1-S2,S2>>&lt;16, bool&gt;;
 |===
 
 [#S0-000-S1-S2-03-S3]
-== <<S0-000,S0>>&lt;15, bool&gt;::<<S0-000-S1,S1>>::<<S0-000-S1-S2-03,S2>>&lt;16, bool&gt;::S3
+== <<S0-000,S0&lt;15, bool&gt;>>::<<S0-000-S1,S1>>::<<S0-000-S1-S2-03,S2&lt;16, bool&gt;>>::S3
 
 === Synopsis
 
@@ -5761,7 +5761,7 @@ struct S3;
 ----
 
 [#S0-000-S1-S2-03-f2]
-== <<S0-000,S0>>&lt;15, bool&gt;::<<S0-000-S1,S1>>::<<S0-000-S1-S2-03,S2>>&lt;16, bool&gt;::f2
+== <<S0-000,S0&lt;15, bool&gt;>>::<<S0-000-S1,S1>>::<<S0-000-S1-S2-03,S2&lt;16, bool&gt;>>::f2
 
 === Synopsis
 
@@ -5774,7 +5774,7 @@ f2();
 ----
 
 [#S0-000-S1-f1]
-== <<S0-000,S0>>&lt;15, bool&gt;::<<S0-000-S1,S1>>::f1
+== <<S0-000,S0&lt;15, bool&gt;>>::<<S0-000-S1,S1>>::f1
 
 === Synopsis
 
@@ -5787,7 +5787,7 @@ f1();
 ----
 
 [#S0-000-S5]
-== <<S0-000,S0>>&lt;15, bool&gt;::S5
+== <<S0-000,S0&lt;15, bool&gt;>>::S5
 
 === Synopsis
 
@@ -5802,7 +5802,7 @@ struct S5;
 ----
 
 [#S0-000-f0]
-== <<S0-000,S0>>&lt;15, bool&gt;::f0
+== <<S0-000,S0&lt;15, bool&gt;>>::f0
 
 === Synopsis
 
@@ -5815,7 +5815,7 @@ f0();
 ----
 
 [#S0-051]
-== S0&lt;18, bool&gt;
+== <<S0-0cf,S0>>&lt;18, bool&gt;
 
 === Synopsis
 
@@ -5844,7 +5844,7 @@ struct <<S0-0cf,S0>>&lt;18, bool&gt;;
 |===
 
 [#S0-051-S1]
-== <<S0-051,S0>>&lt;18, bool&gt;::S1
+== <<S0-051,S0&lt;18, bool&gt;>>::S1
 
 === Synopsis
 
@@ -5856,7 +5856,7 @@ struct S1;
 ----
 
 [#S0-051-f0]
-== <<S0-051,S0>>&lt;18, bool&gt;::f0
+== <<S0-051,S0&lt;18, bool&gt;>>::f0
 
 === Synopsis
 
@@ -5869,7 +5869,7 @@ f0();
 ----
 
 [#S0-002]
-== S0&lt;19, bool&gt;
+== <<S0-0cf,S0>>&lt;19, bool&gt;
 
 === Synopsis
 
@@ -5898,7 +5898,7 @@ struct <<S0-0cf,S0>>&lt;19, bool&gt;;
 |===
 
 [#S0-002-S1]
-== <<S0-002,S0>>&lt;19, bool&gt;::S1
+== <<S0-002,S0&lt;19, bool&gt;>>::S1
 
 === Synopsis
 
@@ -5910,7 +5910,7 @@ struct S1;
 ----
 
 [#S0-002-f0]
-== <<S0-002,S0>>&lt;19, bool&gt;::f0
+== <<S0-002,S0&lt;19, bool&gt;>>::f0
 
 === Synopsis
 
@@ -5923,7 +5923,7 @@ f0();
 ----
 
 [#S0-03c]
-== S0&lt;2, bool&gt;
+== <<S0-0cf,S0>>&lt;2, bool&gt;
 
 === Synopsis
 
@@ -5952,7 +5952,7 @@ struct <<S0-0cf,S0>>&lt;2, bool&gt;;
 |===
 
 [#S0-03c-S5]
-== <<S0-03c,S0>>&lt;2, bool&gt;::S5
+== <<S0-03c,S0&lt;2, bool&gt;>>::S5
 
 === Synopsis
 
@@ -5967,7 +5967,7 @@ struct S5;
 ----
 
 [#S0-03c-f0]
-== <<S0-03c,S0>>&lt;2, bool&gt;::f0
+== <<S0-03c,S0&lt;2, bool&gt;>>::f0
 
 === Synopsis
 
@@ -5980,7 +5980,7 @@ f0();
 ----
 
 [#S0-003]
-== S0&lt;21, bool&gt;
+== <<S0-0cf,S0>>&lt;21, bool&gt;
 
 === Synopsis
 
@@ -6009,7 +6009,7 @@ struct <<S0-0cf,S0>>&lt;21, bool&gt;;
 |===
 
 [#S0-003-S1]
-== <<S0-003,S0>>&lt;21, bool&gt;::S1
+== <<S0-003,S0&lt;21, bool&gt;>>::S1
 
 === Synopsis
 
@@ -6021,7 +6021,7 @@ struct S1;
 ----
 
 [#S0-003-f0]
-== <<S0-003,S0>>&lt;21, bool&gt;::f0
+== <<S0-003,S0&lt;21, bool&gt;>>::f0
 
 === Synopsis
 
@@ -6034,7 +6034,7 @@ f0();
 ----
 
 [#S0-0c7]
-== S0&lt;23, bool&gt;
+== <<S0-0cf,S0>>&lt;23, bool&gt;
 
 === Synopsis
 
@@ -6065,7 +6065,7 @@ struct <<S0-0cf,S0>>&lt;23, bool&gt;;
 |===
 
 [#S0-0c7-S1]
-== <<S0-0c7,S0>>&lt;23, bool&gt;::S1
+== <<S0-0c7,S0&lt;23, bool&gt;>>::S1
 
 === Synopsis
 
@@ -6077,7 +6077,7 @@ struct S1;
 ----
 
 [#S0-0c7-S5-03]
-== <<S0-0c7,S0>>&lt;23, bool&gt;::S5
+== <<S0-0c7,S0&lt;23, bool&gt;>>::S5
 
 === Synopsis
 
@@ -6092,7 +6092,7 @@ struct S5;
 ----
 
 [#S0-0c7-S5-0f]
-== <<S0-0c7,S0>>&lt;23, bool&gt;::S5&lt;24, bool&gt;
+== <<S0-0c7,S0&lt;23, bool&gt;>>::<<S0-0cf-S5,S5>>&lt;24, bool&gt;
 
 === Synopsis
 
@@ -6113,7 +6113,7 @@ struct <<S0-0cf-S5,S5>>&lt;24, bool&gt;;
 |===
 
 [#S0-0c7-S5-0f-f5]
-== <<S0-0c7,S0>>&lt;23, bool&gt;::<<S0-0c7-S5-0f,S5>>&lt;24, bool&gt;::f5
+== <<S0-0c7,S0&lt;23, bool&gt;>>::<<S0-0c7-S5-0f,S5&lt;24, bool&gt;>>::f5
 
 === Synopsis
 
@@ -6126,7 +6126,7 @@ f5();
 ----
 
 [#S0-0c7-f0]
-== <<S0-0c7,S0>>&lt;23, bool&gt;::f0
+== <<S0-0c7,S0&lt;23, bool&gt;>>::f0
 
 === Synopsis
 
@@ -6139,7 +6139,7 @@ f0();
 ----
 
 [#S0-0529f]
-== S0&lt;25, bool&gt;
+== <<S0-0cf,S0>>&lt;25, bool&gt;
 
 === Synopsis
 
@@ -6170,7 +6170,7 @@ struct <<S0-0cf,S0>>&lt;25, bool&gt;;
 |===
 
 [#S0-0529f-S1]
-== <<S0-0529f,S0>>&lt;25, bool&gt;::S1
+== <<S0-0529f,S0&lt;25, bool&gt;>>::S1
 
 === Synopsis
 
@@ -6182,7 +6182,7 @@ struct S1;
 ----
 
 [#S0-0529f-S5-051]
-== <<S0-0529f,S0>>&lt;25, bool&gt;::S5
+== <<S0-0529f,S0&lt;25, bool&gt;>>::S5
 
 === Synopsis
 
@@ -6197,7 +6197,7 @@ struct S5;
 ----
 
 [#S0-0529f-S5-05c]
-== <<S0-0529f,S0>>&lt;25, bool&gt;::S5&lt;26, bool&gt;
+== <<S0-0529f,S0&lt;25, bool&gt;>>::<<S0-0cf-S5,S5>>&lt;26, bool&gt;
 
 === Synopsis
 
@@ -6226,7 +6226,7 @@ struct <<S0-0cf-S5,S5>>&lt;26, bool&gt;;
 |===
 
 [#S0-0529f-S5-05c-S6]
-== <<S0-0529f,S0>>&lt;25, bool&gt;::<<S0-0529f-S5-05c,S5>>&lt;26, bool&gt;::S6
+== <<S0-0529f,S0&lt;25, bool&gt;>>::<<S0-0529f-S5-05c,S5&lt;26, bool&gt;>>::S6
 
 === Synopsis
 
@@ -6246,7 +6246,7 @@ struct S6;
 |===
 
 [#S0-0529f-S5-05c-S6-f6]
-== <<S0-0529f,S0>>&lt;25, bool&gt;::<<S0-0529f-S5-05c,S5>>&lt;26, bool&gt;::<<S0-0529f-S5-05c-S6,S6>>::f6
+== <<S0-0529f,S0&lt;25, bool&gt;>>::<<S0-0529f-S5-05c,S5&lt;26, bool&gt;>>::<<S0-0529f-S5-05c-S6,S6>>::f6
 
 === Synopsis
 
@@ -6259,7 +6259,7 @@ f6();
 ----
 
 [#S0-0529f-S5-05c-f5]
-== <<S0-0529f,S0>>&lt;25, bool&gt;::<<S0-0529f-S5-05c,S5>>&lt;26, bool&gt;::f5
+== <<S0-0529f,S0&lt;25, bool&gt;>>::<<S0-0529f-S5-05c,S5&lt;26, bool&gt;>>::f5
 
 === Synopsis
 
@@ -6272,7 +6272,7 @@ f5();
 ----
 
 [#S0-0529f-f0]
-== <<S0-0529f,S0>>&lt;25, bool&gt;::f0
+== <<S0-0529f,S0&lt;25, bool&gt;>>::f0
 
 === Synopsis
 
@@ -6285,7 +6285,7 @@ f0();
 ----
 
 [#S0-007]
-== S0&lt;27, bool&gt;
+== <<S0-0cf,S0>>&lt;27, bool&gt;
 
 === Synopsis
 
@@ -6316,7 +6316,7 @@ struct <<S0-0cf,S0>>&lt;27, bool&gt;;
 |===
 
 [#S0-007-S1]
-== <<S0-007,S0>>&lt;27, bool&gt;::S1
+== <<S0-007,S0&lt;27, bool&gt;>>::S1
 
 === Synopsis
 
@@ -6328,7 +6328,7 @@ struct S1;
 ----
 
 [#S0-007-S5-0f]
-== <<S0-007,S0>>&lt;27, bool&gt;::S5
+== <<S0-007,S0&lt;27, bool&gt;>>::S5
 
 === Synopsis
 
@@ -6343,7 +6343,7 @@ struct S5;
 ----
 
 [#S0-007-S5-0d]
-== <<S0-007,S0>>&lt;27, bool&gt;::S5&lt;28, bool&gt;
+== <<S0-007,S0&lt;27, bool&gt;>>::<<S0-0cf-S5,S5>>&lt;28, bool&gt;
 
 === Synopsis
 
@@ -6372,7 +6372,7 @@ struct <<S0-0cf-S5,S5>>&lt;28, bool&gt;;
 |===
 
 [#S0-007-S5-0d-S6]
-== <<S0-007,S0>>&lt;27, bool&gt;::<<S0-007-S5-0d,S5>>&lt;28, bool&gt;::S6
+== <<S0-007,S0&lt;27, bool&gt;>>::<<S0-007-S5-0d,S5&lt;28, bool&gt;>>::S6
 
 === Synopsis
 
@@ -6392,7 +6392,7 @@ struct S6;
 |===
 
 [#S0-007-S5-0d-S6-f6]
-== <<S0-007,S0>>&lt;27, bool&gt;::<<S0-007-S5-0d,S5>>&lt;28, bool&gt;::<<S0-007-S5-0d-S6,S6>>::f6
+== <<S0-007,S0&lt;27, bool&gt;>>::<<S0-007-S5-0d,S5&lt;28, bool&gt;>>::<<S0-007-S5-0d-S6,S6>>::f6
 
 === Synopsis
 
@@ -6405,7 +6405,7 @@ f6();
 ----
 
 [#S0-007-S5-0d-f5]
-== <<S0-007,S0>>&lt;27, bool&gt;::<<S0-007-S5-0d,S5>>&lt;28, bool&gt;::f5
+== <<S0-007,S0&lt;27, bool&gt;>>::<<S0-007-S5-0d,S5&lt;28, bool&gt;>>::f5
 
 === Synopsis
 
@@ -6418,7 +6418,7 @@ f5();
 ----
 
 [#S0-007-f0]
-== <<S0-007,S0>>&lt;27, bool&gt;::f0
+== <<S0-007,S0&lt;27, bool&gt;>>::f0
 
 === Synopsis
 
@@ -6431,7 +6431,7 @@ f0();
 ----
 
 [#S0-092]
-== S0&lt;3, bool&gt;
+== <<S0-0cf,S0>>&lt;3, bool&gt;
 
 === Synopsis
 
@@ -6461,7 +6461,7 @@ struct <<S0-0cf,S0>>&lt;3, bool&gt;;
 |===
 
 [#S0-092-S1]
-== <<S0-092,S0>>&lt;3, bool&gt;::S1
+== <<S0-092,S0&lt;3, bool&gt;>>::S1
 
 === Synopsis
 
@@ -6481,7 +6481,7 @@ struct S1;
 |===
 
 [#S0-092-S1-f1]
-== <<S0-092,S0>>&lt;3, bool&gt;::<<S0-092-S1,S1>>::f1
+== <<S0-092,S0&lt;3, bool&gt;>>::<<S0-092-S1,S1>>::f1
 
 === Synopsis
 
@@ -6494,7 +6494,7 @@ f1();
 ----
 
 [#S0-092-S5]
-== <<S0-092,S0>>&lt;3, bool&gt;::S5
+== <<S0-092,S0&lt;3, bool&gt;>>::S5
 
 === Synopsis
 
@@ -6509,7 +6509,7 @@ struct S5;
 ----
 
 [#S0-092-f0]
-== <<S0-092,S0>>&lt;3, bool&gt;::f0
+== <<S0-092,S0&lt;3, bool&gt;>>::f0
 
 === Synopsis
 
@@ -6522,7 +6522,7 @@ f0();
 ----
 
 [#S0-021]
-== S0&lt;30, bool&gt;
+== <<S0-0cf,S0>>&lt;30, bool&gt;
 
 === Synopsis
 
@@ -6553,7 +6553,7 @@ struct <<S0-0cf,S0>>&lt;30, bool&gt;;
 |===
 
 [#S0-021-S1]
-== <<S0-021,S0>>&lt;30, bool&gt;::S1
+== <<S0-021,S0&lt;30, bool&gt;>>::S1
 
 === Synopsis
 
@@ -6565,7 +6565,7 @@ struct S1;
 ----
 
 [#S0-021-S5-06]
-== <<S0-021,S0>>&lt;30, bool&gt;::S5
+== <<S0-021,S0&lt;30, bool&gt;>>::S5
 
 === Synopsis
 
@@ -6580,7 +6580,7 @@ struct S5;
 ----
 
 [#S0-021-S5-0b]
-== <<S0-021,S0>>&lt;30, bool&gt;::S5&lt;31, bool&gt;
+== <<S0-021,S0&lt;30, bool&gt;>>::<<S0-0cf-S5,S5>>&lt;31, bool&gt;
 
 === Synopsis
 
@@ -6609,7 +6609,7 @@ struct <<S0-0cf-S5,S5>>&lt;31, bool&gt;;
 |===
 
 [#S0-021-S5-0b-S6]
-== <<S0-021,S0>>&lt;30, bool&gt;::<<S0-021-S5-0b,S5>>&lt;31, bool&gt;::S6
+== <<S0-021,S0&lt;30, bool&gt;>>::<<S0-021-S5-0b,S5&lt;31, bool&gt;>>::S6
 
 === Synopsis
 
@@ -6629,7 +6629,7 @@ struct S6;
 |===
 
 [#S0-021-S5-0b-S6-f6]
-== <<S0-021,S0>>&lt;30, bool&gt;::<<S0-021-S5-0b,S5>>&lt;31, bool&gt;::<<S0-021-S5-0b-S6,S6>>::f6
+== <<S0-021,S0&lt;30, bool&gt;>>::<<S0-021-S5-0b,S5&lt;31, bool&gt;>>::<<S0-021-S5-0b-S6,S6>>::f6
 
 === Synopsis
 
@@ -6642,7 +6642,7 @@ f6();
 ----
 
 [#S0-021-S5-0b-f5]
-== <<S0-021,S0>>&lt;30, bool&gt;::<<S0-021-S5-0b,S5>>&lt;31, bool&gt;::f5
+== <<S0-021,S0&lt;30, bool&gt;>>::<<S0-021-S5-0b,S5&lt;31, bool&gt;>>::f5
 
 === Synopsis
 
@@ -6655,7 +6655,7 @@ f5();
 ----
 
 [#S0-021-f0]
-== <<S0-021,S0>>&lt;30, bool&gt;::f0
+== <<S0-021,S0&lt;30, bool&gt;>>::f0
 
 === Synopsis
 
@@ -6668,7 +6668,7 @@ f0();
 ----
 
 [#S0-0318]
-== S0&lt;33, bool&gt;
+== <<S0-0cf,S0>>&lt;33, bool&gt;
 
 === Synopsis
 
@@ -6699,7 +6699,7 @@ struct <<S0-0cf,S0>>&lt;33, bool&gt;;
 |===
 
 [#S0-0318-S1]
-== <<S0-0318,S0>>&lt;33, bool&gt;::S1
+== <<S0-0318,S0&lt;33, bool&gt;>>::S1
 
 === Synopsis
 
@@ -6711,7 +6711,7 @@ struct S1;
 ----
 
 [#S0-0318-S5-0f]
-== <<S0-0318,S0>>&lt;33, bool&gt;::S5
+== <<S0-0318,S0&lt;33, bool&gt;>>::S5
 
 === Synopsis
 
@@ -6726,7 +6726,7 @@ struct S5;
 ----
 
 [#S0-0318-S5-0b]
-== <<S0-0318,S0>>&lt;33, bool&gt;::S5&lt;34, bool&gt;
+== <<S0-0318,S0&lt;33, bool&gt;>>::<<S0-0cf-S5,S5>>&lt;34, bool&gt;
 
 === Synopsis
 
@@ -6755,7 +6755,7 @@ struct <<S0-0cf-S5,S5>>&lt;34, bool&gt;;
 |===
 
 [#S0-0318-S5-0b-S6]
-== <<S0-0318,S0>>&lt;33, bool&gt;::<<S0-0318-S5-0b,S5>>&lt;34, bool&gt;::S6
+== <<S0-0318,S0&lt;33, bool&gt;>>::<<S0-0318-S5-0b,S5&lt;34, bool&gt;>>::S6
 
 === Synopsis
 
@@ -6784,7 +6784,7 @@ struct S6;
 |===
 
 [#S0-0318-S5-0b-S6-S7-04]
-== <<S0-0318,S0>>&lt;33, bool&gt;::<<S0-0318-S5-0b,S5>>&lt;34, bool&gt;::<<S0-0318-S5-0b-S6,S6>>::S7
+== <<S0-0318,S0&lt;33, bool&gt;>>::<<S0-0318-S5-0b,S5&lt;34, bool&gt;>>::<<S0-0318-S5-0b-S6,S6>>::S7
 
 === Synopsis
 
@@ -6799,7 +6799,7 @@ struct S7;
 ----
 
 [#S0-0318-S5-0b-S6-S7-05]
-== <<S0-0318,S0>>&lt;33, bool&gt;::<<S0-0318-S5-0b,S5>>&lt;34, bool&gt;::<<S0-0318-S5-0b-S6,S6>>::S7&lt;35, bool&gt;
+== <<S0-0318,S0&lt;33, bool&gt;>>::<<S0-0318-S5-0b,S5&lt;34, bool&gt;>>::<<S0-0318-S5-0b-S6,S6>>::<<S0-0cf-S5-S6-S7,S7>>&lt;35, bool&gt;
 
 === Synopsis
 
@@ -6828,7 +6828,7 @@ struct <<S0-0cf-S5-S6-S7,S7>>&lt;35, bool&gt;;
 |===
 
 [#S0-0318-S5-0b-S6-S7-05-S9]
-== <<S0-0318,S0>>&lt;33, bool&gt;::<<S0-0318-S5-0b,S5>>&lt;34, bool&gt;::<<S0-0318-S5-0b-S6,S6>>::<<S0-0318-S5-0b-S6-S7-05,S7>>&lt;35, bool&gt;::S9
+== <<S0-0318,S0&lt;33, bool&gt;>>::<<S0-0318-S5-0b,S5&lt;34, bool&gt;>>::<<S0-0318-S5-0b-S6,S6>>::<<S0-0318-S5-0b-S6-S7-05,S7&lt;35, bool&gt;>>::S9
 
 === Synopsis
 
@@ -6843,7 +6843,7 @@ struct S9;
 ----
 
 [#S0-0318-S5-0b-S6-S7-05-f7]
-== <<S0-0318,S0>>&lt;33, bool&gt;::<<S0-0318-S5-0b,S5>>&lt;34, bool&gt;::<<S0-0318-S5-0b-S6,S6>>::<<S0-0318-S5-0b-S6-S7-05,S7>>&lt;35, bool&gt;::f7
+== <<S0-0318,S0&lt;33, bool&gt;>>::<<S0-0318-S5-0b,S5&lt;34, bool&gt;>>::<<S0-0318-S5-0b-S6,S6>>::<<S0-0318-S5-0b-S6-S7-05,S7&lt;35, bool&gt;>>::f7
 
 === Synopsis
 
@@ -6856,7 +6856,7 @@ f7();
 ----
 
 [#S0-0318-S5-0b-S6-f6]
-== <<S0-0318,S0>>&lt;33, bool&gt;::<<S0-0318-S5-0b,S5>>&lt;34, bool&gt;::<<S0-0318-S5-0b-S6,S6>>::f6
+== <<S0-0318,S0&lt;33, bool&gt;>>::<<S0-0318-S5-0b,S5&lt;34, bool&gt;>>::<<S0-0318-S5-0b-S6,S6>>::f6
 
 === Synopsis
 
@@ -6869,7 +6869,7 @@ f6();
 ----
 
 [#S0-0318-S5-0b-f5]
-== <<S0-0318,S0>>&lt;33, bool&gt;::<<S0-0318-S5-0b,S5>>&lt;34, bool&gt;::f5
+== <<S0-0318,S0&lt;33, bool&gt;>>::<<S0-0318-S5-0b,S5&lt;34, bool&gt;>>::f5
 
 === Synopsis
 
@@ -6882,7 +6882,7 @@ f5();
 ----
 
 [#S0-0318-f0]
-== <<S0-0318,S0>>&lt;33, bool&gt;::f0
+== <<S0-0318,S0&lt;33, bool&gt;>>::f0
 
 === Synopsis
 
@@ -6895,7 +6895,7 @@ f0();
 ----
 
 [#S0-0d]
-== S0&lt;36, bool&gt;
+== <<S0-0cf,S0>>&lt;36, bool&gt;
 
 === Synopsis
 
@@ -6926,7 +6926,7 @@ struct <<S0-0cf,S0>>&lt;36, bool&gt;;
 |===
 
 [#S0-0d-S1]
-== <<S0-0d,S0>>&lt;36, bool&gt;::S1
+== <<S0-0d,S0&lt;36, bool&gt;>>::S1
 
 === Synopsis
 
@@ -6938,7 +6938,7 @@ struct S1;
 ----
 
 [#S0-0d-S5-09]
-== <<S0-0d,S0>>&lt;36, bool&gt;::S5
+== <<S0-0d,S0&lt;36, bool&gt;>>::S5
 
 === Synopsis
 
@@ -6953,7 +6953,7 @@ struct S5;
 ----
 
 [#S0-0d-S5-0b]
-== <<S0-0d,S0>>&lt;36, bool&gt;::S5&lt;37, bool&gt;
+== <<S0-0d,S0&lt;36, bool&gt;>>::<<S0-0cf-S5,S5>>&lt;37, bool&gt;
 
 === Synopsis
 
@@ -6982,7 +6982,7 @@ struct <<S0-0cf-S5,S5>>&lt;37, bool&gt;;
 |===
 
 [#S0-0d-S5-0b-S6]
-== <<S0-0d,S0>>&lt;36, bool&gt;::<<S0-0d-S5-0b,S5>>&lt;37, bool&gt;::S6
+== <<S0-0d,S0&lt;36, bool&gt;>>::<<S0-0d-S5-0b,S5&lt;37, bool&gt;>>::S6
 
 === Synopsis
 
@@ -7011,7 +7011,7 @@ struct S6;
 |===
 
 [#S0-0d-S5-0b-S6-S7-08]
-== <<S0-0d,S0>>&lt;36, bool&gt;::<<S0-0d-S5-0b,S5>>&lt;37, bool&gt;::<<S0-0d-S5-0b-S6,S6>>::S7
+== <<S0-0d,S0&lt;36, bool&gt;>>::<<S0-0d-S5-0b,S5&lt;37, bool&gt;>>::<<S0-0d-S5-0b-S6,S6>>::S7
 
 === Synopsis
 
@@ -7026,7 +7026,7 @@ struct S7;
 ----
 
 [#S0-0d-S5-0b-S6-S7-0d]
-== <<S0-0d,S0>>&lt;36, bool&gt;::<<S0-0d-S5-0b,S5>>&lt;37, bool&gt;::<<S0-0d-S5-0b-S6,S6>>::S7&lt;38, bool&gt;
+== <<S0-0d,S0&lt;36, bool&gt;>>::<<S0-0d-S5-0b,S5&lt;37, bool&gt;>>::<<S0-0d-S5-0b-S6,S6>>::<<S0-0cf-S5-S6-S7,S7>>&lt;38, bool&gt;
 
 === Synopsis
 
@@ -7055,7 +7055,7 @@ struct <<S0-0cf-S5-S6-S7,S7>>&lt;38, bool&gt;;
 |===
 
 [#S0-0d-S5-0b-S6-S7-0d-S8]
-== <<S0-0d,S0>>&lt;36, bool&gt;::<<S0-0d-S5-0b,S5>>&lt;37, bool&gt;::<<S0-0d-S5-0b-S6,S6>>::<<S0-0d-S5-0b-S6-S7-0d,S7>>&lt;38, bool&gt;::S8
+== <<S0-0d,S0&lt;36, bool&gt;>>::<<S0-0d-S5-0b,S5&lt;37, bool&gt;>>::<<S0-0d-S5-0b-S6,S6>>::<<S0-0d-S5-0b-S6-S7-0d,S7&lt;38, bool&gt;>>::S8
 
 === Synopsis
 
@@ -7067,7 +7067,7 @@ struct S8;
 ----
 
 [#S0-0d-S5-0b-S6-S7-0d-f7]
-== <<S0-0d,S0>>&lt;36, bool&gt;::<<S0-0d-S5-0b,S5>>&lt;37, bool&gt;::<<S0-0d-S5-0b-S6,S6>>::<<S0-0d-S5-0b-S6-S7-0d,S7>>&lt;38, bool&gt;::f7
+== <<S0-0d,S0&lt;36, bool&gt;>>::<<S0-0d-S5-0b,S5&lt;37, bool&gt;>>::<<S0-0d-S5-0b-S6,S6>>::<<S0-0d-S5-0b-S6-S7-0d,S7&lt;38, bool&gt;>>::f7
 
 === Synopsis
 
@@ -7080,7 +7080,7 @@ f7();
 ----
 
 [#S0-0d-S5-0b-S6-f6]
-== <<S0-0d,S0>>&lt;36, bool&gt;::<<S0-0d-S5-0b,S5>>&lt;37, bool&gt;::<<S0-0d-S5-0b-S6,S6>>::f6
+== <<S0-0d,S0&lt;36, bool&gt;>>::<<S0-0d-S5-0b,S5&lt;37, bool&gt;>>::<<S0-0d-S5-0b-S6,S6>>::f6
 
 === Synopsis
 
@@ -7093,7 +7093,7 @@ f6();
 ----
 
 [#S0-0d-S5-0b-f5]
-== <<S0-0d,S0>>&lt;36, bool&gt;::<<S0-0d-S5-0b,S5>>&lt;37, bool&gt;::f5
+== <<S0-0d,S0&lt;36, bool&gt;>>::<<S0-0d-S5-0b,S5&lt;37, bool&gt;>>::f5
 
 === Synopsis
 
@@ -7106,7 +7106,7 @@ f5();
 ----
 
 [#S0-0d-f0]
-== <<S0-0d,S0>>&lt;36, bool&gt;::f0
+== <<S0-0d,S0&lt;36, bool&gt;>>::f0
 
 === Synopsis
 
@@ -7119,7 +7119,7 @@ f0();
 ----
 
 [#S0-0206]
-== S0&lt;39, bool&gt;
+== <<S0-0cf,S0>>&lt;39, bool&gt;
 
 === Synopsis
 
@@ -7150,7 +7150,7 @@ struct <<S0-0cf,S0>>&lt;39, bool&gt;;
 |===
 
 [#S0-0206-S1]
-== <<S0-0206,S0>>&lt;39, bool&gt;::S1
+== <<S0-0206,S0&lt;39, bool&gt;>>::S1
 
 === Synopsis
 
@@ -7162,7 +7162,7 @@ struct S1;
 ----
 
 [#S0-0206-S5-06]
-== <<S0-0206,S0>>&lt;39, bool&gt;::S5
+== <<S0-0206,S0&lt;39, bool&gt;>>::S5
 
 === Synopsis
 
@@ -7177,7 +7177,7 @@ struct S5;
 ----
 
 [#S0-0206-S5-08]
-== <<S0-0206,S0>>&lt;39, bool&gt;::S5&lt;40, bool&gt;
+== <<S0-0206,S0&lt;39, bool&gt;>>::<<S0-0cf-S5,S5>>&lt;40, bool&gt;
 
 === Synopsis
 
@@ -7206,7 +7206,7 @@ struct <<S0-0cf-S5,S5>>&lt;40, bool&gt;;
 |===
 
 [#S0-0206-S5-08-S6]
-== <<S0-0206,S0>>&lt;39, bool&gt;::<<S0-0206-S5-08,S5>>&lt;40, bool&gt;::S6
+== <<S0-0206,S0&lt;39, bool&gt;>>::<<S0-0206-S5-08,S5&lt;40, bool&gt;>>::S6
 
 === Synopsis
 
@@ -7235,7 +7235,7 @@ struct S6;
 |===
 
 [#S0-0206-S5-08-S6-S7-06]
-== <<S0-0206,S0>>&lt;39, bool&gt;::<<S0-0206-S5-08,S5>>&lt;40, bool&gt;::<<S0-0206-S5-08-S6,S6>>::S7
+== <<S0-0206,S0&lt;39, bool&gt;>>::<<S0-0206-S5-08,S5&lt;40, bool&gt;>>::<<S0-0206-S5-08-S6,S6>>::S7
 
 === Synopsis
 
@@ -7250,7 +7250,7 @@ struct S7;
 ----
 
 [#S0-0206-S5-08-S6-S7-01]
-== <<S0-0206,S0>>&lt;39, bool&gt;::<<S0-0206-S5-08,S5>>&lt;40, bool&gt;::<<S0-0206-S5-08-S6,S6>>::S7&lt;41, bool&gt;
+== <<S0-0206,S0&lt;39, bool&gt;>>::<<S0-0206-S5-08,S5&lt;40, bool&gt;>>::<<S0-0206-S5-08-S6,S6>>::<<S0-0cf-S5-S6-S7,S7>>&lt;41, bool&gt;
 
 === Synopsis
 
@@ -7279,7 +7279,7 @@ struct <<S0-0cf-S5-S6-S7,S7>>&lt;41, bool&gt;;
 |===
 
 [#S0-0206-S5-08-S6-S7-01-S8]
-== <<S0-0206,S0>>&lt;39, bool&gt;::<<S0-0206-S5-08,S5>>&lt;40, bool&gt;::<<S0-0206-S5-08-S6,S6>>::<<S0-0206-S5-08-S6-S7-01,S7>>&lt;41, bool&gt;::S8
+== <<S0-0206,S0&lt;39, bool&gt;>>::<<S0-0206-S5-08,S5&lt;40, bool&gt;>>::<<S0-0206-S5-08-S6,S6>>::<<S0-0206-S5-08-S6-S7-01,S7&lt;41, bool&gt;>>::S8
 
 === Synopsis
 
@@ -7291,7 +7291,7 @@ struct S8;
 ----
 
 [#S0-0206-S5-08-S6-S7-01-f7]
-== <<S0-0206,S0>>&lt;39, bool&gt;::<<S0-0206-S5-08,S5>>&lt;40, bool&gt;::<<S0-0206-S5-08-S6,S6>>::<<S0-0206-S5-08-S6-S7-01,S7>>&lt;41, bool&gt;::f7
+== <<S0-0206,S0&lt;39, bool&gt;>>::<<S0-0206-S5-08,S5&lt;40, bool&gt;>>::<<S0-0206-S5-08-S6,S6>>::<<S0-0206-S5-08-S6-S7-01,S7&lt;41, bool&gt;>>::f7
 
 === Synopsis
 
@@ -7304,7 +7304,7 @@ f7();
 ----
 
 [#S0-0206-S5-08-S6-f6]
-== <<S0-0206,S0>>&lt;39, bool&gt;::<<S0-0206-S5-08,S5>>&lt;40, bool&gt;::<<S0-0206-S5-08-S6,S6>>::f6
+== <<S0-0206,S0&lt;39, bool&gt;>>::<<S0-0206-S5-08,S5&lt;40, bool&gt;>>::<<S0-0206-S5-08-S6,S6>>::f6
 
 === Synopsis
 
@@ -7317,7 +7317,7 @@ f6();
 ----
 
 [#S0-0206-S5-08-f5]
-== <<S0-0206,S0>>&lt;39, bool&gt;::<<S0-0206-S5-08,S5>>&lt;40, bool&gt;::f5
+== <<S0-0206,S0&lt;39, bool&gt;>>::<<S0-0206-S5-08,S5&lt;40, bool&gt;>>::f5
 
 === Synopsis
 
@@ -7330,7 +7330,7 @@ f5();
 ----
 
 [#S0-0206-f0]
-== <<S0-0206,S0>>&lt;39, bool&gt;::f0
+== <<S0-0206,S0&lt;39, bool&gt;>>::f0
 
 === Synopsis
 
@@ -7343,7 +7343,7 @@ f0();
 ----
 
 [#S0-0b6]
-== S0&lt;4, bool&gt;
+== <<S0-0cf,S0>>&lt;4, bool&gt;
 
 === Synopsis
 
@@ -7373,7 +7373,7 @@ struct <<S0-0cf,S0>>&lt;4, bool&gt;;
 |===
 
 [#S0-0b6-S1]
-== <<S0-0b6,S0>>&lt;4, bool&gt;::S1
+== <<S0-0b6,S0&lt;4, bool&gt;>>::S1
 
 === Synopsis
 
@@ -7393,7 +7393,7 @@ struct S1;
 |===
 
 [#S0-0b6-S1-f1]
-== <<S0-0b6,S0>>&lt;4, bool&gt;::<<S0-0b6-S1,S1>>::f1
+== <<S0-0b6,S0&lt;4, bool&gt;>>::<<S0-0b6-S1,S1>>::f1
 
 === Synopsis
 
@@ -7406,7 +7406,7 @@ f1();
 ----
 
 [#S0-0b6-S5]
-== <<S0-0b6,S0>>&lt;4, bool&gt;::S5
+== <<S0-0b6,S0&lt;4, bool&gt;>>::S5
 
 === Synopsis
 
@@ -7421,7 +7421,7 @@ struct S5;
 ----
 
 [#S0-0b6-f0]
-== <<S0-0b6,S0>>&lt;4, bool&gt;::f0
+== <<S0-0b6,S0&lt;4, bool&gt;>>::f0
 
 === Synopsis
 
@@ -7434,7 +7434,7 @@ f0();
 ----
 
 [#S0-05291]
-== S0&lt;43, bool&gt;
+== <<S0-0cf,S0>>&lt;43, bool&gt;
 
 === Synopsis
 
@@ -7465,7 +7465,7 @@ struct <<S0-0cf,S0>>&lt;43, bool&gt;;
 |===
 
 [#S0-05291-S1]
-== <<S0-05291,S0>>&lt;43, bool&gt;::S1
+== <<S0-05291,S0&lt;43, bool&gt;>>::S1
 
 === Synopsis
 
@@ -7477,7 +7477,7 @@ struct S1;
 ----
 
 [#S0-05291-S5-02]
-== <<S0-05291,S0>>&lt;43, bool&gt;::S5
+== <<S0-05291,S0&lt;43, bool&gt;>>::S5
 
 === Synopsis
 
@@ -7492,7 +7492,7 @@ struct S5;
 ----
 
 [#S0-05291-S5-0e]
-== <<S0-05291,S0>>&lt;43, bool&gt;::S5&lt;44, bool&gt;
+== <<S0-05291,S0&lt;43, bool&gt;>>::<<S0-0cf-S5,S5>>&lt;44, bool&gt;
 
 === Synopsis
 
@@ -7521,7 +7521,7 @@ struct <<S0-0cf-S5,S5>>&lt;44, bool&gt;;
 |===
 
 [#S0-05291-S5-0e-S6]
-== <<S0-05291,S0>>&lt;43, bool&gt;::<<S0-05291-S5-0e,S5>>&lt;44, bool&gt;::S6
+== <<S0-05291,S0&lt;43, bool&gt;>>::<<S0-05291-S5-0e,S5&lt;44, bool&gt;>>::S6
 
 === Synopsis
 
@@ -7550,7 +7550,7 @@ struct S6;
 |===
 
 [#S0-05291-S5-0e-S6-S7-04]
-== <<S0-05291,S0>>&lt;43, bool&gt;::<<S0-05291-S5-0e,S5>>&lt;44, bool&gt;::<<S0-05291-S5-0e-S6,S6>>::S7
+== <<S0-05291,S0&lt;43, bool&gt;>>::<<S0-05291-S5-0e,S5&lt;44, bool&gt;>>::<<S0-05291-S5-0e-S6,S6>>::S7
 
 === Synopsis
 
@@ -7565,7 +7565,7 @@ struct S7;
 ----
 
 [#S0-05291-S5-0e-S6-S7-0f]
-== <<S0-05291,S0>>&lt;43, bool&gt;::<<S0-05291-S5-0e,S5>>&lt;44, bool&gt;::<<S0-05291-S5-0e-S6,S6>>::S7&lt;45, bool&gt;
+== <<S0-05291,S0&lt;43, bool&gt;>>::<<S0-05291-S5-0e,S5&lt;44, bool&gt;>>::<<S0-05291-S5-0e-S6,S6>>::<<S0-0cf-S5-S6-S7,S7>>&lt;45, bool&gt;
 
 === Synopsis
 
@@ -7594,7 +7594,7 @@ struct <<S0-0cf-S5-S6-S7,S7>>&lt;45, bool&gt;;
 |===
 
 [#S0-05291-S5-0e-S6-S7-0f-S8]
-== <<S0-05291,S0>>&lt;43, bool&gt;::<<S0-05291-S5-0e,S5>>&lt;44, bool&gt;::<<S0-05291-S5-0e-S6,S6>>::<<S0-05291-S5-0e-S6-S7-0f,S7>>&lt;45, bool&gt;::S8
+== <<S0-05291,S0&lt;43, bool&gt;>>::<<S0-05291-S5-0e,S5&lt;44, bool&gt;>>::<<S0-05291-S5-0e-S6,S6>>::<<S0-05291-S5-0e-S6-S7-0f,S7&lt;45, bool&gt;>>::S8
 
 === Synopsis
 
@@ -7606,7 +7606,7 @@ struct S8;
 ----
 
 [#S0-05291-S5-0e-S6-S7-0f-f7]
-== <<S0-05291,S0>>&lt;43, bool&gt;::<<S0-05291-S5-0e,S5>>&lt;44, bool&gt;::<<S0-05291-S5-0e-S6,S6>>::<<S0-05291-S5-0e-S6-S7-0f,S7>>&lt;45, bool&gt;::f7
+== <<S0-05291,S0&lt;43, bool&gt;>>::<<S0-05291-S5-0e,S5&lt;44, bool&gt;>>::<<S0-05291-S5-0e-S6,S6>>::<<S0-05291-S5-0e-S6-S7-0f,S7&lt;45, bool&gt;>>::f7
 
 === Synopsis
 
@@ -7619,7 +7619,7 @@ f7();
 ----
 
 [#S0-05291-S5-0e-S6-f6]
-== <<S0-05291,S0>>&lt;43, bool&gt;::<<S0-05291-S5-0e,S5>>&lt;44, bool&gt;::<<S0-05291-S5-0e-S6,S6>>::f6
+== <<S0-05291,S0&lt;43, bool&gt;>>::<<S0-05291-S5-0e,S5&lt;44, bool&gt;>>::<<S0-05291-S5-0e-S6,S6>>::f6
 
 === Synopsis
 
@@ -7632,7 +7632,7 @@ f6();
 ----
 
 [#S0-05291-S5-0e-f5]
-== <<S0-05291,S0>>&lt;43, bool&gt;::<<S0-05291-S5-0e,S5>>&lt;44, bool&gt;::f5
+== <<S0-05291,S0&lt;43, bool&gt;>>::<<S0-05291-S5-0e,S5&lt;44, bool&gt;>>::f5
 
 === Synopsis
 
@@ -7645,7 +7645,7 @@ f5();
 ----
 
 [#S0-05291-f0]
-== <<S0-05291,S0>>&lt;43, bool&gt;::f0
+== <<S0-05291,S0&lt;43, bool&gt;>>::f0
 
 === Synopsis
 
@@ -7658,7 +7658,7 @@ f0();
 ----
 
 [#S0-023]
-== S0&lt;6, bool&gt;
+== <<S0-0cf,S0>>&lt;6, bool&gt;
 
 === Synopsis
 
@@ -7688,7 +7688,7 @@ struct <<S0-0cf,S0>>&lt;6, bool&gt;;
 |===
 
 [#S0-023-S1]
-== <<S0-023,S0>>&lt;6, bool&gt;::S1
+== <<S0-023,S0&lt;6, bool&gt;>>::S1
 
 === Synopsis
 
@@ -7708,7 +7708,7 @@ struct S1;
 |===
 
 [#S0-023-S1-f1]
-== <<S0-023,S0>>&lt;6, bool&gt;::<<S0-023-S1,S1>>::f1
+== <<S0-023,S0&lt;6, bool&gt;>>::<<S0-023-S1,S1>>::f1
 
 === Synopsis
 
@@ -7721,7 +7721,7 @@ f1();
 ----
 
 [#S0-023-S5]
-== <<S0-023,S0>>&lt;6, bool&gt;::S5
+== <<S0-023,S0&lt;6, bool&gt;>>::S5
 
 === Synopsis
 
@@ -7736,7 +7736,7 @@ struct S5;
 ----
 
 [#S0-023-f0]
-== <<S0-023,S0>>&lt;6, bool&gt;::f0
+== <<S0-023,S0&lt;6, bool&gt;>>::f0
 
 === Synopsis
 
@@ -7749,7 +7749,7 @@ f0();
 ----
 
 [#S0-04]
-== S0&lt;8, bool&gt;
+== <<S0-0cf,S0>>&lt;8, bool&gt;
 
 === Synopsis
 
@@ -7779,7 +7779,7 @@ struct <<S0-0cf,S0>>&lt;8, bool&gt;;
 |===
 
 [#S0-04-S1]
-== <<S0-04,S0>>&lt;8, bool&gt;::S1
+== <<S0-04,S0&lt;8, bool&gt;>>::S1
 
 === Synopsis
 
@@ -7808,7 +7808,7 @@ struct S1;
 |===
 
 [#S0-04-S1-S2-0e]
-== <<S0-04,S0>>&lt;8, bool&gt;::<<S0-04-S1,S1>>::S2
+== <<S0-04,S0&lt;8, bool&gt;>>::<<S0-04-S1,S1>>::S2
 
 === Synopsis
 
@@ -7823,7 +7823,7 @@ struct S2;
 ----
 
 [#S0-04-S1-S2-0a]
-== <<S0-04,S0>>&lt;8, bool&gt;::<<S0-04-S1,S1>>::S2&lt;9, bool&gt;
+== <<S0-04,S0&lt;8, bool&gt;>>::<<S0-04-S1,S1>>::<<S0-0cf-S1-S2,S2>>&lt;9, bool&gt;
 
 === Synopsis
 
@@ -7852,7 +7852,7 @@ struct <<S0-0cf-S1-S2,S2>>&lt;9, bool&gt;;
 |===
 
 [#S0-04-S1-S2-0a-S4]
-== <<S0-04,S0>>&lt;8, bool&gt;::<<S0-04-S1,S1>>::<<S0-04-S1-S2-0a,S2>>&lt;9, bool&gt;::S4
+== <<S0-04,S0&lt;8, bool&gt;>>::<<S0-04-S1,S1>>::<<S0-04-S1-S2-0a,S2&lt;9, bool&gt;>>::S4
 
 === Synopsis
 
@@ -7867,7 +7867,7 @@ struct S4;
 ----
 
 [#S0-04-S1-S2-0a-f2]
-== <<S0-04,S0>>&lt;8, bool&gt;::<<S0-04-S1,S1>>::<<S0-04-S1-S2-0a,S2>>&lt;9, bool&gt;::f2
+== <<S0-04,S0&lt;8, bool&gt;>>::<<S0-04-S1,S1>>::<<S0-04-S1-S2-0a,S2&lt;9, bool&gt;>>::f2
 
 === Synopsis
 
@@ -7880,7 +7880,7 @@ f2();
 ----
 
 [#S0-04-S1-f1]
-== <<S0-04,S0>>&lt;8, bool&gt;::<<S0-04-S1,S1>>::f1
+== <<S0-04,S0&lt;8, bool&gt;>>::<<S0-04-S1,S1>>::f1
 
 === Synopsis
 
@@ -7893,7 +7893,7 @@ f1();
 ----
 
 [#S0-04-S5]
-== <<S0-04,S0>>&lt;8, bool&gt;::S5
+== <<S0-04,S0&lt;8, bool&gt;>>::S5
 
 === Synopsis
 
@@ -7908,7 +7908,7 @@ struct S5;
 ----
 
 [#S0-04-f0]
-== <<S0-04,S0>>&lt;8, bool&gt;::f0
+== <<S0-04,S0&lt;8, bool&gt;>>::f0
 
 === Synopsis
 
@@ -7921,7 +7921,7 @@ f0();
 ----
 
 [#S0-0c4]
-== S0&lt;1, T*&gt;
+== <<S0-0cf,S0>>&lt;1, T*&gt;
 
 === Synopsis
 
diff --git a/test-files/golden-tests/symbols/record/class-template-specializations-1.html b/test-files/golden-tests/symbols/record/class-template-specializations-1.html
index edf1a59b6..85ef434e5 100644
--- a/test-files/golden-tests/symbols/record/class-template-specializations-1.html
+++ b/test-files/golden-tests/symbols/record/class-template-specializations-1.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -115,7 +115,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="R0">R0</h2>
+<h2 id="R0"><a href="#R0">R0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -174,7 +174,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="R1">R1</h2>
+<h2 id="R1"><a href="#R1">R1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -206,7 +206,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="R10">R10</h2>
+<h2 id="R10"><a href="#R10">R10</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -238,7 +238,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="R11">R11</h2>
+<h2 id="R11"><a href="#R11">R11</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -270,7 +270,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="R12">R12</h2>
+<h2 id="R12"><a href="#R12">R12</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -302,7 +302,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="R13">R13</h2>
+<h2 id="R13"><a href="#R13">R13</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -334,7 +334,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="R14">R14</h2>
+<h2 id="R14"><a href="#R14">R14</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -366,7 +366,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="R15">R15</h2>
+<h2 id="R15"><a href="#R15">R15</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -398,7 +398,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="R16">R16</h2>
+<h2 id="R16"><a href="#R16">R16</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -430,7 +430,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="R17">R17</h2>
+<h2 id="R17"><a href="#R17">R17</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -462,7 +462,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="R18">R18</h2>
+<h2 id="R18"><a href="#R18">R18</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -494,7 +494,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="R19">R19</h2>
+<h2 id="R19"><a href="#R19">R19</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -526,7 +526,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="R2">R2</h2>
+<h2 id="R2"><a href="#R2">R2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -585,7 +585,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="R20">R20</h2>
+<h2 id="R20"><a href="#R20">R20</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -617,7 +617,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="R21">R21</h2>
+<h2 id="R21"><a href="#R21">R21</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -649,7 +649,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="R22">R22</h2>
+<h2 id="R22"><a href="#R22">R22</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -681,7 +681,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="R23">R23</h2>
+<h2 id="R23"><a href="#R23">R23</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -713,7 +713,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="R24">R24</h2>
+<h2 id="R24"><a href="#R24">R24</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -745,7 +745,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="R25">R25</h2>
+<h2 id="R25"><a href="#R25">R25</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -777,7 +777,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="R26">R26</h2>
+<h2 id="R26"><a href="#R26">R26</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -809,7 +809,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="R27">R27</h2>
+<h2 id="R27"><a href="#R27">R27</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -841,7 +841,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="R28">R28</h2>
+<h2 id="R28"><a href="#R28">R28</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -900,7 +900,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="R29">R29</h2>
+<h2 id="R29"><a href="#R29">R29</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -959,7 +959,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="R3">R3</h2>
+<h2 id="R3"><a href="#R3">R3</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -991,7 +991,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="R30">R30</h2>
+<h2 id="R30"><a href="#R30">R30</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1049,7 +1049,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="R30-S2"><a href="#R30">R30</a>::S2</h2>
+<h2 id="R30-S2"><a href="#R30-S2">R30::S2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1069,7 +1069,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="R30-f1"><a href="#R30">R30</a>::f1</h2>
+<h2 id="R30-f1"><a href="#R30-f1">R30::f1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1085,7 +1085,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="R31">R31</h2>
+<h2 id="R31"><a href="#R31">R31</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1120,7 +1120,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="R32">R32</h2>
+<h2 id="R32"><a href="#R32">R32</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1152,7 +1152,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="R33">R33</h2>
+<h2 id="R33"><a href="#R33">R33</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1184,7 +1184,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="R34">R34</h2>
+<h2 id="R34"><a href="#R34">R34</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1229,7 +1229,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="R34-f3"><a href="#R34">R34</a>::f3</h2>
+<h2 id="R34-f3"><a href="#R34-f3">R34::f3</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1245,7 +1245,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="R35">R35</h2>
+<h2 id="R35"><a href="#R35">R35</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1280,7 +1280,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="R36">R36</h2>
+<h2 id="R36"><a href="#R36">R36</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1312,7 +1312,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="R37">R37</h2>
+<h2 id="R37"><a href="#R37">R37</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1344,7 +1344,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="R38">R38</h2>
+<h2 id="R38"><a href="#R38">R38</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1379,7 +1379,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="R39">R39</h2>
+<h2 id="R39"><a href="#R39">R39</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1411,7 +1411,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="R4">R4</h2>
+<h2 id="R4"><a href="#R4">R4</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1443,7 +1443,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="R40">R40</h2>
+<h2 id="R40"><a href="#R40">R40</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1475,7 +1475,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="R41">R41</h2>
+<h2 id="R41"><a href="#R41">R41</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1533,7 +1533,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="R41-S7"><a href="#R41">R41</a>::S7</h2>
+<h2 id="R41-S7"><a href="#R41-S7">R41::S7</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1553,7 +1553,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="R41-f6"><a href="#R41">R41</a>::f6</h2>
+<h2 id="R41-f6"><a href="#R41-f6">R41::f6</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1569,7 +1569,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="R42">R42</h2>
+<h2 id="R42"><a href="#R42">R42</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1604,7 +1604,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="R43">R43</h2>
+<h2 id="R43"><a href="#R43">R43</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1636,7 +1636,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="R44">R44</h2>
+<h2 id="R44"><a href="#R44">R44</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1668,7 +1668,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="R45">R45</h2>
+<h2 id="R45"><a href="#R45">R45</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1713,7 +1713,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="R45-f8"><a href="#R45">R45</a>::f8</h2>
+<h2 id="R45-f8"><a href="#R45-f8">R45::f8</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1729,7 +1729,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="R46">R46</h2>
+<h2 id="R46"><a href="#R46">R46</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1764,7 +1764,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="R47">R47</h2>
+<h2 id="R47"><a href="#R47">R47</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1796,7 +1796,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="R48">R48</h2>
+<h2 id="R48"><a href="#R48">R48</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1828,7 +1828,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="R5">R5</h2>
+<h2 id="R5"><a href="#R5">R5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1860,7 +1860,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="R6">R6</h2>
+<h2 id="R6"><a href="#R6">R6</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1892,7 +1892,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="R7">R7</h2>
+<h2 id="R7"><a href="#R7">R7</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1924,7 +1924,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="R8">R8</h2>
+<h2 id="R8"><a href="#R8">R8</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1956,7 +1956,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="R9">R9</h2>
+<h2 id="R9"><a href="#R9">R9</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1988,7 +1988,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0cf">S0</h2>
+<h2 id="S0-0cf"><a href="#S0-0cf">S0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -2056,7 +2056,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0cf-S1"><a href="#S0-0cf">S0</a>::S1</h2>
+<h2 id="S0-0cf-S1"><a href="#S0-0cf-S1">S0::S1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -2099,7 +2099,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0cf-S1-S2"><a href="#S0-0cf">S0</a>::<a href="#S0-0cf-S1">S1</a>::S2</h2>
+<h2 id="S0-0cf-S1-S2"><a href="#S0-0cf-S1-S2">S0::S1::S2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -2146,7 +2146,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0cf-S1-S2-S3"><a href="#S0-0cf">S0</a>::<a href="#S0-0cf-S1">S1</a>::<a href="#S0-0cf-S1-S2">S2</a>::S3</h2>
+<h2 id="S0-0cf-S1-S2-S3"><a href="#S0-0cf-S1-S2-S3">S0::S1::S2::S3</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -2176,7 +2176,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0cf-S1-S2-S3-f3"><a href="#S0-0cf">S0</a>::<a href="#S0-0cf-S1">S1</a>::<a href="#S0-0cf-S1-S2">S2</a>::<a href="#S0-0cf-S1-S2-S3">S3</a>::f3</h2>
+<h2 id="S0-0cf-S1-S2-S3-f3"><a href="#S0-0cf-S1-S2-S3-f3">S0::S1::S2::S3::f3</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -2192,7 +2192,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0cf-S1-S2-S4"><a href="#S0-0cf">S0</a>::<a href="#S0-0cf-S1">S1</a>::<a href="#S0-0cf-S1-S2">S2</a>::S4</h2>
+<h2 id="S0-0cf-S1-S2-S4"><a href="#S0-0cf-S1-S2-S4">S0::S1::S2::S4</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -2225,7 +2225,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0cf-S1-S2-S4-f4"><a href="#S0-0cf">S0</a>::<a href="#S0-0cf-S1">S1</a>::<a href="#S0-0cf-S1-S2">S2</a>::<a href="#S0-0cf-S1-S2-S4">S4</a>::f4</h2>
+<h2 id="S0-0cf-S1-S2-S4-f4"><a href="#S0-0cf-S1-S2-S4-f4">S0::S1::S2::S4::f4</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -2241,7 +2241,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0cf-S1-S2-f2"><a href="#S0-0cf">S0</a>::<a href="#S0-0cf-S1">S1</a>::<a href="#S0-0cf-S1-S2">S2</a>::f2</h2>
+<h2 id="S0-0cf-S1-S2-f2"><a href="#S0-0cf-S1-S2-f2">S0::S1::S2::f2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -2257,7 +2257,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0cf-S1-f1"><a href="#S0-0cf">S0</a>::<a href="#S0-0cf-S1">S1</a>::f1</h2>
+<h2 id="S0-0cf-S1-f1"><a href="#S0-0cf-S1-f1">S0::S1::f1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -2273,7 +2273,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0cf-S5"><a href="#S0-0cf">S0</a>::S5</h2>
+<h2 id="S0-0cf-S5"><a href="#S0-0cf-S5">S0::S5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -2319,7 +2319,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0cf-S5-S6"><a href="#S0-0cf">S0</a>::<a href="#S0-0cf-S5">S5</a>::S6</h2>
+<h2 id="S0-0cf-S5-S6"><a href="#S0-0cf-S5-S6">S0::S5::S6</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -2362,7 +2362,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0cf-S5-S6-S7"><a href="#S0-0cf">S0</a>::<a href="#S0-0cf-S5">S5</a>::<a href="#S0-0cf-S5-S6">S6</a>::S7</h2>
+<h2 id="S0-0cf-S5-S6-S7"><a href="#S0-0cf-S5-S6-S7">S0::S5::S6::S7</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -2409,7 +2409,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0cf-S5-S6-S7-S8"><a href="#S0-0cf">S0</a>::<a href="#S0-0cf-S5">S5</a>::<a href="#S0-0cf-S5-S6">S6</a>::<a href="#S0-0cf-S5-S6-S7">S7</a>::S8</h2>
+<h2 id="S0-0cf-S5-S6-S7-S8"><a href="#S0-0cf-S5-S6-S7-S8">S0::S5::S6::S7::S8</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -2439,7 +2439,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0cf-S5-S6-S7-S8-f8"><a href="#S0-0cf">S0</a>::<a href="#S0-0cf-S5">S5</a>::<a href="#S0-0cf-S5-S6">S6</a>::<a href="#S0-0cf-S5-S6-S7">S7</a>::<a href="#S0-0cf-S5-S6-S7-S8">S8</a>::f8</h2>
+<h2 id="S0-0cf-S5-S6-S7-S8-f8"><a href="#S0-0cf-S5-S6-S7-S8-f8">S0::S5::S6::S7::S8::f8</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -2455,7 +2455,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0cf-S5-S6-S7-S9"><a href="#S0-0cf">S0</a>::<a href="#S0-0cf-S5">S5</a>::<a href="#S0-0cf-S5-S6">S6</a>::<a href="#S0-0cf-S5-S6-S7">S7</a>::S9</h2>
+<h2 id="S0-0cf-S5-S6-S7-S9"><a href="#S0-0cf-S5-S6-S7-S9">S0::S5::S6::S7::S9</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -2488,7 +2488,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0cf-S5-S6-S7-S9-f9"><a href="#S0-0cf">S0</a>::<a href="#S0-0cf-S5">S5</a>::<a href="#S0-0cf-S5-S6">S6</a>::<a href="#S0-0cf-S5-S6-S7">S7</a>::<a href="#S0-0cf-S5-S6-S7-S9">S9</a>::f9</h2>
+<h2 id="S0-0cf-S5-S6-S7-S9-f9"><a href="#S0-0cf-S5-S6-S7-S9-f9">S0::S5::S6::S7::S9::f9</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -2504,7 +2504,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0cf-S5-S6-S7-f7"><a href="#S0-0cf">S0</a>::<a href="#S0-0cf-S5">S5</a>::<a href="#S0-0cf-S5-S6">S6</a>::<a href="#S0-0cf-S5-S6-S7">S7</a>::f7</h2>
+<h2 id="S0-0cf-S5-S6-S7-f7"><a href="#S0-0cf-S5-S6-S7-f7">S0::S5::S6::S7::f7</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -2520,7 +2520,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0cf-S5-S6-f6"><a href="#S0-0cf">S0</a>::<a href="#S0-0cf-S5">S5</a>::<a href="#S0-0cf-S5-S6">S6</a>::f6</h2>
+<h2 id="S0-0cf-S5-S6-f6"><a href="#S0-0cf-S5-S6-f6">S0::S5::S6::f6</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -2536,7 +2536,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0cf-S5-f5"><a href="#S0-0cf">S0</a>::<a href="#S0-0cf-S5">S5</a>::f5</h2>
+<h2 id="S0-0cf-S5-f5"><a href="#S0-0cf-S5-f5">S0::S5::f5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -2552,7 +2552,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0cf-f0"><a href="#S0-0cf">S0</a>::f0</h2>
+<h2 id="S0-0cf-f0"><a href="#S0-0cf-f0">S0::f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -2568,7 +2568,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0be">S0&lt;0&gt;</h2>
+<h2 id="S0-0be"><a href="#S0-0be">S0&lt;0&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -2601,7 +2601,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-08">S0&lt;10&gt;</h2>
+<h2 id="S0-08"><a href="#S0-08">S0&lt;10&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -2646,7 +2646,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-08-S1"><a href="#S0-08">S0</a>&lt;10&gt;::S1</h2>
+<h2 id="S0-08-S1"><a href="#S0-08-S1">S0&lt;10&gt;::S1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -2690,7 +2690,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-08-S1-S2-0b"><a href="#S0-08">S0</a>&lt;10&gt;::<a href="#S0-08-S1">S1</a>::S2</h2>
+<h2 id="S0-08-S1-S2-0b"><a href="#S0-08-S1-S2-0b">S0&lt;10&gt;::S1::S2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -2710,7 +2710,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-08-S1-S2-08"><a href="#S0-08">S0</a>&lt;10&gt;::<a href="#S0-08-S1">S1</a>::S2&lt;11&gt;</h2>
+<h2 id="S0-08-S1-S2-08"><a href="#S0-08-S1-S2-08">S0&lt;10&gt;::S1::S2&lt;11&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -2755,7 +2755,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-08-S1-S2-08-S3"><a href="#S0-08">S0</a>&lt;10&gt;::<a href="#S0-08-S1">S1</a>::<a href="#S0-08-S1-S2-08">S2</a>&lt;11&gt;::S3</h2>
+<h2 id="S0-08-S1-S2-08-S3"><a href="#S0-08-S1-S2-08-S3">S0&lt;10&gt;::S1::S2&lt;11&gt;::S3</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -2772,7 +2772,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-08-S1-S2-08-S4"><a href="#S0-08">S0</a>&lt;10&gt;::<a href="#S0-08-S1">S1</a>::<a href="#S0-08-S1-S2-08">S2</a>&lt;11&gt;::S4</h2>
+<h2 id="S0-08-S1-S2-08-S4"><a href="#S0-08-S1-S2-08-S4">S0&lt;10&gt;::S1::S2&lt;11&gt;::S4</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -2807,7 +2807,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-08-S1-S2-08-f2"><a href="#S0-08">S0</a>&lt;10&gt;::<a href="#S0-08-S1">S1</a>::<a href="#S0-08-S1-S2-08">S2</a>&lt;11&gt;::f2</h2>
+<h2 id="S0-08-S1-S2-08-f2"><a href="#S0-08-S1-S2-08-f2">S0&lt;10&gt;::S1::S2&lt;11&gt;::f2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -2823,7 +2823,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-08-S1-f1"><a href="#S0-08">S0</a>&lt;10&gt;::<a href="#S0-08-S1">S1</a>::f1</h2>
+<h2 id="S0-08-S1-f1"><a href="#S0-08-S1-f1">S0&lt;10&gt;::S1::f1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -2839,7 +2839,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-08-S5"><a href="#S0-08">S0</a>&lt;10&gt;::S5</h2>
+<h2 id="S0-08-S5"><a href="#S0-08-S5">S0&lt;10&gt;::S5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -2859,7 +2859,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-08-f0"><a href="#S0-08">S0</a>&lt;10&gt;::f0</h2>
+<h2 id="S0-08-f0"><a href="#S0-08-f0">S0&lt;10&gt;::f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -2875,7 +2875,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0e">S0&lt;12&gt;</h2>
+<h2 id="S0-0e"><a href="#S0-0e">S0&lt;12&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -2920,7 +2920,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0e-S1"><a href="#S0-0e">S0</a>&lt;12&gt;::S1</h2>
+<h2 id="S0-0e-S1"><a href="#S0-0e-S1">S0&lt;12&gt;::S1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -2964,7 +2964,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0e-S1-S2-09"><a href="#S0-0e">S0</a>&lt;12&gt;::<a href="#S0-0e-S1">S1</a>::S2</h2>
+<h2 id="S0-0e-S1-S2-09"><a href="#S0-0e-S1-S2-09">S0&lt;12&gt;::S1::S2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -2984,7 +2984,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0e-S1-S2-02"><a href="#S0-0e">S0</a>&lt;12&gt;::<a href="#S0-0e-S1">S1</a>::S2&lt;13&gt;</h2>
+<h2 id="S0-0e-S1-S2-02"><a href="#S0-0e-S1-S2-02">S0&lt;12&gt;::S1::S2&lt;13&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -3030,7 +3030,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0e-S1-S2-02-S3"><a href="#S0-0e">S0</a>&lt;12&gt;::<a href="#S0-0e-S1">S1</a>::<a href="#S0-0e-S1-S2-02">S2</a>&lt;13&gt;::S3</h2>
+<h2 id="S0-0e-S1-S2-02-S3"><a href="#S0-0e-S1-S2-02-S3">S0&lt;12&gt;::S1::S2&lt;13&gt;::S3</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -3047,7 +3047,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0e-S1-S2-02-S4-00"><a href="#S0-0e">S0</a>&lt;12&gt;::<a href="#S0-0e-S1">S1</a>::<a href="#S0-0e-S1-S2-02">S2</a>&lt;13&gt;::S4</h2>
+<h2 id="S0-0e-S1-S2-02-S4-00"><a href="#S0-0e-S1-S2-02-S4-00">S0&lt;12&gt;::S1::S2&lt;13&gt;::S4</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -3067,7 +3067,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0e-S1-S2-02-S4-0c"><a href="#S0-0e">S0</a>&lt;12&gt;::<a href="#S0-0e-S1">S1</a>::<a href="#S0-0e-S1-S2-02">S2</a>&lt;13&gt;::S4&lt;14&gt;</h2>
+<h2 id="S0-0e-S1-S2-02-S4-0c"><a href="#S0-0e-S1-S2-02-S4-0c">S0&lt;12&gt;::S1::S2&lt;13&gt;::S4&lt;14&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -3100,7 +3100,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0e-S1-S2-02-f2"><a href="#S0-0e">S0</a>&lt;12&gt;::<a href="#S0-0e-S1">S1</a>::<a href="#S0-0e-S1-S2-02">S2</a>&lt;13&gt;::f2</h2>
+<h2 id="S0-0e-S1-S2-02-f2"><a href="#S0-0e-S1-S2-02-f2">S0&lt;12&gt;::S1::S2&lt;13&gt;::f2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -3116,7 +3116,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0e-S1-f1"><a href="#S0-0e">S0</a>&lt;12&gt;::<a href="#S0-0e-S1">S1</a>::f1</h2>
+<h2 id="S0-0e-S1-f1"><a href="#S0-0e-S1-f1">S0&lt;12&gt;::S1::f1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -3132,7 +3132,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0e-S5"><a href="#S0-0e">S0</a>&lt;12&gt;::S5</h2>
+<h2 id="S0-0e-S5"><a href="#S0-0e-S5">S0&lt;12&gt;::S5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -3152,7 +3152,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0e-f0"><a href="#S0-0e">S0</a>&lt;12&gt;::f0</h2>
+<h2 id="S0-0e-f0"><a href="#S0-0e-f0">S0&lt;12&gt;::f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -3168,7 +3168,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-09e4">S0&lt;15&gt;</h2>
+<h2 id="S0-09e4"><a href="#S0-09e4">S0&lt;15&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -3213,7 +3213,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-09e4-S1"><a href="#S0-09e4">S0</a>&lt;15&gt;::S1</h2>
+<h2 id="S0-09e4-S1"><a href="#S0-09e4-S1">S0&lt;15&gt;::S1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -3257,7 +3257,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-09e4-S1-S2-07"><a href="#S0-09e4">S0</a>&lt;15&gt;::<a href="#S0-09e4-S1">S1</a>::S2</h2>
+<h2 id="S0-09e4-S1-S2-07"><a href="#S0-09e4-S1-S2-07">S0&lt;15&gt;::S1::S2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -3277,7 +3277,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-09e4-S1-S2-02"><a href="#S0-09e4">S0</a>&lt;15&gt;::<a href="#S0-09e4-S1">S1</a>::S2&lt;16&gt;</h2>
+<h2 id="S0-09e4-S1-S2-02"><a href="#S0-09e4-S1-S2-02">S0&lt;15&gt;::S1::S2&lt;16&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -3324,7 +3324,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-09e4-S1-S2-02-S3"><a href="#S0-09e4">S0</a>&lt;15&gt;::<a href="#S0-09e4-S1">S1</a>::<a href="#S0-09e4-S1-S2-02">S2</a>&lt;16&gt;::S3</h2>
+<h2 id="S0-09e4-S1-S2-02-S3"><a href="#S0-09e4-S1-S2-02-S3">S0&lt;15&gt;::S1::S2&lt;16&gt;::S3</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -3341,7 +3341,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-09e4-S1-S2-02-S4-00"><a href="#S0-09e4">S0</a>&lt;15&gt;::<a href="#S0-09e4-S1">S1</a>::<a href="#S0-09e4-S1-S2-02">S2</a>&lt;16&gt;::S4</h2>
+<h2 id="S0-09e4-S1-S2-02-S4-00"><a href="#S0-09e4-S1-S2-02-S4-00">S0&lt;15&gt;::S1::S2&lt;16&gt;::S4</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -3376,7 +3376,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-09e4-S1-S2-02-S4-02"><a href="#S0-09e4">S0</a>&lt;15&gt;::<a href="#S0-09e4-S1">S1</a>::<a href="#S0-09e4-S1-S2-02">S2</a>&lt;16&gt;::S4&lt;17, int*&gt;</h2>
+<h2 id="S0-09e4-S1-S2-02-S4-02"><a href="#S0-09e4-S1-S2-02-S4-02">S0&lt;15&gt;::S1::S2&lt;16&gt;::S4&lt;17, int*&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -3409,7 +3409,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-09e4-S1-S2-02-S4-07"><a href="#S0-09e4">S0</a>&lt;15&gt;::<a href="#S0-09e4-S1">S1</a>::<a href="#S0-09e4-S1-S2-02">S2</a>&lt;16&gt;::S4&lt;17, T*&gt;</h2>
+<h2 id="S0-09e4-S1-S2-02-S4-07"><a href="#S0-09e4-S1-S2-02-S4-07">S0&lt;15&gt;::S1::S2&lt;16&gt;::S4&lt;17, T*&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -3427,7 +3427,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-09e4-S1-S2-02-f2"><a href="#S0-09e4">S0</a>&lt;15&gt;::<a href="#S0-09e4-S1">S1</a>::<a href="#S0-09e4-S1-S2-02">S2</a>&lt;16&gt;::f2</h2>
+<h2 id="S0-09e4-S1-S2-02-f2"><a href="#S0-09e4-S1-S2-02-f2">S0&lt;15&gt;::S1::S2&lt;16&gt;::f2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -3443,7 +3443,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-09e4-S1-f1"><a href="#S0-09e4">S0</a>&lt;15&gt;::<a href="#S0-09e4-S1">S1</a>::f1</h2>
+<h2 id="S0-09e4-S1-f1"><a href="#S0-09e4-S1-f1">S0&lt;15&gt;::S1::f1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -3459,7 +3459,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-09e4-S5"><a href="#S0-09e4">S0</a>&lt;15&gt;::S5</h2>
+<h2 id="S0-09e4-S5"><a href="#S0-09e4-S5">S0&lt;15&gt;::S5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -3479,7 +3479,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-09e4-f0"><a href="#S0-09e4">S0</a>&lt;15&gt;::f0</h2>
+<h2 id="S0-09e4-f0"><a href="#S0-09e4-f0">S0&lt;15&gt;::f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -3495,7 +3495,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-07a">S0&lt;18&gt;</h2>
+<h2 id="S0-07a"><a href="#S0-07a">S0&lt;18&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -3540,7 +3540,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-07a-S1"><a href="#S0-07a">S0</a>&lt;18&gt;::S1</h2>
+<h2 id="S0-07a-S1"><a href="#S0-07a-S1">S0&lt;18&gt;::S1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -3557,7 +3557,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-07a-S5"><a href="#S0-07a">S0</a>&lt;18&gt;::S5</h2>
+<h2 id="S0-07a-S5"><a href="#S0-07a-S5">S0&lt;18&gt;::S5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -3592,7 +3592,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-07a-f0"><a href="#S0-07a">S0</a>&lt;18&gt;::f0</h2>
+<h2 id="S0-07a-f0"><a href="#S0-07a-f0">S0&lt;18&gt;::f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -3608,7 +3608,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0a7">S0&lt;19&gt;</h2>
+<h2 id="S0-0a7"><a href="#S0-0a7">S0&lt;19&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -3654,7 +3654,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0a7-S1"><a href="#S0-0a7">S0</a>&lt;19&gt;::S1</h2>
+<h2 id="S0-0a7-S1"><a href="#S0-0a7-S1">S0&lt;19&gt;::S1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -3671,7 +3671,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0a7-S5-03"><a href="#S0-0a7">S0</a>&lt;19&gt;::S5</h2>
+<h2 id="S0-0a7-S5-03"><a href="#S0-0a7-S5-03">S0&lt;19&gt;::S5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -3691,7 +3691,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0a7-S5-07"><a href="#S0-0a7">S0</a>&lt;19&gt;::S5&lt;20&gt;</h2>
+<h2 id="S0-0a7-S5-07"><a href="#S0-0a7-S5-07">S0&lt;19&gt;::S5&lt;20&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -3724,7 +3724,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0a7-f0"><a href="#S0-0a7">S0</a>&lt;19&gt;::f0</h2>
+<h2 id="S0-0a7-f0"><a href="#S0-0a7-f0">S0&lt;19&gt;::f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -3740,7 +3740,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-09c">S0&lt;2&gt;</h2>
+<h2 id="S0-09c"><a href="#S0-09c">S0&lt;2&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -3785,7 +3785,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-09c-S1"><a href="#S0-09c">S0</a>&lt;2&gt;::S1</h2>
+<h2 id="S0-09c-S1"><a href="#S0-09c-S1">S0&lt;2&gt;::S1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -3817,7 +3817,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-09c-S5"><a href="#S0-09c">S0</a>&lt;2&gt;::S5</h2>
+<h2 id="S0-09c-S5"><a href="#S0-09c-S5">S0&lt;2&gt;::S5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -3837,7 +3837,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-09c-f0"><a href="#S0-09c">S0</a>&lt;2&gt;::f0</h2>
+<h2 id="S0-09c-f0"><a href="#S0-09c-f0">S0&lt;2&gt;::f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -3853,7 +3853,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0314">S0&lt;21&gt;</h2>
+<h2 id="S0-0314"><a href="#S0-0314">S0&lt;21&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -3900,7 +3900,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0314-S1"><a href="#S0-0314">S0</a>&lt;21&gt;::S1</h2>
+<h2 id="S0-0314-S1"><a href="#S0-0314-S1">S0&lt;21&gt;::S1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -3917,7 +3917,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0314-S5-07"><a href="#S0-0314">S0</a>&lt;21&gt;::S5</h2>
+<h2 id="S0-0314-S5-07"><a href="#S0-0314-S5-07">S0&lt;21&gt;::S5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -3952,7 +3952,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0314-S5-03"><a href="#S0-0314">S0</a>&lt;21&gt;::S5&lt;22, int*&gt;</h2>
+<h2 id="S0-0314-S5-03"><a href="#S0-0314-S5-03">S0&lt;21&gt;::S5&lt;22, int*&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -3985,7 +3985,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0314-S5-0b"><a href="#S0-0314">S0</a>&lt;21&gt;::S5&lt;22, T*&gt;</h2>
+<h2 id="S0-0314-S5-0b"><a href="#S0-0314-S5-0b">S0&lt;21&gt;::S5&lt;22, T*&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -4003,7 +4003,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0314-f0"><a href="#S0-0314">S0</a>&lt;21&gt;::f0</h2>
+<h2 id="S0-0314-f0"><a href="#S0-0314-f0">S0&lt;21&gt;::f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -4019,7 +4019,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-058">S0&lt;23&gt;</h2>
+<h2 id="S0-058"><a href="#S0-058">S0&lt;23&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -4065,7 +4065,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-058-S1"><a href="#S0-058">S0</a>&lt;23&gt;::S1</h2>
+<h2 id="S0-058-S1"><a href="#S0-058-S1">S0&lt;23&gt;::S1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -4082,7 +4082,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-058-S5-0b"><a href="#S0-058">S0</a>&lt;23&gt;::S5</h2>
+<h2 id="S0-058-S5-0b"><a href="#S0-058-S5-0b">S0&lt;23&gt;::S5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -4102,7 +4102,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-058-S5-09"><a href="#S0-058">S0</a>&lt;23&gt;::S5&lt;24&gt;</h2>
+<h2 id="S0-058-S5-09"><a href="#S0-058-S5-09">S0&lt;23&gt;::S5&lt;24&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -4146,7 +4146,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-058-S5-09-S6"><a href="#S0-058">S0</a>&lt;23&gt;::<a href="#S0-058-S5-09">S5</a>&lt;24&gt;::S6</h2>
+<h2 id="S0-058-S5-09-S6"><a href="#S0-058-S5-09-S6">S0&lt;23&gt;::S5&lt;24&gt;::S6</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -4178,7 +4178,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-058-S5-09-f5"><a href="#S0-058">S0</a>&lt;23&gt;::<a href="#S0-058-S5-09">S5</a>&lt;24&gt;::f5</h2>
+<h2 id="S0-058-S5-09-f5"><a href="#S0-058-S5-09-f5">S0&lt;23&gt;::S5&lt;24&gt;::f5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -4194,7 +4194,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-058-f0"><a href="#S0-058">S0</a>&lt;23&gt;::f0</h2>
+<h2 id="S0-058-f0"><a href="#S0-058-f0">S0&lt;23&gt;::f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -4210,7 +4210,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0a2">S0&lt;25&gt;</h2>
+<h2 id="S0-0a2"><a href="#S0-0a2">S0&lt;25&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -4256,7 +4256,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0a2-S1"><a href="#S0-0a2">S0</a>&lt;25&gt;::S1</h2>
+<h2 id="S0-0a2-S1"><a href="#S0-0a2-S1">S0&lt;25&gt;::S1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -4273,7 +4273,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0a2-S5-04"><a href="#S0-0a2">S0</a>&lt;25&gt;::S5</h2>
+<h2 id="S0-0a2-S5-04"><a href="#S0-0a2-S5-04">S0&lt;25&gt;::S5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -4293,7 +4293,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0a2-S5-02"><a href="#S0-0a2">S0</a>&lt;25&gt;::S5&lt;26&gt;</h2>
+<h2 id="S0-0a2-S5-02"><a href="#S0-0a2-S5-02">S0&lt;25&gt;::S5&lt;26&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -4337,7 +4337,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0a2-S5-02-S6"><a href="#S0-0a2">S0</a>&lt;25&gt;::<a href="#S0-0a2-S5-02">S5</a>&lt;26&gt;::S6</h2>
+<h2 id="S0-0a2-S5-02-S6"><a href="#S0-0a2-S5-02-S6">S0&lt;25&gt;::S5&lt;26&gt;::S6</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -4380,7 +4380,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0a2-S5-02-S6-S7"><a href="#S0-0a2">S0</a>&lt;25&gt;::<a href="#S0-0a2-S5-02">S5</a>&lt;26&gt;::<a href="#S0-0a2-S5-02-S6">S6</a>::S7</h2>
+<h2 id="S0-0a2-S5-02-S6-S7"><a href="#S0-0a2-S5-02-S6-S7">S0&lt;25&gt;::S5&lt;26&gt;::S6::S7</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -4415,7 +4415,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0a2-S5-02-S6-f6"><a href="#S0-0a2">S0</a>&lt;25&gt;::<a href="#S0-0a2-S5-02">S5</a>&lt;26&gt;::<a href="#S0-0a2-S5-02-S6">S6</a>::f6</h2>
+<h2 id="S0-0a2-S5-02-S6-f6"><a href="#S0-0a2-S5-02-S6-f6">S0&lt;25&gt;::S5&lt;26&gt;::S6::f6</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -4431,7 +4431,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0a2-S5-02-f5"><a href="#S0-0a2">S0</a>&lt;25&gt;::<a href="#S0-0a2-S5-02">S5</a>&lt;26&gt;::f5</h2>
+<h2 id="S0-0a2-S5-02-f5"><a href="#S0-0a2-S5-02-f5">S0&lt;25&gt;::S5&lt;26&gt;::f5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -4447,7 +4447,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0a2-f0"><a href="#S0-0a2">S0</a>&lt;25&gt;::f0</h2>
+<h2 id="S0-0a2-f0"><a href="#S0-0a2-f0">S0&lt;25&gt;::f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -4463,7 +4463,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-09e2">S0&lt;27&gt;</h2>
+<h2 id="S0-09e2"><a href="#S0-09e2">S0&lt;27&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -4509,7 +4509,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-09e2-S1"><a href="#S0-09e2">S0</a>&lt;27&gt;::S1</h2>
+<h2 id="S0-09e2-S1"><a href="#S0-09e2-S1">S0&lt;27&gt;::S1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -4526,7 +4526,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-09e2-S5-0b"><a href="#S0-09e2">S0</a>&lt;27&gt;::S5</h2>
+<h2 id="S0-09e2-S5-0b"><a href="#S0-09e2-S5-0b">S0&lt;27&gt;::S5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -4546,7 +4546,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-09e2-S5-0c"><a href="#S0-09e2">S0</a>&lt;27&gt;::S5&lt;28&gt;</h2>
+<h2 id="S0-09e2-S5-0c"><a href="#S0-09e2-S5-0c">S0&lt;27&gt;::S5&lt;28&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -4590,7 +4590,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-09e2-S5-0c-S6"><a href="#S0-09e2">S0</a>&lt;27&gt;::<a href="#S0-09e2-S5-0c">S5</a>&lt;28&gt;::S6</h2>
+<h2 id="S0-09e2-S5-0c-S6"><a href="#S0-09e2-S5-0c-S6">S0&lt;27&gt;::S5&lt;28&gt;::S6</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -4635,7 +4635,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-09e2-S5-0c-S6-S7-0b"><a href="#S0-09e2">S0</a>&lt;27&gt;::<a href="#S0-09e2-S5-0c">S5</a>&lt;28&gt;::<a href="#S0-09e2-S5-0c-S6">S6</a>::S7</h2>
+<h2 id="S0-09e2-S5-0c-S6-S7-0b"><a href="#S0-09e2-S5-0c-S6-S7-0b">S0&lt;27&gt;::S5&lt;28&gt;::S6::S7</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -4670,7 +4670,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-09e2-S5-0c-S6-S7-0d"><a href="#S0-09e2">S0</a>&lt;27&gt;::<a href="#S0-09e2-S5-0c">S5</a>&lt;28&gt;::<a href="#S0-09e2-S5-0c-S6">S6</a>::S7&lt;29, int*&gt;</h2>
+<h2 id="S0-09e2-S5-0c-S6-S7-0d"><a href="#S0-09e2-S5-0c-S6-S7-0d">S0&lt;27&gt;::S5&lt;28&gt;::S6::S7&lt;29, int*&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -4703,7 +4703,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-09e2-S5-0c-S6-S7-0a"><a href="#S0-09e2">S0</a>&lt;27&gt;::<a href="#S0-09e2-S5-0c">S5</a>&lt;28&gt;::<a href="#S0-09e2-S5-0c-S6">S6</a>::S7&lt;29, T*&gt;</h2>
+<h2 id="S0-09e2-S5-0c-S6-S7-0a"><a href="#S0-09e2-S5-0c-S6-S7-0a">S0&lt;27&gt;::S5&lt;28&gt;::S6::S7&lt;29, T*&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -4721,7 +4721,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-09e2-S5-0c-S6-f6"><a href="#S0-09e2">S0</a>&lt;27&gt;::<a href="#S0-09e2-S5-0c">S5</a>&lt;28&gt;::<a href="#S0-09e2-S5-0c-S6">S6</a>::f6</h2>
+<h2 id="S0-09e2-S5-0c-S6-f6"><a href="#S0-09e2-S5-0c-S6-f6">S0&lt;27&gt;::S5&lt;28&gt;::S6::f6</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -4737,7 +4737,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-09e2-S5-0c-f5"><a href="#S0-09e2">S0</a>&lt;27&gt;::<a href="#S0-09e2-S5-0c">S5</a>&lt;28&gt;::f5</h2>
+<h2 id="S0-09e2-S5-0c-f5"><a href="#S0-09e2-S5-0c-f5">S0&lt;27&gt;::S5&lt;28&gt;::f5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -4753,7 +4753,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-09e2-f0"><a href="#S0-09e2">S0</a>&lt;27&gt;::f0</h2>
+<h2 id="S0-09e2-f0"><a href="#S0-09e2-f0">S0&lt;27&gt;::f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -4769,7 +4769,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-073">S0&lt;3&gt;</h2>
+<h2 id="S0-073"><a href="#S0-073">S0&lt;3&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -4814,7 +4814,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-073-S1"><a href="#S0-073">S0</a>&lt;3&gt;::S1</h2>
+<h2 id="S0-073-S1"><a href="#S0-073-S1">S0&lt;3&gt;::S1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -4857,7 +4857,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-073-S1-S2"><a href="#S0-073">S0</a>&lt;3&gt;::<a href="#S0-073-S1">S1</a>::S2</h2>
+<h2 id="S0-073-S1-S2"><a href="#S0-073-S1-S2">S0&lt;3&gt;::S1::S2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -4892,7 +4892,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-073-S1-f1"><a href="#S0-073">S0</a>&lt;3&gt;::<a href="#S0-073-S1">S1</a>::f1</h2>
+<h2 id="S0-073-S1-f1"><a href="#S0-073-S1-f1">S0&lt;3&gt;::S1::f1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -4908,7 +4908,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-073-S5"><a href="#S0-073">S0</a>&lt;3&gt;::S5</h2>
+<h2 id="S0-073-S5"><a href="#S0-073-S5">S0&lt;3&gt;::S5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -4928,7 +4928,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-073-f0"><a href="#S0-073">S0</a>&lt;3&gt;::f0</h2>
+<h2 id="S0-073-f0"><a href="#S0-073-f0">S0&lt;3&gt;::f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -4944,7 +4944,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-01">S0&lt;30&gt;</h2>
+<h2 id="S0-01"><a href="#S0-01">S0&lt;30&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -4990,7 +4990,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-01-S1"><a href="#S0-01">S0</a>&lt;30&gt;::S1</h2>
+<h2 id="S0-01-S1"><a href="#S0-01-S1">S0&lt;30&gt;::S1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -5007,7 +5007,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-01-S5-07"><a href="#S0-01">S0</a>&lt;30&gt;::S5</h2>
+<h2 id="S0-01-S5-07"><a href="#S0-01-S5-07">S0&lt;30&gt;::S5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -5027,7 +5027,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-01-S5-04"><a href="#S0-01">S0</a>&lt;30&gt;::S5&lt;31&gt;</h2>
+<h2 id="S0-01-S5-04"><a href="#S0-01-S5-04">S0&lt;30&gt;::S5&lt;31&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -5071,7 +5071,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-01-S5-04-S6"><a href="#S0-01">S0</a>&lt;30&gt;::<a href="#S0-01-S5-04">S5</a>&lt;31&gt;::S6</h2>
+<h2 id="S0-01-S5-04-S6"><a href="#S0-01-S5-04-S6">S0&lt;30&gt;::S5&lt;31&gt;::S6</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -5115,7 +5115,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-01-S5-04-S6-S7-0c"><a href="#S0-01">S0</a>&lt;30&gt;::<a href="#S0-01-S5-04">S5</a>&lt;31&gt;::<a href="#S0-01-S5-04-S6">S6</a>::S7</h2>
+<h2 id="S0-01-S5-04-S6-S7-0c"><a href="#S0-01-S5-04-S6-S7-0c">S0&lt;30&gt;::S5&lt;31&gt;::S6::S7</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -5135,7 +5135,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-01-S5-04-S6-S7-05"><a href="#S0-01">S0</a>&lt;30&gt;::<a href="#S0-01-S5-04">S5</a>&lt;31&gt;::<a href="#S0-01-S5-04-S6">S6</a>::S7&lt;32&gt;</h2>
+<h2 id="S0-01-S5-04-S6-S7-05"><a href="#S0-01-S5-04-S6-S7-05">S0&lt;30&gt;::S5&lt;31&gt;::S6::S7&lt;32&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -5168,7 +5168,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-01-S5-04-S6-f6"><a href="#S0-01">S0</a>&lt;30&gt;::<a href="#S0-01-S5-04">S5</a>&lt;31&gt;::<a href="#S0-01-S5-04-S6">S6</a>::f6</h2>
+<h2 id="S0-01-S5-04-S6-f6"><a href="#S0-01-S5-04-S6-f6">S0&lt;30&gt;::S5&lt;31&gt;::S6::f6</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -5184,7 +5184,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-01-S5-04-f5"><a href="#S0-01">S0</a>&lt;30&gt;::<a href="#S0-01-S5-04">S5</a>&lt;31&gt;::f5</h2>
+<h2 id="S0-01-S5-04-f5"><a href="#S0-01-S5-04-f5">S0&lt;30&gt;::S5&lt;31&gt;::f5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -5200,7 +5200,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-01-f0"><a href="#S0-01">S0</a>&lt;30&gt;::f0</h2>
+<h2 id="S0-01-f0"><a href="#S0-01-f0">S0&lt;30&gt;::f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -5216,7 +5216,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-09ee">S0&lt;33&gt;</h2>
+<h2 id="S0-09ee"><a href="#S0-09ee">S0&lt;33&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -5262,7 +5262,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-09ee-S1"><a href="#S0-09ee">S0</a>&lt;33&gt;::S1</h2>
+<h2 id="S0-09ee-S1"><a href="#S0-09ee-S1">S0&lt;33&gt;::S1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -5279,7 +5279,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-09ee-S5-0b"><a href="#S0-09ee">S0</a>&lt;33&gt;::S5</h2>
+<h2 id="S0-09ee-S5-0b"><a href="#S0-09ee-S5-0b">S0&lt;33&gt;::S5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -5299,7 +5299,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-09ee-S5-02"><a href="#S0-09ee">S0</a>&lt;33&gt;::S5&lt;34&gt;</h2>
+<h2 id="S0-09ee-S5-02"><a href="#S0-09ee-S5-02">S0&lt;33&gt;::S5&lt;34&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -5343,7 +5343,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-09ee-S5-02-S6"><a href="#S0-09ee">S0</a>&lt;33&gt;::<a href="#S0-09ee-S5-02">S5</a>&lt;34&gt;::S6</h2>
+<h2 id="S0-09ee-S5-02-S6"><a href="#S0-09ee-S5-02-S6">S0&lt;33&gt;::S5&lt;34&gt;::S6</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -5387,7 +5387,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-09ee-S5-02-S6-S7-09"><a href="#S0-09ee">S0</a>&lt;33&gt;::<a href="#S0-09ee-S5-02">S5</a>&lt;34&gt;::<a href="#S0-09ee-S5-02-S6">S6</a>::S7</h2>
+<h2 id="S0-09ee-S5-02-S6-S7-09"><a href="#S0-09ee-S5-02-S6-S7-09">S0&lt;33&gt;::S5&lt;34&gt;::S6::S7</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -5407,7 +5407,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-09ee-S5-02-S6-S7-03"><a href="#S0-09ee">S0</a>&lt;33&gt;::<a href="#S0-09ee-S5-02">S5</a>&lt;34&gt;::<a href="#S0-09ee-S5-02-S6">S6</a>::S7&lt;35&gt;</h2>
+<h2 id="S0-09ee-S5-02-S6-S7-03"><a href="#S0-09ee-S5-02-S6-S7-03">S0&lt;33&gt;::S5&lt;34&gt;::S6::S7&lt;35&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -5452,7 +5452,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-09ee-S5-02-S6-S7-03-S8"><a href="#S0-09ee">S0</a>&lt;33&gt;::<a href="#S0-09ee-S5-02">S5</a>&lt;34&gt;::<a href="#S0-09ee-S5-02-S6">S6</a>::<a href="#S0-09ee-S5-02-S6-S7-03">S7</a>&lt;35&gt;::S8</h2>
+<h2 id="S0-09ee-S5-02-S6-S7-03-S8"><a href="#S0-09ee-S5-02-S6-S7-03-S8">S0&lt;33&gt;::S5&lt;34&gt;::S6::S7&lt;35&gt;::S8</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -5484,7 +5484,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-09ee-S5-02-S6-S7-03-S9"><a href="#S0-09ee">S0</a>&lt;33&gt;::<a href="#S0-09ee-S5-02">S5</a>&lt;34&gt;::<a href="#S0-09ee-S5-02-S6">S6</a>::<a href="#S0-09ee-S5-02-S6-S7-03">S7</a>&lt;35&gt;::S9</h2>
+<h2 id="S0-09ee-S5-02-S6-S7-03-S9"><a href="#S0-09ee-S5-02-S6-S7-03-S9">S0&lt;33&gt;::S5&lt;34&gt;::S6::S7&lt;35&gt;::S9</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -5504,7 +5504,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-09ee-S5-02-S6-S7-03-f7"><a href="#S0-09ee">S0</a>&lt;33&gt;::<a href="#S0-09ee-S5-02">S5</a>&lt;34&gt;::<a href="#S0-09ee-S5-02-S6">S6</a>::<a href="#S0-09ee-S5-02-S6-S7-03">S7</a>&lt;35&gt;::f7</h2>
+<h2 id="S0-09ee-S5-02-S6-S7-03-f7"><a href="#S0-09ee-S5-02-S6-S7-03-f7">S0&lt;33&gt;::S5&lt;34&gt;::S6::S7&lt;35&gt;::f7</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -5520,7 +5520,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-09ee-S5-02-S6-f6"><a href="#S0-09ee">S0</a>&lt;33&gt;::<a href="#S0-09ee-S5-02">S5</a>&lt;34&gt;::<a href="#S0-09ee-S5-02-S6">S6</a>::f6</h2>
+<h2 id="S0-09ee-S5-02-S6-f6"><a href="#S0-09ee-S5-02-S6-f6">S0&lt;33&gt;::S5&lt;34&gt;::S6::f6</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -5536,7 +5536,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-09ee-S5-02-f5"><a href="#S0-09ee">S0</a>&lt;33&gt;::<a href="#S0-09ee-S5-02">S5</a>&lt;34&gt;::f5</h2>
+<h2 id="S0-09ee-S5-02-f5"><a href="#S0-09ee-S5-02-f5">S0&lt;33&gt;::S5&lt;34&gt;::f5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -5552,7 +5552,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-09ee-f0"><a href="#S0-09ee">S0</a>&lt;33&gt;::f0</h2>
+<h2 id="S0-09ee-f0"><a href="#S0-09ee-f0">S0&lt;33&gt;::f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -5568,7 +5568,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-033">S0&lt;36&gt;</h2>
+<h2 id="S0-033"><a href="#S0-033">S0&lt;36&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -5614,7 +5614,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-033-S1"><a href="#S0-033">S0</a>&lt;36&gt;::S1</h2>
+<h2 id="S0-033-S1"><a href="#S0-033-S1">S0&lt;36&gt;::S1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -5631,7 +5631,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-033-S5-03"><a href="#S0-033">S0</a>&lt;36&gt;::S5</h2>
+<h2 id="S0-033-S5-03"><a href="#S0-033-S5-03">S0&lt;36&gt;::S5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -5651,7 +5651,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-033-S5-0f"><a href="#S0-033">S0</a>&lt;36&gt;::S5&lt;37&gt;</h2>
+<h2 id="S0-033-S5-0f"><a href="#S0-033-S5-0f">S0&lt;36&gt;::S5&lt;37&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -5695,7 +5695,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-033-S5-0f-S6"><a href="#S0-033">S0</a>&lt;36&gt;::<a href="#S0-033-S5-0f">S5</a>&lt;37&gt;::S6</h2>
+<h2 id="S0-033-S5-0f-S6"><a href="#S0-033-S5-0f-S6">S0&lt;36&gt;::S5&lt;37&gt;::S6</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -5739,7 +5739,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-033-S5-0f-S6-S7-05"><a href="#S0-033">S0</a>&lt;36&gt;::<a href="#S0-033-S5-0f">S5</a>&lt;37&gt;::<a href="#S0-033-S5-0f-S6">S6</a>::S7</h2>
+<h2 id="S0-033-S5-0f-S6-S7-05"><a href="#S0-033-S5-0f-S6-S7-05">S0&lt;36&gt;::S5&lt;37&gt;::S6::S7</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -5759,7 +5759,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-033-S5-0f-S6-S7-0d"><a href="#S0-033">S0</a>&lt;36&gt;::<a href="#S0-033-S5-0f">S5</a>&lt;37&gt;::<a href="#S0-033-S5-0f-S6">S6</a>::S7&lt;38&gt;</h2>
+<h2 id="S0-033-S5-0f-S6-S7-0d"><a href="#S0-033-S5-0f-S6-S7-0d">S0&lt;36&gt;::S5&lt;37&gt;::S6::S7&lt;38&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -5804,7 +5804,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-033-S5-0f-S6-S7-0d-S8"><a href="#S0-033">S0</a>&lt;36&gt;::<a href="#S0-033-S5-0f">S5</a>&lt;37&gt;::<a href="#S0-033-S5-0f-S6">S6</a>::<a href="#S0-033-S5-0f-S6-S7-0d">S7</a>&lt;38&gt;::S8</h2>
+<h2 id="S0-033-S5-0f-S6-S7-0d-S8"><a href="#S0-033-S5-0f-S6-S7-0d-S8">S0&lt;36&gt;::S5&lt;37&gt;::S6::S7&lt;38&gt;::S8</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -5821,7 +5821,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-033-S5-0f-S6-S7-0d-S9"><a href="#S0-033">S0</a>&lt;36&gt;::<a href="#S0-033-S5-0f">S5</a>&lt;37&gt;::<a href="#S0-033-S5-0f-S6">S6</a>::<a href="#S0-033-S5-0f-S6-S7-0d">S7</a>&lt;38&gt;::S9</h2>
+<h2 id="S0-033-S5-0f-S6-S7-0d-S9"><a href="#S0-033-S5-0f-S6-S7-0d-S9">S0&lt;36&gt;::S5&lt;37&gt;::S6::S7&lt;38&gt;::S9</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -5856,7 +5856,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-033-S5-0f-S6-S7-0d-f7"><a href="#S0-033">S0</a>&lt;36&gt;::<a href="#S0-033-S5-0f">S5</a>&lt;37&gt;::<a href="#S0-033-S5-0f-S6">S6</a>::<a href="#S0-033-S5-0f-S6-S7-0d">S7</a>&lt;38&gt;::f7</h2>
+<h2 id="S0-033-S5-0f-S6-S7-0d-f7"><a href="#S0-033-S5-0f-S6-S7-0d-f7">S0&lt;36&gt;::S5&lt;37&gt;::S6::S7&lt;38&gt;::f7</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -5872,7 +5872,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-033-S5-0f-S6-f6"><a href="#S0-033">S0</a>&lt;36&gt;::<a href="#S0-033-S5-0f">S5</a>&lt;37&gt;::<a href="#S0-033-S5-0f-S6">S6</a>::f6</h2>
+<h2 id="S0-033-S5-0f-S6-f6"><a href="#S0-033-S5-0f-S6-f6">S0&lt;36&gt;::S5&lt;37&gt;::S6::f6</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -5888,7 +5888,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-033-S5-0f-f5"><a href="#S0-033">S0</a>&lt;36&gt;::<a href="#S0-033-S5-0f">S5</a>&lt;37&gt;::f5</h2>
+<h2 id="S0-033-S5-0f-f5"><a href="#S0-033-S5-0f-f5">S0&lt;36&gt;::S5&lt;37&gt;::f5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -5904,7 +5904,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-033-f0"><a href="#S0-033">S0</a>&lt;36&gt;::f0</h2>
+<h2 id="S0-033-f0"><a href="#S0-033-f0">S0&lt;36&gt;::f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -5920,7 +5920,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-06">S0&lt;39&gt;</h2>
+<h2 id="S0-06"><a href="#S0-06">S0&lt;39&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -5966,7 +5966,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-06-S1"><a href="#S0-06">S0</a>&lt;39&gt;::S1</h2>
+<h2 id="S0-06-S1"><a href="#S0-06-S1">S0&lt;39&gt;::S1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -5983,7 +5983,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-06-S5-03"><a href="#S0-06">S0</a>&lt;39&gt;::S5</h2>
+<h2 id="S0-06-S5-03"><a href="#S0-06-S5-03">S0&lt;39&gt;::S5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -6003,7 +6003,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-06-S5-07"><a href="#S0-06">S0</a>&lt;39&gt;::S5&lt;40&gt;</h2>
+<h2 id="S0-06-S5-07"><a href="#S0-06-S5-07">S0&lt;39&gt;::S5&lt;40&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -6047,7 +6047,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-06-S5-07-S6"><a href="#S0-06">S0</a>&lt;39&gt;::<a href="#S0-06-S5-07">S5</a>&lt;40&gt;::S6</h2>
+<h2 id="S0-06-S5-07-S6"><a href="#S0-06-S5-07-S6">S0&lt;39&gt;::S5&lt;40&gt;::S6</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -6091,7 +6091,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-06-S5-07-S6-S7-08"><a href="#S0-06">S0</a>&lt;39&gt;::<a href="#S0-06-S5-07">S5</a>&lt;40&gt;::<a href="#S0-06-S5-07-S6">S6</a>::S7</h2>
+<h2 id="S0-06-S5-07-S6-S7-08"><a href="#S0-06-S5-07-S6-S7-08">S0&lt;39&gt;::S5&lt;40&gt;::S6::S7</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -6111,7 +6111,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-06-S5-07-S6-S7-0a"><a href="#S0-06">S0</a>&lt;39&gt;::<a href="#S0-06-S5-07">S5</a>&lt;40&gt;::<a href="#S0-06-S5-07-S6">S6</a>::S7&lt;41&gt;</h2>
+<h2 id="S0-06-S5-07-S6-S7-0a"><a href="#S0-06-S5-07-S6-S7-0a">S0&lt;39&gt;::S5&lt;40&gt;::S6::S7&lt;41&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -6158,7 +6158,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-06-S5-07-S6-S7-0a-S8"><a href="#S0-06">S0</a>&lt;39&gt;::<a href="#S0-06-S5-07">S5</a>&lt;40&gt;::<a href="#S0-06-S5-07-S6">S6</a>::<a href="#S0-06-S5-07-S6-S7-0a">S7</a>&lt;41&gt;::S8</h2>
+<h2 id="S0-06-S5-07-S6-S7-0a-S8"><a href="#S0-06-S5-07-S6-S7-0a-S8">S0&lt;39&gt;::S5&lt;40&gt;::S6::S7&lt;41&gt;::S8</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -6175,7 +6175,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-06-S5-07-S6-S7-0a-S9-05"><a href="#S0-06">S0</a>&lt;39&gt;::<a href="#S0-06-S5-07">S5</a>&lt;40&gt;::<a href="#S0-06-S5-07-S6">S6</a>::<a href="#S0-06-S5-07-S6-S7-0a">S7</a>&lt;41&gt;::S9</h2>
+<h2 id="S0-06-S5-07-S6-S7-0a-S9-05"><a href="#S0-06-S5-07-S6-S7-0a-S9-05">S0&lt;39&gt;::S5&lt;40&gt;::S6::S7&lt;41&gt;::S9</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -6210,7 +6210,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-06-S5-07-S6-S7-0a-S9-08"><a href="#S0-06">S0</a>&lt;39&gt;::<a href="#S0-06-S5-07">S5</a>&lt;40&gt;::<a href="#S0-06-S5-07-S6">S6</a>::<a href="#S0-06-S5-07-S6-S7-0a">S7</a>&lt;41&gt;::S9&lt;42, int*&gt;</h2>
+<h2 id="S0-06-S5-07-S6-S7-0a-S9-08"><a href="#S0-06-S5-07-S6-S7-0a-S9-08">S0&lt;39&gt;::S5&lt;40&gt;::S6::S7&lt;41&gt;::S9&lt;42, int*&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -6243,7 +6243,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-06-S5-07-S6-S7-0a-S9-00"><a href="#S0-06">S0</a>&lt;39&gt;::<a href="#S0-06-S5-07">S5</a>&lt;40&gt;::<a href="#S0-06-S5-07-S6">S6</a>::<a href="#S0-06-S5-07-S6-S7-0a">S7</a>&lt;41&gt;::S9&lt;42, T*&gt;</h2>
+<h2 id="S0-06-S5-07-S6-S7-0a-S9-00"><a href="#S0-06-S5-07-S6-S7-0a-S9-00">S0&lt;39&gt;::S5&lt;40&gt;::S6::S7&lt;41&gt;::S9&lt;42, T*&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -6261,7 +6261,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-06-S5-07-S6-S7-0a-f7"><a href="#S0-06">S0</a>&lt;39&gt;::<a href="#S0-06-S5-07">S5</a>&lt;40&gt;::<a href="#S0-06-S5-07-S6">S6</a>::<a href="#S0-06-S5-07-S6-S7-0a">S7</a>&lt;41&gt;::f7</h2>
+<h2 id="S0-06-S5-07-S6-S7-0a-f7"><a href="#S0-06-S5-07-S6-S7-0a-f7">S0&lt;39&gt;::S5&lt;40&gt;::S6::S7&lt;41&gt;::f7</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -6277,7 +6277,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-06-S5-07-S6-f6"><a href="#S0-06">S0</a>&lt;39&gt;::<a href="#S0-06-S5-07">S5</a>&lt;40&gt;::<a href="#S0-06-S5-07-S6">S6</a>::f6</h2>
+<h2 id="S0-06-S5-07-S6-f6"><a href="#S0-06-S5-07-S6-f6">S0&lt;39&gt;::S5&lt;40&gt;::S6::f6</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -6293,7 +6293,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-06-S5-07-f5"><a href="#S0-06">S0</a>&lt;39&gt;::<a href="#S0-06-S5-07">S5</a>&lt;40&gt;::f5</h2>
+<h2 id="S0-06-S5-07-f5"><a href="#S0-06-S5-07-f5">S0&lt;39&gt;::S5&lt;40&gt;::f5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -6309,7 +6309,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-06-f0"><a href="#S0-06">S0</a>&lt;39&gt;::f0</h2>
+<h2 id="S0-06-f0"><a href="#S0-06-f0">S0&lt;39&gt;::f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -6325,7 +6325,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0a1">S0&lt;4&gt;</h2>
+<h2 id="S0-0a1"><a href="#S0-0a1">S0&lt;4&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -6370,7 +6370,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0a1-S1"><a href="#S0-0a1">S0</a>&lt;4&gt;::S1</h2>
+<h2 id="S0-0a1-S1"><a href="#S0-0a1-S1">S0&lt;4&gt;::S1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -6414,7 +6414,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0a1-S1-S2-00"><a href="#S0-0a1">S0</a>&lt;4&gt;::<a href="#S0-0a1-S1">S1</a>::S2</h2>
+<h2 id="S0-0a1-S1-S2-00"><a href="#S0-0a1-S1-S2-00">S0&lt;4&gt;::S1::S2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -6434,7 +6434,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0a1-S1-S2-0f"><a href="#S0-0a1">S0</a>&lt;4&gt;::<a href="#S0-0a1-S1">S1</a>::S2&lt;5&gt;</h2>
+<h2 id="S0-0a1-S1-S2-0f"><a href="#S0-0a1-S1-S2-0f">S0&lt;4&gt;::S1::S2&lt;5&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -6467,7 +6467,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0a1-S1-f1"><a href="#S0-0a1">S0</a>&lt;4&gt;::<a href="#S0-0a1-S1">S1</a>::f1</h2>
+<h2 id="S0-0a1-S1-f1"><a href="#S0-0a1-S1-f1">S0&lt;4&gt;::S1::f1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -6483,7 +6483,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0a1-S5"><a href="#S0-0a1">S0</a>&lt;4&gt;::S5</h2>
+<h2 id="S0-0a1-S5"><a href="#S0-0a1-S5">S0&lt;4&gt;::S5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -6503,7 +6503,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0a1-f0"><a href="#S0-0a1">S0</a>&lt;4&gt;::f0</h2>
+<h2 id="S0-0a1-f0"><a href="#S0-0a1-f0">S0&lt;4&gt;::f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -6519,7 +6519,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0ba">S0&lt;43&gt;</h2>
+<h2 id="S0-0ba"><a href="#S0-0ba">S0&lt;43&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -6565,7 +6565,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0ba-S1"><a href="#S0-0ba">S0</a>&lt;43&gt;::S1</h2>
+<h2 id="S0-0ba-S1"><a href="#S0-0ba-S1">S0&lt;43&gt;::S1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -6582,7 +6582,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0ba-S5-0f"><a href="#S0-0ba">S0</a>&lt;43&gt;::S5</h2>
+<h2 id="S0-0ba-S5-0f"><a href="#S0-0ba-S5-0f">S0&lt;43&gt;::S5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -6602,7 +6602,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0ba-S5-08"><a href="#S0-0ba">S0</a>&lt;43&gt;::S5&lt;44&gt;</h2>
+<h2 id="S0-0ba-S5-08"><a href="#S0-0ba-S5-08">S0&lt;43&gt;::S5&lt;44&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -6646,7 +6646,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0ba-S5-08-S6"><a href="#S0-0ba">S0</a>&lt;43&gt;::<a href="#S0-0ba-S5-08">S5</a>&lt;44&gt;::S6</h2>
+<h2 id="S0-0ba-S5-08-S6"><a href="#S0-0ba-S5-08-S6">S0&lt;43&gt;::S5&lt;44&gt;::S6</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -6690,7 +6690,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0ba-S5-08-S6-S7-04"><a href="#S0-0ba">S0</a>&lt;43&gt;::<a href="#S0-0ba-S5-08">S5</a>&lt;44&gt;::<a href="#S0-0ba-S5-08-S6">S6</a>::S7</h2>
+<h2 id="S0-0ba-S5-08-S6-S7-04"><a href="#S0-0ba-S5-08-S6-S7-04">S0&lt;43&gt;::S5&lt;44&gt;::S6::S7</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -6710,7 +6710,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0ba-S5-08-S6-S7-02"><a href="#S0-0ba">S0</a>&lt;43&gt;::<a href="#S0-0ba-S5-08">S5</a>&lt;44&gt;::<a href="#S0-0ba-S5-08-S6">S6</a>::S7&lt;45&gt;</h2>
+<h2 id="S0-0ba-S5-08-S6-S7-02"><a href="#S0-0ba-S5-08-S6-S7-02">S0&lt;43&gt;::S5&lt;44&gt;::S6::S7&lt;45&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -6756,7 +6756,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0ba-S5-08-S6-S7-02-S8"><a href="#S0-0ba">S0</a>&lt;43&gt;::<a href="#S0-0ba-S5-08">S5</a>&lt;44&gt;::<a href="#S0-0ba-S5-08-S6">S6</a>::<a href="#S0-0ba-S5-08-S6-S7-02">S7</a>&lt;45&gt;::S8</h2>
+<h2 id="S0-0ba-S5-08-S6-S7-02-S8"><a href="#S0-0ba-S5-08-S6-S7-02-S8">S0&lt;43&gt;::S5&lt;44&gt;::S6::S7&lt;45&gt;::S8</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -6773,7 +6773,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0ba-S5-08-S6-S7-02-S9-0b"><a href="#S0-0ba">S0</a>&lt;43&gt;::<a href="#S0-0ba-S5-08">S5</a>&lt;44&gt;::<a href="#S0-0ba-S5-08-S6">S6</a>::<a href="#S0-0ba-S5-08-S6-S7-02">S7</a>&lt;45&gt;::S9</h2>
+<h2 id="S0-0ba-S5-08-S6-S7-02-S9-0b"><a href="#S0-0ba-S5-08-S6-S7-02-S9-0b">S0&lt;43&gt;::S5&lt;44&gt;::S6::S7&lt;45&gt;::S9</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -6793,7 +6793,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0ba-S5-08-S6-S7-02-S9-0f"><a href="#S0-0ba">S0</a>&lt;43&gt;::<a href="#S0-0ba-S5-08">S5</a>&lt;44&gt;::<a href="#S0-0ba-S5-08-S6">S6</a>::<a href="#S0-0ba-S5-08-S6-S7-02">S7</a>&lt;45&gt;::S9&lt;46&gt;</h2>
+<h2 id="S0-0ba-S5-08-S6-S7-02-S9-0f"><a href="#S0-0ba-S5-08-S6-S7-02-S9-0f">S0&lt;43&gt;::S5&lt;44&gt;::S6::S7&lt;45&gt;::S9&lt;46&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -6826,7 +6826,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0ba-S5-08-S6-S7-02-f7"><a href="#S0-0ba">S0</a>&lt;43&gt;::<a href="#S0-0ba-S5-08">S5</a>&lt;44&gt;::<a href="#S0-0ba-S5-08-S6">S6</a>::<a href="#S0-0ba-S5-08-S6-S7-02">S7</a>&lt;45&gt;::f7</h2>
+<h2 id="S0-0ba-S5-08-S6-S7-02-f7"><a href="#S0-0ba-S5-08-S6-S7-02-f7">S0&lt;43&gt;::S5&lt;44&gt;::S6::S7&lt;45&gt;::f7</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -6842,7 +6842,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0ba-S5-08-S6-f6"><a href="#S0-0ba">S0</a>&lt;43&gt;::<a href="#S0-0ba-S5-08">S5</a>&lt;44&gt;::<a href="#S0-0ba-S5-08-S6">S6</a>::f6</h2>
+<h2 id="S0-0ba-S5-08-S6-f6"><a href="#S0-0ba-S5-08-S6-f6">S0&lt;43&gt;::S5&lt;44&gt;::S6::f6</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -6858,7 +6858,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0ba-S5-08-f5"><a href="#S0-0ba">S0</a>&lt;43&gt;::<a href="#S0-0ba-S5-08">S5</a>&lt;44&gt;::f5</h2>
+<h2 id="S0-0ba-S5-08-f5"><a href="#S0-0ba-S5-08-f5">S0&lt;43&gt;::S5&lt;44&gt;::f5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -6874,7 +6874,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0ba-f0"><a href="#S0-0ba">S0</a>&lt;43&gt;::f0</h2>
+<h2 id="S0-0ba-f0"><a href="#S0-0ba-f0">S0&lt;43&gt;::f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -6890,7 +6890,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-07e">S0&lt;6&gt;</h2>
+<h2 id="S0-07e"><a href="#S0-07e">S0&lt;6&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -6935,7 +6935,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-07e-S1"><a href="#S0-07e">S0</a>&lt;6&gt;::S1</h2>
+<h2 id="S0-07e-S1"><a href="#S0-07e-S1">S0&lt;6&gt;::S1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -6980,7 +6980,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-07e-S1-S2-04"><a href="#S0-07e">S0</a>&lt;6&gt;::<a href="#S0-07e-S1">S1</a>::S2</h2>
+<h2 id="S0-07e-S1-S2-04"><a href="#S0-07e-S1-S2-04">S0&lt;6&gt;::S1::S2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -7015,7 +7015,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-07e-S1-S2-07"><a href="#S0-07e">S0</a>&lt;6&gt;::<a href="#S0-07e-S1">S1</a>::S2&lt;7, int*&gt;</h2>
+<h2 id="S0-07e-S1-S2-07"><a href="#S0-07e-S1-S2-07">S0&lt;6&gt;::S1::S2&lt;7, int*&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -7048,7 +7048,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-07e-S1-S2-06"><a href="#S0-07e">S0</a>&lt;6&gt;::<a href="#S0-07e-S1">S1</a>::S2&lt;7, T*&gt;</h2>
+<h2 id="S0-07e-S1-S2-06"><a href="#S0-07e-S1-S2-06">S0&lt;6&gt;::S1::S2&lt;7, T*&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -7066,7 +7066,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-07e-S1-f1"><a href="#S0-07e">S0</a>&lt;6&gt;::<a href="#S0-07e-S1">S1</a>::f1</h2>
+<h2 id="S0-07e-S1-f1"><a href="#S0-07e-S1-f1">S0&lt;6&gt;::S1::f1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -7082,7 +7082,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-07e-S5"><a href="#S0-07e">S0</a>&lt;6&gt;::S5</h2>
+<h2 id="S0-07e-S5"><a href="#S0-07e-S5">S0&lt;6&gt;::S5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -7102,7 +7102,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-07e-f0"><a href="#S0-07e">S0</a>&lt;6&gt;::f0</h2>
+<h2 id="S0-07e-f0"><a href="#S0-07e-f0">S0&lt;6&gt;::f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -7118,7 +7118,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0a3">S0&lt;8&gt;</h2>
+<h2 id="S0-0a3"><a href="#S0-0a3">S0&lt;8&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -7163,7 +7163,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0a3-S1"><a href="#S0-0a3">S0</a>&lt;8&gt;::S1</h2>
+<h2 id="S0-0a3-S1"><a href="#S0-0a3-S1">S0&lt;8&gt;::S1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -7207,7 +7207,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0a3-S1-S2-0b"><a href="#S0-0a3">S0</a>&lt;8&gt;::<a href="#S0-0a3-S1">S1</a>::S2</h2>
+<h2 id="S0-0a3-S1-S2-0b"><a href="#S0-0a3-S1-S2-0b">S0&lt;8&gt;::S1::S2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -7227,7 +7227,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0a3-S1-S2-0c"><a href="#S0-0a3">S0</a>&lt;8&gt;::<a href="#S0-0a3-S1">S1</a>::S2&lt;9&gt;</h2>
+<h2 id="S0-0a3-S1-S2-0c"><a href="#S0-0a3-S1-S2-0c">S0&lt;8&gt;::S1::S2&lt;9&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -7272,7 +7272,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0a3-S1-S2-0c-S3"><a href="#S0-0a3">S0</a>&lt;8&gt;::<a href="#S0-0a3-S1">S1</a>::<a href="#S0-0a3-S1-S2-0c">S2</a>&lt;9&gt;::S3</h2>
+<h2 id="S0-0a3-S1-S2-0c-S3"><a href="#S0-0a3-S1-S2-0c-S3">S0&lt;8&gt;::S1::S2&lt;9&gt;::S3</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -7304,7 +7304,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0a3-S1-S2-0c-S4"><a href="#S0-0a3">S0</a>&lt;8&gt;::<a href="#S0-0a3-S1">S1</a>::<a href="#S0-0a3-S1-S2-0c">S2</a>&lt;9&gt;::S4</h2>
+<h2 id="S0-0a3-S1-S2-0c-S4"><a href="#S0-0a3-S1-S2-0c-S4">S0&lt;8&gt;::S1::S2&lt;9&gt;::S4</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -7324,7 +7324,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0a3-S1-S2-0c-f2"><a href="#S0-0a3">S0</a>&lt;8&gt;::<a href="#S0-0a3-S1">S1</a>::<a href="#S0-0a3-S1-S2-0c">S2</a>&lt;9&gt;::f2</h2>
+<h2 id="S0-0a3-S1-S2-0c-f2"><a href="#S0-0a3-S1-S2-0c-f2">S0&lt;8&gt;::S1::S2&lt;9&gt;::f2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -7340,7 +7340,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0a3-S1-f1"><a href="#S0-0a3">S0</a>&lt;8&gt;::<a href="#S0-0a3-S1">S1</a>::f1</h2>
+<h2 id="S0-0a3-S1-f1"><a href="#S0-0a3-S1-f1">S0&lt;8&gt;::S1::f1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -7356,7 +7356,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0a3-S5"><a href="#S0-0a3">S0</a>&lt;8&gt;::S5</h2>
+<h2 id="S0-0a3-S5"><a href="#S0-0a3-S5">S0&lt;8&gt;::S5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -7376,7 +7376,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0a3-f0"><a href="#S0-0a3">S0</a>&lt;8&gt;::f0</h2>
+<h2 id="S0-0a3-f0"><a href="#S0-0a3-f0">S0&lt;8&gt;::f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -7392,7 +7392,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-020a">S0&lt;1, int*&gt;</h2>
+<h2 id="S0-020a"><a href="#S0-020a">S0&lt;1, int*&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -7425,7 +7425,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-05a">S0&lt;10, bool&gt;</h2>
+<h2 id="S0-05a"><a href="#S0-05a">S0&lt;10, bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -7470,7 +7470,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-05a-S1"><a href="#S0-05a">S0</a>&lt;10, bool&gt;::S1</h2>
+<h2 id="S0-05a-S1"><a href="#S0-05a-S1">S0&lt;10, bool&gt;::S1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -7514,7 +7514,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-05a-S1-S2-07"><a href="#S0-05a">S0</a>&lt;10, bool&gt;::<a href="#S0-05a-S1">S1</a>::S2</h2>
+<h2 id="S0-05a-S1-S2-07"><a href="#S0-05a-S1-S2-07">S0&lt;10, bool&gt;::S1::S2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -7534,7 +7534,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-05a-S1-S2-0b"><a href="#S0-05a">S0</a>&lt;10, bool&gt;::<a href="#S0-05a-S1">S1</a>::S2&lt;11, bool&gt;</h2>
+<h2 id="S0-05a-S1-S2-0b"><a href="#S0-05a-S1-S2-0b">S0&lt;10, bool&gt;::S1::S2&lt;11, bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -7578,7 +7578,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-05a-S1-S2-0b-S3"><a href="#S0-05a">S0</a>&lt;10, bool&gt;::<a href="#S0-05a-S1">S1</a>::<a href="#S0-05a-S1-S2-0b">S2</a>&lt;11, bool&gt;::S3</h2>
+<h2 id="S0-05a-S1-S2-0b-S3"><a href="#S0-05a-S1-S2-0b-S3">S0&lt;10, bool&gt;::S1::S2&lt;11, bool&gt;::S3</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -7595,7 +7595,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-05a-S1-S2-0b-f2"><a href="#S0-05a">S0</a>&lt;10, bool&gt;::<a href="#S0-05a-S1">S1</a>::<a href="#S0-05a-S1-S2-0b">S2</a>&lt;11, bool&gt;::f2</h2>
+<h2 id="S0-05a-S1-S2-0b-f2"><a href="#S0-05a-S1-S2-0b-f2">S0&lt;10, bool&gt;::S1::S2&lt;11, bool&gt;::f2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -7611,7 +7611,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-05a-S1-f1"><a href="#S0-05a">S0</a>&lt;10, bool&gt;::<a href="#S0-05a-S1">S1</a>::f1</h2>
+<h2 id="S0-05a-S1-f1"><a href="#S0-05a-S1-f1">S0&lt;10, bool&gt;::S1::f1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -7627,7 +7627,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-05a-S5"><a href="#S0-05a">S0</a>&lt;10, bool&gt;::S5</h2>
+<h2 id="S0-05a-S5"><a href="#S0-05a-S5">S0&lt;10, bool&gt;::S5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -7647,7 +7647,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-05a-f0"><a href="#S0-05a">S0</a>&lt;10, bool&gt;::f0</h2>
+<h2 id="S0-05a-f0"><a href="#S0-05a-f0">S0&lt;10, bool&gt;::f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -7663,7 +7663,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0cd">S0&lt;12, bool&gt;</h2>
+<h2 id="S0-0cd"><a href="#S0-0cd">S0&lt;12, bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -7708,7 +7708,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0cd-S1"><a href="#S0-0cd">S0</a>&lt;12, bool&gt;::S1</h2>
+<h2 id="S0-0cd-S1"><a href="#S0-0cd-S1">S0&lt;12, bool&gt;::S1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -7752,7 +7752,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0cd-S1-S2-0e"><a href="#S0-0cd">S0</a>&lt;12, bool&gt;::<a href="#S0-0cd-S1">S1</a>::S2</h2>
+<h2 id="S0-0cd-S1-S2-0e"><a href="#S0-0cd-S1-S2-0e">S0&lt;12, bool&gt;::S1::S2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -7772,7 +7772,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0cd-S1-S2-05"><a href="#S0-0cd">S0</a>&lt;12, bool&gt;::<a href="#S0-0cd-S1">S1</a>::S2&lt;13, bool&gt;</h2>
+<h2 id="S0-0cd-S1-S2-05"><a href="#S0-0cd-S1-S2-05">S0&lt;12, bool&gt;::S1::S2&lt;13, bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -7816,7 +7816,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0cd-S1-S2-05-S3"><a href="#S0-0cd">S0</a>&lt;12, bool&gt;::<a href="#S0-0cd-S1">S1</a>::<a href="#S0-0cd-S1-S2-05">S2</a>&lt;13, bool&gt;::S3</h2>
+<h2 id="S0-0cd-S1-S2-05-S3"><a href="#S0-0cd-S1-S2-05-S3">S0&lt;12, bool&gt;::S1::S2&lt;13, bool&gt;::S3</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -7833,7 +7833,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0cd-S1-S2-05-f2"><a href="#S0-0cd">S0</a>&lt;12, bool&gt;::<a href="#S0-0cd-S1">S1</a>::<a href="#S0-0cd-S1-S2-05">S2</a>&lt;13, bool&gt;::f2</h2>
+<h2 id="S0-0cd-S1-S2-05-f2"><a href="#S0-0cd-S1-S2-05-f2">S0&lt;12, bool&gt;::S1::S2&lt;13, bool&gt;::f2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -7849,7 +7849,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0cd-S1-f1"><a href="#S0-0cd">S0</a>&lt;12, bool&gt;::<a href="#S0-0cd-S1">S1</a>::f1</h2>
+<h2 id="S0-0cd-S1-f1"><a href="#S0-0cd-S1-f1">S0&lt;12, bool&gt;::S1::f1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -7865,7 +7865,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0cd-S5"><a href="#S0-0cd">S0</a>&lt;12, bool&gt;::S5</h2>
+<h2 id="S0-0cd-S5"><a href="#S0-0cd-S5">S0&lt;12, bool&gt;::S5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -7885,7 +7885,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0cd-f0"><a href="#S0-0cd">S0</a>&lt;12, bool&gt;::f0</h2>
+<h2 id="S0-0cd-f0"><a href="#S0-0cd-f0">S0&lt;12, bool&gt;::f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -7901,7 +7901,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-000">S0&lt;15, bool&gt;</h2>
+<h2 id="S0-000"><a href="#S0-000">S0&lt;15, bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -7946,7 +7946,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-000-S1"><a href="#S0-000">S0</a>&lt;15, bool&gt;::S1</h2>
+<h2 id="S0-000-S1"><a href="#S0-000-S1">S0&lt;15, bool&gt;::S1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -7990,7 +7990,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-000-S1-S2-08"><a href="#S0-000">S0</a>&lt;15, bool&gt;::<a href="#S0-000-S1">S1</a>::S2</h2>
+<h2 id="S0-000-S1-S2-08"><a href="#S0-000-S1-S2-08">S0&lt;15, bool&gt;::S1::S2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -8010,7 +8010,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-000-S1-S2-03"><a href="#S0-000">S0</a>&lt;15, bool&gt;::<a href="#S0-000-S1">S1</a>::S2&lt;16, bool&gt;</h2>
+<h2 id="S0-000-S1-S2-03"><a href="#S0-000-S1-S2-03">S0&lt;15, bool&gt;::S1::S2&lt;16, bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -8054,7 +8054,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-000-S1-S2-03-S3"><a href="#S0-000">S0</a>&lt;15, bool&gt;::<a href="#S0-000-S1">S1</a>::<a href="#S0-000-S1-S2-03">S2</a>&lt;16, bool&gt;::S3</h2>
+<h2 id="S0-000-S1-S2-03-S3"><a href="#S0-000-S1-S2-03-S3">S0&lt;15, bool&gt;::S1::S2&lt;16, bool&gt;::S3</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -8071,7 +8071,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-000-S1-S2-03-f2"><a href="#S0-000">S0</a>&lt;15, bool&gt;::<a href="#S0-000-S1">S1</a>::<a href="#S0-000-S1-S2-03">S2</a>&lt;16, bool&gt;::f2</h2>
+<h2 id="S0-000-S1-S2-03-f2"><a href="#S0-000-S1-S2-03-f2">S0&lt;15, bool&gt;::S1::S2&lt;16, bool&gt;::f2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -8087,7 +8087,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-000-S1-f1"><a href="#S0-000">S0</a>&lt;15, bool&gt;::<a href="#S0-000-S1">S1</a>::f1</h2>
+<h2 id="S0-000-S1-f1"><a href="#S0-000-S1-f1">S0&lt;15, bool&gt;::S1::f1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -8103,7 +8103,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-000-S5"><a href="#S0-000">S0</a>&lt;15, bool&gt;::S5</h2>
+<h2 id="S0-000-S5"><a href="#S0-000-S5">S0&lt;15, bool&gt;::S5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -8123,7 +8123,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-000-f0"><a href="#S0-000">S0</a>&lt;15, bool&gt;::f0</h2>
+<h2 id="S0-000-f0"><a href="#S0-000-f0">S0&lt;15, bool&gt;::f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -8139,7 +8139,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-051">S0&lt;18, bool&gt;</h2>
+<h2 id="S0-051"><a href="#S0-051">S0&lt;18, bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -8183,7 +8183,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-051-S1"><a href="#S0-051">S0</a>&lt;18, bool&gt;::S1</h2>
+<h2 id="S0-051-S1"><a href="#S0-051-S1">S0&lt;18, bool&gt;::S1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -8200,7 +8200,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-051-f0"><a href="#S0-051">S0</a>&lt;18, bool&gt;::f0</h2>
+<h2 id="S0-051-f0"><a href="#S0-051-f0">S0&lt;18, bool&gt;::f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -8216,7 +8216,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-002">S0&lt;19, bool&gt;</h2>
+<h2 id="S0-002"><a href="#S0-002">S0&lt;19, bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -8260,7 +8260,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-002-S1"><a href="#S0-002">S0</a>&lt;19, bool&gt;::S1</h2>
+<h2 id="S0-002-S1"><a href="#S0-002-S1">S0&lt;19, bool&gt;::S1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -8277,7 +8277,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-002-f0"><a href="#S0-002">S0</a>&lt;19, bool&gt;::f0</h2>
+<h2 id="S0-002-f0"><a href="#S0-002-f0">S0&lt;19, bool&gt;::f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -8293,7 +8293,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-03c">S0&lt;2, bool&gt;</h2>
+<h2 id="S0-03c"><a href="#S0-03c">S0&lt;2, bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -8337,7 +8337,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-03c-S5"><a href="#S0-03c">S0</a>&lt;2, bool&gt;::S5</h2>
+<h2 id="S0-03c-S5"><a href="#S0-03c-S5">S0&lt;2, bool&gt;::S5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -8357,7 +8357,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-03c-f0"><a href="#S0-03c">S0</a>&lt;2, bool&gt;::f0</h2>
+<h2 id="S0-03c-f0"><a href="#S0-03c-f0">S0&lt;2, bool&gt;::f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -8373,7 +8373,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-003">S0&lt;21, bool&gt;</h2>
+<h2 id="S0-003"><a href="#S0-003">S0&lt;21, bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -8417,7 +8417,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-003-S1"><a href="#S0-003">S0</a>&lt;21, bool&gt;::S1</h2>
+<h2 id="S0-003-S1"><a href="#S0-003-S1">S0&lt;21, bool&gt;::S1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -8434,7 +8434,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-003-f0"><a href="#S0-003">S0</a>&lt;21, bool&gt;::f0</h2>
+<h2 id="S0-003-f0"><a href="#S0-003-f0">S0&lt;21, bool&gt;::f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -8450,7 +8450,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0c7">S0&lt;23, bool&gt;</h2>
+<h2 id="S0-0c7"><a href="#S0-0c7">S0&lt;23, bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -8496,7 +8496,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0c7-S1"><a href="#S0-0c7">S0</a>&lt;23, bool&gt;::S1</h2>
+<h2 id="S0-0c7-S1"><a href="#S0-0c7-S1">S0&lt;23, bool&gt;::S1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -8513,7 +8513,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0c7-S5-03"><a href="#S0-0c7">S0</a>&lt;23, bool&gt;::S5</h2>
+<h2 id="S0-0c7-S5-03"><a href="#S0-0c7-S5-03">S0&lt;23, bool&gt;::S5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -8533,7 +8533,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0c7-S5-0f"><a href="#S0-0c7">S0</a>&lt;23, bool&gt;::S5&lt;24, bool&gt;</h2>
+<h2 id="S0-0c7-S5-0f"><a href="#S0-0c7-S5-0f">S0&lt;23, bool&gt;::S5&lt;24, bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -8564,7 +8564,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0c7-S5-0f-f5"><a href="#S0-0c7">S0</a>&lt;23, bool&gt;::<a href="#S0-0c7-S5-0f">S5</a>&lt;24, bool&gt;::f5</h2>
+<h2 id="S0-0c7-S5-0f-f5"><a href="#S0-0c7-S5-0f-f5">S0&lt;23, bool&gt;::S5&lt;24, bool&gt;::f5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -8580,7 +8580,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0c7-f0"><a href="#S0-0c7">S0</a>&lt;23, bool&gt;::f0</h2>
+<h2 id="S0-0c7-f0"><a href="#S0-0c7-f0">S0&lt;23, bool&gt;::f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -8596,7 +8596,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0529f">S0&lt;25, bool&gt;</h2>
+<h2 id="S0-0529f"><a href="#S0-0529f">S0&lt;25, bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -8642,7 +8642,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0529f-S1"><a href="#S0-0529f">S0</a>&lt;25, bool&gt;::S1</h2>
+<h2 id="S0-0529f-S1"><a href="#S0-0529f-S1">S0&lt;25, bool&gt;::S1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -8659,7 +8659,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0529f-S5-051"><a href="#S0-0529f">S0</a>&lt;25, bool&gt;::S5</h2>
+<h2 id="S0-0529f-S5-051"><a href="#S0-0529f-S5-051">S0&lt;25, bool&gt;::S5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -8679,7 +8679,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0529f-S5-05c"><a href="#S0-0529f">S0</a>&lt;25, bool&gt;::S5&lt;26, bool&gt;</h2>
+<h2 id="S0-0529f-S5-05c"><a href="#S0-0529f-S5-05c">S0&lt;25, bool&gt;::S5&lt;26, bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -8723,7 +8723,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0529f-S5-05c-S6"><a href="#S0-0529f">S0</a>&lt;25, bool&gt;::<a href="#S0-0529f-S5-05c">S5</a>&lt;26, bool&gt;::S6</h2>
+<h2 id="S0-0529f-S5-05c-S6"><a href="#S0-0529f-S5-05c-S6">S0&lt;25, bool&gt;::S5&lt;26, bool&gt;::S6</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -8753,7 +8753,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0529f-S5-05c-S6-f6"><a href="#S0-0529f">S0</a>&lt;25, bool&gt;::<a href="#S0-0529f-S5-05c">S5</a>&lt;26, bool&gt;::<a href="#S0-0529f-S5-05c-S6">S6</a>::f6</h2>
+<h2 id="S0-0529f-S5-05c-S6-f6"><a href="#S0-0529f-S5-05c-S6-f6">S0&lt;25, bool&gt;::S5&lt;26, bool&gt;::S6::f6</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -8769,7 +8769,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0529f-S5-05c-f5"><a href="#S0-0529f">S0</a>&lt;25, bool&gt;::<a href="#S0-0529f-S5-05c">S5</a>&lt;26, bool&gt;::f5</h2>
+<h2 id="S0-0529f-S5-05c-f5"><a href="#S0-0529f-S5-05c-f5">S0&lt;25, bool&gt;::S5&lt;26, bool&gt;::f5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -8785,7 +8785,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0529f-f0"><a href="#S0-0529f">S0</a>&lt;25, bool&gt;::f0</h2>
+<h2 id="S0-0529f-f0"><a href="#S0-0529f-f0">S0&lt;25, bool&gt;::f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -8801,7 +8801,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-007">S0&lt;27, bool&gt;</h2>
+<h2 id="S0-007"><a href="#S0-007">S0&lt;27, bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -8847,7 +8847,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-007-S1"><a href="#S0-007">S0</a>&lt;27, bool&gt;::S1</h2>
+<h2 id="S0-007-S1"><a href="#S0-007-S1">S0&lt;27, bool&gt;::S1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -8864,7 +8864,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-007-S5-0f"><a href="#S0-007">S0</a>&lt;27, bool&gt;::S5</h2>
+<h2 id="S0-007-S5-0f"><a href="#S0-007-S5-0f">S0&lt;27, bool&gt;::S5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -8884,7 +8884,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-007-S5-0d"><a href="#S0-007">S0</a>&lt;27, bool&gt;::S5&lt;28, bool&gt;</h2>
+<h2 id="S0-007-S5-0d"><a href="#S0-007-S5-0d">S0&lt;27, bool&gt;::S5&lt;28, bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -8928,7 +8928,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-007-S5-0d-S6"><a href="#S0-007">S0</a>&lt;27, bool&gt;::<a href="#S0-007-S5-0d">S5</a>&lt;28, bool&gt;::S6</h2>
+<h2 id="S0-007-S5-0d-S6"><a href="#S0-007-S5-0d-S6">S0&lt;27, bool&gt;::S5&lt;28, bool&gt;::S6</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -8958,7 +8958,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-007-S5-0d-S6-f6"><a href="#S0-007">S0</a>&lt;27, bool&gt;::<a href="#S0-007-S5-0d">S5</a>&lt;28, bool&gt;::<a href="#S0-007-S5-0d-S6">S6</a>::f6</h2>
+<h2 id="S0-007-S5-0d-S6-f6"><a href="#S0-007-S5-0d-S6-f6">S0&lt;27, bool&gt;::S5&lt;28, bool&gt;::S6::f6</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -8974,7 +8974,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-007-S5-0d-f5"><a href="#S0-007">S0</a>&lt;27, bool&gt;::<a href="#S0-007-S5-0d">S5</a>&lt;28, bool&gt;::f5</h2>
+<h2 id="S0-007-S5-0d-f5"><a href="#S0-007-S5-0d-f5">S0&lt;27, bool&gt;::S5&lt;28, bool&gt;::f5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -8990,7 +8990,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-007-f0"><a href="#S0-007">S0</a>&lt;27, bool&gt;::f0</h2>
+<h2 id="S0-007-f0"><a href="#S0-007-f0">S0&lt;27, bool&gt;::f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -9006,7 +9006,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-092">S0&lt;3, bool&gt;</h2>
+<h2 id="S0-092"><a href="#S0-092">S0&lt;3, bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -9051,7 +9051,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-092-S1"><a href="#S0-092">S0</a>&lt;3, bool&gt;::S1</h2>
+<h2 id="S0-092-S1"><a href="#S0-092-S1">S0&lt;3, bool&gt;::S1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -9081,7 +9081,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-092-S1-f1"><a href="#S0-092">S0</a>&lt;3, bool&gt;::<a href="#S0-092-S1">S1</a>::f1</h2>
+<h2 id="S0-092-S1-f1"><a href="#S0-092-S1-f1">S0&lt;3, bool&gt;::S1::f1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -9097,7 +9097,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-092-S5"><a href="#S0-092">S0</a>&lt;3, bool&gt;::S5</h2>
+<h2 id="S0-092-S5"><a href="#S0-092-S5">S0&lt;3, bool&gt;::S5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -9117,7 +9117,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-092-f0"><a href="#S0-092">S0</a>&lt;3, bool&gt;::f0</h2>
+<h2 id="S0-092-f0"><a href="#S0-092-f0">S0&lt;3, bool&gt;::f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -9133,7 +9133,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-021">S0&lt;30, bool&gt;</h2>
+<h2 id="S0-021"><a href="#S0-021">S0&lt;30, bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -9179,7 +9179,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-021-S1"><a href="#S0-021">S0</a>&lt;30, bool&gt;::S1</h2>
+<h2 id="S0-021-S1"><a href="#S0-021-S1">S0&lt;30, bool&gt;::S1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -9196,7 +9196,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-021-S5-06"><a href="#S0-021">S0</a>&lt;30, bool&gt;::S5</h2>
+<h2 id="S0-021-S5-06"><a href="#S0-021-S5-06">S0&lt;30, bool&gt;::S5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -9216,7 +9216,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-021-S5-0b"><a href="#S0-021">S0</a>&lt;30, bool&gt;::S5&lt;31, bool&gt;</h2>
+<h2 id="S0-021-S5-0b"><a href="#S0-021-S5-0b">S0&lt;30, bool&gt;::S5&lt;31, bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -9260,7 +9260,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-021-S5-0b-S6"><a href="#S0-021">S0</a>&lt;30, bool&gt;::<a href="#S0-021-S5-0b">S5</a>&lt;31, bool&gt;::S6</h2>
+<h2 id="S0-021-S5-0b-S6"><a href="#S0-021-S5-0b-S6">S0&lt;30, bool&gt;::S5&lt;31, bool&gt;::S6</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -9290,7 +9290,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-021-S5-0b-S6-f6"><a href="#S0-021">S0</a>&lt;30, bool&gt;::<a href="#S0-021-S5-0b">S5</a>&lt;31, bool&gt;::<a href="#S0-021-S5-0b-S6">S6</a>::f6</h2>
+<h2 id="S0-021-S5-0b-S6-f6"><a href="#S0-021-S5-0b-S6-f6">S0&lt;30, bool&gt;::S5&lt;31, bool&gt;::S6::f6</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -9306,7 +9306,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-021-S5-0b-f5"><a href="#S0-021">S0</a>&lt;30, bool&gt;::<a href="#S0-021-S5-0b">S5</a>&lt;31, bool&gt;::f5</h2>
+<h2 id="S0-021-S5-0b-f5"><a href="#S0-021-S5-0b-f5">S0&lt;30, bool&gt;::S5&lt;31, bool&gt;::f5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -9322,7 +9322,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-021-f0"><a href="#S0-021">S0</a>&lt;30, bool&gt;::f0</h2>
+<h2 id="S0-021-f0"><a href="#S0-021-f0">S0&lt;30, bool&gt;::f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -9338,7 +9338,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0318">S0&lt;33, bool&gt;</h2>
+<h2 id="S0-0318"><a href="#S0-0318">S0&lt;33, bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -9384,7 +9384,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0318-S1"><a href="#S0-0318">S0</a>&lt;33, bool&gt;::S1</h2>
+<h2 id="S0-0318-S1"><a href="#S0-0318-S1">S0&lt;33, bool&gt;::S1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -9401,7 +9401,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0318-S5-0f"><a href="#S0-0318">S0</a>&lt;33, bool&gt;::S5</h2>
+<h2 id="S0-0318-S5-0f"><a href="#S0-0318-S5-0f">S0&lt;33, bool&gt;::S5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -9421,7 +9421,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0318-S5-0b"><a href="#S0-0318">S0</a>&lt;33, bool&gt;::S5&lt;34, bool&gt;</h2>
+<h2 id="S0-0318-S5-0b"><a href="#S0-0318-S5-0b">S0&lt;33, bool&gt;::S5&lt;34, bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -9465,7 +9465,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0318-S5-0b-S6"><a href="#S0-0318">S0</a>&lt;33, bool&gt;::<a href="#S0-0318-S5-0b">S5</a>&lt;34, bool&gt;::S6</h2>
+<h2 id="S0-0318-S5-0b-S6"><a href="#S0-0318-S5-0b-S6">S0&lt;33, bool&gt;::S5&lt;34, bool&gt;::S6</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -9509,7 +9509,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0318-S5-0b-S6-S7-04"><a href="#S0-0318">S0</a>&lt;33, bool&gt;::<a href="#S0-0318-S5-0b">S5</a>&lt;34, bool&gt;::<a href="#S0-0318-S5-0b-S6">S6</a>::S7</h2>
+<h2 id="S0-0318-S5-0b-S6-S7-04"><a href="#S0-0318-S5-0b-S6-S7-04">S0&lt;33, bool&gt;::S5&lt;34, bool&gt;::S6::S7</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -9529,7 +9529,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0318-S5-0b-S6-S7-05"><a href="#S0-0318">S0</a>&lt;33, bool&gt;::<a href="#S0-0318-S5-0b">S5</a>&lt;34, bool&gt;::<a href="#S0-0318-S5-0b-S6">S6</a>::S7&lt;35, bool&gt;</h2>
+<h2 id="S0-0318-S5-0b-S6-S7-05"><a href="#S0-0318-S5-0b-S6-S7-05">S0&lt;33, bool&gt;::S5&lt;34, bool&gt;::S6::S7&lt;35, bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -9573,7 +9573,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0318-S5-0b-S6-S7-05-S9"><a href="#S0-0318">S0</a>&lt;33, bool&gt;::<a href="#S0-0318-S5-0b">S5</a>&lt;34, bool&gt;::<a href="#S0-0318-S5-0b-S6">S6</a>::<a href="#S0-0318-S5-0b-S6-S7-05">S7</a>&lt;35, bool&gt;::S9</h2>
+<h2 id="S0-0318-S5-0b-S6-S7-05-S9"><a href="#S0-0318-S5-0b-S6-S7-05-S9">S0&lt;33, bool&gt;::S5&lt;34, bool&gt;::S6::S7&lt;35, bool&gt;::S9</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -9593,7 +9593,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0318-S5-0b-S6-S7-05-f7"><a href="#S0-0318">S0</a>&lt;33, bool&gt;::<a href="#S0-0318-S5-0b">S5</a>&lt;34, bool&gt;::<a href="#S0-0318-S5-0b-S6">S6</a>::<a href="#S0-0318-S5-0b-S6-S7-05">S7</a>&lt;35, bool&gt;::f7</h2>
+<h2 id="S0-0318-S5-0b-S6-S7-05-f7"><a href="#S0-0318-S5-0b-S6-S7-05-f7">S0&lt;33, bool&gt;::S5&lt;34, bool&gt;::S6::S7&lt;35, bool&gt;::f7</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -9609,7 +9609,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0318-S5-0b-S6-f6"><a href="#S0-0318">S0</a>&lt;33, bool&gt;::<a href="#S0-0318-S5-0b">S5</a>&lt;34, bool&gt;::<a href="#S0-0318-S5-0b-S6">S6</a>::f6</h2>
+<h2 id="S0-0318-S5-0b-S6-f6"><a href="#S0-0318-S5-0b-S6-f6">S0&lt;33, bool&gt;::S5&lt;34, bool&gt;::S6::f6</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -9625,7 +9625,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0318-S5-0b-f5"><a href="#S0-0318">S0</a>&lt;33, bool&gt;::<a href="#S0-0318-S5-0b">S5</a>&lt;34, bool&gt;::f5</h2>
+<h2 id="S0-0318-S5-0b-f5"><a href="#S0-0318-S5-0b-f5">S0&lt;33, bool&gt;::S5&lt;34, bool&gt;::f5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -9641,7 +9641,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0318-f0"><a href="#S0-0318">S0</a>&lt;33, bool&gt;::f0</h2>
+<h2 id="S0-0318-f0"><a href="#S0-0318-f0">S0&lt;33, bool&gt;::f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -9657,7 +9657,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0d">S0&lt;36, bool&gt;</h2>
+<h2 id="S0-0d"><a href="#S0-0d">S0&lt;36, bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -9703,7 +9703,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0d-S1"><a href="#S0-0d">S0</a>&lt;36, bool&gt;::S1</h2>
+<h2 id="S0-0d-S1"><a href="#S0-0d-S1">S0&lt;36, bool&gt;::S1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -9720,7 +9720,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0d-S5-09"><a href="#S0-0d">S0</a>&lt;36, bool&gt;::S5</h2>
+<h2 id="S0-0d-S5-09"><a href="#S0-0d-S5-09">S0&lt;36, bool&gt;::S5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -9740,7 +9740,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0d-S5-0b"><a href="#S0-0d">S0</a>&lt;36, bool&gt;::S5&lt;37, bool&gt;</h2>
+<h2 id="S0-0d-S5-0b"><a href="#S0-0d-S5-0b">S0&lt;36, bool&gt;::S5&lt;37, bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -9784,7 +9784,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0d-S5-0b-S6"><a href="#S0-0d">S0</a>&lt;36, bool&gt;::<a href="#S0-0d-S5-0b">S5</a>&lt;37, bool&gt;::S6</h2>
+<h2 id="S0-0d-S5-0b-S6"><a href="#S0-0d-S5-0b-S6">S0&lt;36, bool&gt;::S5&lt;37, bool&gt;::S6</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -9828,7 +9828,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0d-S5-0b-S6-S7-08"><a href="#S0-0d">S0</a>&lt;36, bool&gt;::<a href="#S0-0d-S5-0b">S5</a>&lt;37, bool&gt;::<a href="#S0-0d-S5-0b-S6">S6</a>::S7</h2>
+<h2 id="S0-0d-S5-0b-S6-S7-08"><a href="#S0-0d-S5-0b-S6-S7-08">S0&lt;36, bool&gt;::S5&lt;37, bool&gt;::S6::S7</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -9848,7 +9848,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0d-S5-0b-S6-S7-0d"><a href="#S0-0d">S0</a>&lt;36, bool&gt;::<a href="#S0-0d-S5-0b">S5</a>&lt;37, bool&gt;::<a href="#S0-0d-S5-0b-S6">S6</a>::S7&lt;38, bool&gt;</h2>
+<h2 id="S0-0d-S5-0b-S6-S7-0d"><a href="#S0-0d-S5-0b-S6-S7-0d">S0&lt;36, bool&gt;::S5&lt;37, bool&gt;::S6::S7&lt;38, bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -9892,7 +9892,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0d-S5-0b-S6-S7-0d-S8"><a href="#S0-0d">S0</a>&lt;36, bool&gt;::<a href="#S0-0d-S5-0b">S5</a>&lt;37, bool&gt;::<a href="#S0-0d-S5-0b-S6">S6</a>::<a href="#S0-0d-S5-0b-S6-S7-0d">S7</a>&lt;38, bool&gt;::S8</h2>
+<h2 id="S0-0d-S5-0b-S6-S7-0d-S8"><a href="#S0-0d-S5-0b-S6-S7-0d-S8">S0&lt;36, bool&gt;::S5&lt;37, bool&gt;::S6::S7&lt;38, bool&gt;::S8</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -9909,7 +9909,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0d-S5-0b-S6-S7-0d-f7"><a href="#S0-0d">S0</a>&lt;36, bool&gt;::<a href="#S0-0d-S5-0b">S5</a>&lt;37, bool&gt;::<a href="#S0-0d-S5-0b-S6">S6</a>::<a href="#S0-0d-S5-0b-S6-S7-0d">S7</a>&lt;38, bool&gt;::f7</h2>
+<h2 id="S0-0d-S5-0b-S6-S7-0d-f7"><a href="#S0-0d-S5-0b-S6-S7-0d-f7">S0&lt;36, bool&gt;::S5&lt;37, bool&gt;::S6::S7&lt;38, bool&gt;::f7</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -9925,7 +9925,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0d-S5-0b-S6-f6"><a href="#S0-0d">S0</a>&lt;36, bool&gt;::<a href="#S0-0d-S5-0b">S5</a>&lt;37, bool&gt;::<a href="#S0-0d-S5-0b-S6">S6</a>::f6</h2>
+<h2 id="S0-0d-S5-0b-S6-f6"><a href="#S0-0d-S5-0b-S6-f6">S0&lt;36, bool&gt;::S5&lt;37, bool&gt;::S6::f6</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -9941,7 +9941,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0d-S5-0b-f5"><a href="#S0-0d">S0</a>&lt;36, bool&gt;::<a href="#S0-0d-S5-0b">S5</a>&lt;37, bool&gt;::f5</h2>
+<h2 id="S0-0d-S5-0b-f5"><a href="#S0-0d-S5-0b-f5">S0&lt;36, bool&gt;::S5&lt;37, bool&gt;::f5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -9957,7 +9957,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0d-f0"><a href="#S0-0d">S0</a>&lt;36, bool&gt;::f0</h2>
+<h2 id="S0-0d-f0"><a href="#S0-0d-f0">S0&lt;36, bool&gt;::f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -9973,7 +9973,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0206">S0&lt;39, bool&gt;</h2>
+<h2 id="S0-0206"><a href="#S0-0206">S0&lt;39, bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -10019,7 +10019,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0206-S1"><a href="#S0-0206">S0</a>&lt;39, bool&gt;::S1</h2>
+<h2 id="S0-0206-S1"><a href="#S0-0206-S1">S0&lt;39, bool&gt;::S1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -10036,7 +10036,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0206-S5-06"><a href="#S0-0206">S0</a>&lt;39, bool&gt;::S5</h2>
+<h2 id="S0-0206-S5-06"><a href="#S0-0206-S5-06">S0&lt;39, bool&gt;::S5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -10056,7 +10056,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0206-S5-08"><a href="#S0-0206">S0</a>&lt;39, bool&gt;::S5&lt;40, bool&gt;</h2>
+<h2 id="S0-0206-S5-08"><a href="#S0-0206-S5-08">S0&lt;39, bool&gt;::S5&lt;40, bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -10100,7 +10100,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0206-S5-08-S6"><a href="#S0-0206">S0</a>&lt;39, bool&gt;::<a href="#S0-0206-S5-08">S5</a>&lt;40, bool&gt;::S6</h2>
+<h2 id="S0-0206-S5-08-S6"><a href="#S0-0206-S5-08-S6">S0&lt;39, bool&gt;::S5&lt;40, bool&gt;::S6</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -10144,7 +10144,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0206-S5-08-S6-S7-06"><a href="#S0-0206">S0</a>&lt;39, bool&gt;::<a href="#S0-0206-S5-08">S5</a>&lt;40, bool&gt;::<a href="#S0-0206-S5-08-S6">S6</a>::S7</h2>
+<h2 id="S0-0206-S5-08-S6-S7-06"><a href="#S0-0206-S5-08-S6-S7-06">S0&lt;39, bool&gt;::S5&lt;40, bool&gt;::S6::S7</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -10164,7 +10164,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0206-S5-08-S6-S7-01"><a href="#S0-0206">S0</a>&lt;39, bool&gt;::<a href="#S0-0206-S5-08">S5</a>&lt;40, bool&gt;::<a href="#S0-0206-S5-08-S6">S6</a>::S7&lt;41, bool&gt;</h2>
+<h2 id="S0-0206-S5-08-S6-S7-01"><a href="#S0-0206-S5-08-S6-S7-01">S0&lt;39, bool&gt;::S5&lt;40, bool&gt;::S6::S7&lt;41, bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -10208,7 +10208,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0206-S5-08-S6-S7-01-S8"><a href="#S0-0206">S0</a>&lt;39, bool&gt;::<a href="#S0-0206-S5-08">S5</a>&lt;40, bool&gt;::<a href="#S0-0206-S5-08-S6">S6</a>::<a href="#S0-0206-S5-08-S6-S7-01">S7</a>&lt;41, bool&gt;::S8</h2>
+<h2 id="S0-0206-S5-08-S6-S7-01-S8"><a href="#S0-0206-S5-08-S6-S7-01-S8">S0&lt;39, bool&gt;::S5&lt;40, bool&gt;::S6::S7&lt;41, bool&gt;::S8</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -10225,7 +10225,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0206-S5-08-S6-S7-01-f7"><a href="#S0-0206">S0</a>&lt;39, bool&gt;::<a href="#S0-0206-S5-08">S5</a>&lt;40, bool&gt;::<a href="#S0-0206-S5-08-S6">S6</a>::<a href="#S0-0206-S5-08-S6-S7-01">S7</a>&lt;41, bool&gt;::f7</h2>
+<h2 id="S0-0206-S5-08-S6-S7-01-f7"><a href="#S0-0206-S5-08-S6-S7-01-f7">S0&lt;39, bool&gt;::S5&lt;40, bool&gt;::S6::S7&lt;41, bool&gt;::f7</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -10241,7 +10241,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0206-S5-08-S6-f6"><a href="#S0-0206">S0</a>&lt;39, bool&gt;::<a href="#S0-0206-S5-08">S5</a>&lt;40, bool&gt;::<a href="#S0-0206-S5-08-S6">S6</a>::f6</h2>
+<h2 id="S0-0206-S5-08-S6-f6"><a href="#S0-0206-S5-08-S6-f6">S0&lt;39, bool&gt;::S5&lt;40, bool&gt;::S6::f6</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -10257,7 +10257,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0206-S5-08-f5"><a href="#S0-0206">S0</a>&lt;39, bool&gt;::<a href="#S0-0206-S5-08">S5</a>&lt;40, bool&gt;::f5</h2>
+<h2 id="S0-0206-S5-08-f5"><a href="#S0-0206-S5-08-f5">S0&lt;39, bool&gt;::S5&lt;40, bool&gt;::f5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -10273,7 +10273,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0206-f0"><a href="#S0-0206">S0</a>&lt;39, bool&gt;::f0</h2>
+<h2 id="S0-0206-f0"><a href="#S0-0206-f0">S0&lt;39, bool&gt;::f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -10289,7 +10289,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0b6">S0&lt;4, bool&gt;</h2>
+<h2 id="S0-0b6"><a href="#S0-0b6">S0&lt;4, bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -10334,7 +10334,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0b6-S1"><a href="#S0-0b6">S0</a>&lt;4, bool&gt;::S1</h2>
+<h2 id="S0-0b6-S1"><a href="#S0-0b6-S1">S0&lt;4, bool&gt;::S1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -10364,7 +10364,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0b6-S1-f1"><a href="#S0-0b6">S0</a>&lt;4, bool&gt;::<a href="#S0-0b6-S1">S1</a>::f1</h2>
+<h2 id="S0-0b6-S1-f1"><a href="#S0-0b6-S1-f1">S0&lt;4, bool&gt;::S1::f1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -10380,7 +10380,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0b6-S5"><a href="#S0-0b6">S0</a>&lt;4, bool&gt;::S5</h2>
+<h2 id="S0-0b6-S5"><a href="#S0-0b6-S5">S0&lt;4, bool&gt;::S5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -10400,7 +10400,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0b6-f0"><a href="#S0-0b6">S0</a>&lt;4, bool&gt;::f0</h2>
+<h2 id="S0-0b6-f0"><a href="#S0-0b6-f0">S0&lt;4, bool&gt;::f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -10416,7 +10416,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-05291">S0&lt;43, bool&gt;</h2>
+<h2 id="S0-05291"><a href="#S0-05291">S0&lt;43, bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -10462,7 +10462,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-05291-S1"><a href="#S0-05291">S0</a>&lt;43, bool&gt;::S1</h2>
+<h2 id="S0-05291-S1"><a href="#S0-05291-S1">S0&lt;43, bool&gt;::S1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -10479,7 +10479,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-05291-S5-02"><a href="#S0-05291">S0</a>&lt;43, bool&gt;::S5</h2>
+<h2 id="S0-05291-S5-02"><a href="#S0-05291-S5-02">S0&lt;43, bool&gt;::S5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -10499,7 +10499,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-05291-S5-0e"><a href="#S0-05291">S0</a>&lt;43, bool&gt;::S5&lt;44, bool&gt;</h2>
+<h2 id="S0-05291-S5-0e"><a href="#S0-05291-S5-0e">S0&lt;43, bool&gt;::S5&lt;44, bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -10543,7 +10543,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-05291-S5-0e-S6"><a href="#S0-05291">S0</a>&lt;43, bool&gt;::<a href="#S0-05291-S5-0e">S5</a>&lt;44, bool&gt;::S6</h2>
+<h2 id="S0-05291-S5-0e-S6"><a href="#S0-05291-S5-0e-S6">S0&lt;43, bool&gt;::S5&lt;44, bool&gt;::S6</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -10587,7 +10587,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-05291-S5-0e-S6-S7-04"><a href="#S0-05291">S0</a>&lt;43, bool&gt;::<a href="#S0-05291-S5-0e">S5</a>&lt;44, bool&gt;::<a href="#S0-05291-S5-0e-S6">S6</a>::S7</h2>
+<h2 id="S0-05291-S5-0e-S6-S7-04"><a href="#S0-05291-S5-0e-S6-S7-04">S0&lt;43, bool&gt;::S5&lt;44, bool&gt;::S6::S7</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -10607,7 +10607,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-05291-S5-0e-S6-S7-0f"><a href="#S0-05291">S0</a>&lt;43, bool&gt;::<a href="#S0-05291-S5-0e">S5</a>&lt;44, bool&gt;::<a href="#S0-05291-S5-0e-S6">S6</a>::S7&lt;45, bool&gt;</h2>
+<h2 id="S0-05291-S5-0e-S6-S7-0f"><a href="#S0-05291-S5-0e-S6-S7-0f">S0&lt;43, bool&gt;::S5&lt;44, bool&gt;::S6::S7&lt;45, bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -10651,7 +10651,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-05291-S5-0e-S6-S7-0f-S8"><a href="#S0-05291">S0</a>&lt;43, bool&gt;::<a href="#S0-05291-S5-0e">S5</a>&lt;44, bool&gt;::<a href="#S0-05291-S5-0e-S6">S6</a>::<a href="#S0-05291-S5-0e-S6-S7-0f">S7</a>&lt;45, bool&gt;::S8</h2>
+<h2 id="S0-05291-S5-0e-S6-S7-0f-S8"><a href="#S0-05291-S5-0e-S6-S7-0f-S8">S0&lt;43, bool&gt;::S5&lt;44, bool&gt;::S6::S7&lt;45, bool&gt;::S8</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -10668,7 +10668,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-05291-S5-0e-S6-S7-0f-f7"><a href="#S0-05291">S0</a>&lt;43, bool&gt;::<a href="#S0-05291-S5-0e">S5</a>&lt;44, bool&gt;::<a href="#S0-05291-S5-0e-S6">S6</a>::<a href="#S0-05291-S5-0e-S6-S7-0f">S7</a>&lt;45, bool&gt;::f7</h2>
+<h2 id="S0-05291-S5-0e-S6-S7-0f-f7"><a href="#S0-05291-S5-0e-S6-S7-0f-f7">S0&lt;43, bool&gt;::S5&lt;44, bool&gt;::S6::S7&lt;45, bool&gt;::f7</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -10684,7 +10684,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-05291-S5-0e-S6-f6"><a href="#S0-05291">S0</a>&lt;43, bool&gt;::<a href="#S0-05291-S5-0e">S5</a>&lt;44, bool&gt;::<a href="#S0-05291-S5-0e-S6">S6</a>::f6</h2>
+<h2 id="S0-05291-S5-0e-S6-f6"><a href="#S0-05291-S5-0e-S6-f6">S0&lt;43, bool&gt;::S5&lt;44, bool&gt;::S6::f6</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -10700,7 +10700,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-05291-S5-0e-f5"><a href="#S0-05291">S0</a>&lt;43, bool&gt;::<a href="#S0-05291-S5-0e">S5</a>&lt;44, bool&gt;::f5</h2>
+<h2 id="S0-05291-S5-0e-f5"><a href="#S0-05291-S5-0e-f5">S0&lt;43, bool&gt;::S5&lt;44, bool&gt;::f5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -10716,7 +10716,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-05291-f0"><a href="#S0-05291">S0</a>&lt;43, bool&gt;::f0</h2>
+<h2 id="S0-05291-f0"><a href="#S0-05291-f0">S0&lt;43, bool&gt;::f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -10732,7 +10732,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-023">S0&lt;6, bool&gt;</h2>
+<h2 id="S0-023"><a href="#S0-023">S0&lt;6, bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -10777,7 +10777,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-023-S1"><a href="#S0-023">S0</a>&lt;6, bool&gt;::S1</h2>
+<h2 id="S0-023-S1"><a href="#S0-023-S1">S0&lt;6, bool&gt;::S1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -10807,7 +10807,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-023-S1-f1"><a href="#S0-023">S0</a>&lt;6, bool&gt;::<a href="#S0-023-S1">S1</a>::f1</h2>
+<h2 id="S0-023-S1-f1"><a href="#S0-023-S1-f1">S0&lt;6, bool&gt;::S1::f1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -10823,7 +10823,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-023-S5"><a href="#S0-023">S0</a>&lt;6, bool&gt;::S5</h2>
+<h2 id="S0-023-S5"><a href="#S0-023-S5">S0&lt;6, bool&gt;::S5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -10843,7 +10843,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-023-f0"><a href="#S0-023">S0</a>&lt;6, bool&gt;::f0</h2>
+<h2 id="S0-023-f0"><a href="#S0-023-f0">S0&lt;6, bool&gt;::f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -10859,7 +10859,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-04">S0&lt;8, bool&gt;</h2>
+<h2 id="S0-04"><a href="#S0-04">S0&lt;8, bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -10904,7 +10904,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-04-S1"><a href="#S0-04">S0</a>&lt;8, bool&gt;::S1</h2>
+<h2 id="S0-04-S1"><a href="#S0-04-S1">S0&lt;8, bool&gt;::S1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -10948,7 +10948,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-04-S1-S2-0e"><a href="#S0-04">S0</a>&lt;8, bool&gt;::<a href="#S0-04-S1">S1</a>::S2</h2>
+<h2 id="S0-04-S1-S2-0e"><a href="#S0-04-S1-S2-0e">S0&lt;8, bool&gt;::S1::S2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -10968,7 +10968,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-04-S1-S2-0a"><a href="#S0-04">S0</a>&lt;8, bool&gt;::<a href="#S0-04-S1">S1</a>::S2&lt;9, bool&gt;</h2>
+<h2 id="S0-04-S1-S2-0a"><a href="#S0-04-S1-S2-0a">S0&lt;8, bool&gt;::S1::S2&lt;9, bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -11012,7 +11012,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-04-S1-S2-0a-S4"><a href="#S0-04">S0</a>&lt;8, bool&gt;::<a href="#S0-04-S1">S1</a>::<a href="#S0-04-S1-S2-0a">S2</a>&lt;9, bool&gt;::S4</h2>
+<h2 id="S0-04-S1-S2-0a-S4"><a href="#S0-04-S1-S2-0a-S4">S0&lt;8, bool&gt;::S1::S2&lt;9, bool&gt;::S4</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -11032,7 +11032,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-04-S1-S2-0a-f2"><a href="#S0-04">S0</a>&lt;8, bool&gt;::<a href="#S0-04-S1">S1</a>::<a href="#S0-04-S1-S2-0a">S2</a>&lt;9, bool&gt;::f2</h2>
+<h2 id="S0-04-S1-S2-0a-f2"><a href="#S0-04-S1-S2-0a-f2">S0&lt;8, bool&gt;::S1::S2&lt;9, bool&gt;::f2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -11048,7 +11048,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-04-S1-f1"><a href="#S0-04">S0</a>&lt;8, bool&gt;::<a href="#S0-04-S1">S1</a>::f1</h2>
+<h2 id="S0-04-S1-f1"><a href="#S0-04-S1-f1">S0&lt;8, bool&gt;::S1::f1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -11064,7 +11064,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-04-S5"><a href="#S0-04">S0</a>&lt;8, bool&gt;::S5</h2>
+<h2 id="S0-04-S5"><a href="#S0-04-S5">S0&lt;8, bool&gt;::S5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -11084,7 +11084,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-04-f0"><a href="#S0-04">S0</a>&lt;8, bool&gt;::f0</h2>
+<h2 id="S0-04-f0"><a href="#S0-04-f0">S0&lt;8, bool&gt;::f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -11100,7 +11100,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-0c4">S0&lt;1, T*&gt;</h2>
+<h2 id="S0-0c4"><a href="#S0-0c4">S0&lt;1, T*&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/record/class-template-specializations-2.adoc b/test-files/golden-tests/symbols/record/class-template-specializations-2.adoc
index 53db6972b..2b2953b0b 100644
--- a/test-files/golden-tests/symbols/record/class-template-specializations-2.adoc
+++ b/test-files/golden-tests/symbols/record/class-template-specializations-2.adoc
@@ -29,7 +29,7 @@ struct A;
 ----
 
 [#A-06]
-== A&lt;double&gt;
+== <<A-0e,A>>&lt;double&gt;
 
 === Synopsis
 
@@ -52,7 +52,7 @@ struct <<A-0e,A>>&lt;double&gt;;
 |===
 
 [#A-06-D-0b]
-== <<A-06,A>>&lt;double&gt;::D
+== <<A-06,A&lt;double&gt;>>::D
 
 === Synopsis
 
@@ -74,7 +74,7 @@ struct D;
 |===
 
 [#A-06-D-0b-E-01]
-== <<A-06,A>>&lt;double&gt;::<<A-06-D-0b,D>>::E
+== <<A-06,A&lt;double&gt;>>::<<A-06-D-0b,D>>::E
 
 === Synopsis
 
@@ -87,7 +87,7 @@ struct E;
 ----
 
 [#A-06-D-0b-E-04]
-== <<A-06,A>>&lt;double&gt;::<<A-06-D-0b,D>>::E&lt;T*&gt;
+== <<A-06,A&lt;double&gt;>>::<<A-06-D-0b,D>>::<<A-06-D-0b-E-01,E>>&lt;T*&gt;
 
 === Synopsis
 
@@ -108,7 +108,7 @@ struct <<A-06-D-0b-E-01,E>>&lt;T*&gt;;
 |===
 
 [#A-06-D-0b-E-04-F]
-== <<A-06,A>>&lt;double&gt;::<<A-06-D-0b,D>>::<<A-06-D-0b-E-04,E>>&lt;T*&gt;::F
+== <<A-06,A&lt;double&gt;>>::<<A-06-D-0b,D>>::<<A-06-D-0b-E-04,E&lt;T*&gt;>>::F
 
 === Synopsis
 
@@ -120,7 +120,7 @@ struct F;
 ----
 
 [#A-06-D-07]
-== <<A-06,A>>&lt;double&gt;::D&lt;short&gt;
+== <<A-06,A&lt;double&gt;>>::<<A-06-D-0b,D>>&lt;short&gt;
 
 === Synopsis
 
@@ -142,7 +142,7 @@ struct <<A-06-D-0b,D>>&lt;short&gt;;
 |===
 
 [#A-06-D-07-E-07]
-== <<A-06,A>>&lt;double&gt;::<<A-06-D-07,D>>&lt;short&gt;::E
+== <<A-06,A&lt;double&gt;>>::<<A-06-D-07,D&lt;short&gt;>>::E
 
 === Synopsis
 
@@ -155,7 +155,7 @@ struct E;
 ----
 
 [#A-06-D-07-E-01]
-== <<A-06,A>>&lt;double&gt;::<<A-06-D-07,D>>&lt;short&gt;::E&lt;int*&gt;
+== <<A-06,A&lt;double&gt;>>::<<A-06-D-07,D&lt;short&gt;>>::<<A-06-D-0b-E-01,E>>&lt;int*&gt;
 
 === Synopsis
 
@@ -176,7 +176,7 @@ struct <<A-06-D-0b-E-01,E>>&lt;int*&gt;;
 |===
 
 [#A-06-D-07-E-01-F]
-== <<A-06,A>>&lt;double&gt;::<<A-06-D-07,D>>&lt;short&gt;::<<A-06-D-07-E-01,E>>&lt;int*&gt;::F
+== <<A-06,A&lt;double&gt;>>::<<A-06-D-07,D&lt;short&gt;>>::<<A-06-D-07-E-01,E&lt;int*&gt;>>::F
 
 === Synopsis
 
@@ -188,7 +188,7 @@ struct F;
 ----
 
 [#A-06-D-04]
-== <<A-06,A>>&lt;double&gt;::D&lt;float&gt;
+== <<A-06,A&lt;double&gt;>>::<<A-06-D-0b,D>>&lt;float&gt;
 
 === Synopsis
 
@@ -210,7 +210,7 @@ struct <<A-06-D-0b,D>>&lt;float&gt;;
 |===
 
 [#A-06-D-04-G-06]
-== <<A-06,A>>&lt;double&gt;::<<A-06-D-04,D>>&lt;float&gt;::G
+== <<A-06,A&lt;double&gt;>>::<<A-06-D-04,D&lt;float&gt;>>::G
 
 === Synopsis
 
@@ -223,7 +223,7 @@ struct G;
 ----
 
 [#A-06-D-04-G-0c]
-== <<A-06,A>>&lt;double&gt;::<<A-06-D-04,D>>&lt;float&gt;::G&lt;T*&gt;
+== <<A-06,A&lt;double&gt;>>::<<A-06-D-04,D&lt;float&gt;>>::<<A-06-D-04-G-06,G>>&lt;T*&gt;
 
 === Synopsis
 
@@ -236,7 +236,7 @@ struct <<A-06-D-04-G-06,G>>&lt;T*&gt;;
 ----
 
 [#A-02]
-== A&lt;long*&gt;
+== <<A-0e,A>>&lt;long*&gt;
 
 === Synopsis
 
@@ -259,7 +259,7 @@ struct <<A-0e,A>>&lt;long*&gt;;
 |===
 
 [#A-02-B-06]
-== <<A-02,A>>&lt;long*&gt;::B
+== <<A-02,A&lt;long*&gt;>>::B
 
 === Synopsis
 
@@ -272,7 +272,7 @@ struct B;
 ----
 
 [#A-02-B-0d]
-== <<A-02,A>>&lt;long*&gt;::B&lt;int&gt;
+== <<A-02,A&lt;long*&gt;>>::<<A-03-B-05,B>>&lt;int&gt;
 
 === Synopsis
 
@@ -285,7 +285,7 @@ struct <<A-03-B-05,B>>&lt;int&gt;;
 ----
 
 [#A-02-B-05]
-== <<A-02,A>>&lt;long*&gt;::B&lt;int*&gt;
+== <<A-02,A&lt;long*&gt;>>::<<A-03-B-05,B>>&lt;int*&gt;
 
 === Synopsis
 
@@ -306,7 +306,7 @@ struct <<A-03-B-05,B>>&lt;int*&gt;;
 |===
 
 [#A-02-B-05-C]
-== <<A-02,A>>&lt;long*&gt;::<<A-02-B-05,B>>&lt;int*&gt;::C
+== <<A-02,A&lt;long*&gt;>>::<<A-02-B-05,B&lt;int*&gt;>>::C
 
 === Synopsis
 
@@ -318,7 +318,7 @@ struct C;
 ----
 
 [#A-03]
-== A&lt;T*&gt;
+== <<A-0e,A>>&lt;T*&gt;
 
 === Synopsis
 
@@ -341,7 +341,7 @@ struct <<A-0e,A>>&lt;T*&gt;;
 |===
 
 [#A-03-B-05]
-== <<A-03,A>>&lt;T*&gt;::B
+== <<A-03,A&lt;T*&gt;>>::B
 
 === Synopsis
 
@@ -354,7 +354,7 @@ struct B;
 ----
 
 [#A-03-B-0b]
-== <<A-03,A>>&lt;T*&gt;::B&lt;int&gt;
+== <<A-03,A&lt;T*&gt;>>::<<A-03-B-05,B>>&lt;int&gt;
 
 === Synopsis
 
@@ -367,7 +367,7 @@ struct <<A-03-B-05,B>>&lt;int&gt;;
 ----
 
 [#A-03-B-01]
-== <<A-03,A>>&lt;T*&gt;::B&lt;U*&gt;
+== <<A-03,A&lt;T*&gt;>>::<<A-03-B-05,B>>&lt;U*&gt;
 
 === Synopsis
 
@@ -388,7 +388,7 @@ struct <<A-03-B-05,B>>&lt;U*&gt;;
 |===
 
 [#A-03-B-01-C]
-== <<A-03,A>>&lt;T*&gt;::<<A-03-B-01,B>>&lt;U*&gt;::C
+== <<A-03,A&lt;T*&gt;>>::<<A-03-B-01,B&lt;U*&gt;>>::C
 
 === Synopsis
 
diff --git a/test-files/golden-tests/symbols/record/class-template-specializations-2.html b/test-files/golden-tests/symbols/record/class-template-specializations-2.html
index 354fcdc12..81f3dc2bc 100644
--- a/test-files/golden-tests/symbols/record/class-template-specializations-2.html
+++ b/test-files/golden-tests/symbols/record/class-template-specializations-2.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -28,7 +28,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-0e">A</h2>
+<h2 id="A-0e"><a href="#A-0e">A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -46,7 +46,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-06">A&lt;double&gt;</h2>
+<h2 id="A-06"><a href="#A-06">A&lt;double&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -79,7 +79,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-06-D-0b"><a href="#A-06">A</a>&lt;double&gt;::D</h2>
+<h2 id="A-06-D-0b"><a href="#A-06-D-0b">A&lt;double&gt;::D</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -111,7 +111,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-06-D-0b-E-01"><a href="#A-06">A</a>&lt;double&gt;::<a href="#A-06-D-0b">D</a>::E</h2>
+<h2 id="A-06-D-0b-E-01"><a href="#A-06-D-0b-E-01">A&lt;double&gt;::D::E</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -129,7 +129,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-06-D-0b-E-04"><a href="#A-06">A</a>&lt;double&gt;::<a href="#A-06-D-0b">D</a>::E&lt;T*&gt;</h2>
+<h2 id="A-06-D-0b-E-04"><a href="#A-06-D-0b-E-04">A&lt;double&gt;::D::E&lt;T*&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -160,7 +160,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-06-D-0b-E-04-F"><a href="#A-06">A</a>&lt;double&gt;::<a href="#A-06-D-0b">D</a>::<a href="#A-06-D-0b-E-04">E</a>&lt;T*&gt;::F</h2>
+<h2 id="A-06-D-0b-E-04-F"><a href="#A-06-D-0b-E-04-F">A&lt;double&gt;::D::E&lt;T*&gt;::F</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -177,7 +177,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-06-D-07"><a href="#A-06">A</a>&lt;double&gt;::D&lt;short&gt;</h2>
+<h2 id="A-06-D-07"><a href="#A-06-D-07">A&lt;double&gt;::D&lt;short&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -209,7 +209,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-06-D-07-E-07"><a href="#A-06">A</a>&lt;double&gt;::<a href="#A-06-D-07">D</a>&lt;short&gt;::E</h2>
+<h2 id="A-06-D-07-E-07"><a href="#A-06-D-07-E-07">A&lt;double&gt;::D&lt;short&gt;::E</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -227,7 +227,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-06-D-07-E-01"><a href="#A-06">A</a>&lt;double&gt;::<a href="#A-06-D-07">D</a>&lt;short&gt;::E&lt;int*&gt;</h2>
+<h2 id="A-06-D-07-E-01"><a href="#A-06-D-07-E-01">A&lt;double&gt;::D&lt;short&gt;::E&lt;int*&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -258,7 +258,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-06-D-07-E-01-F"><a href="#A-06">A</a>&lt;double&gt;::<a href="#A-06-D-07">D</a>&lt;short&gt;::<a href="#A-06-D-07-E-01">E</a>&lt;int*&gt;::F</h2>
+<h2 id="A-06-D-07-E-01-F"><a href="#A-06-D-07-E-01-F">A&lt;double&gt;::D&lt;short&gt;::E&lt;int*&gt;::F</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -275,7 +275,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-06-D-04"><a href="#A-06">A</a>&lt;double&gt;::D&lt;float&gt;</h2>
+<h2 id="A-06-D-04"><a href="#A-06-D-04">A&lt;double&gt;::D&lt;float&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -307,7 +307,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-06-D-04-G-06"><a href="#A-06">A</a>&lt;double&gt;::<a href="#A-06-D-04">D</a>&lt;float&gt;::G</h2>
+<h2 id="A-06-D-04-G-06"><a href="#A-06-D-04-G-06">A&lt;double&gt;::D&lt;float&gt;::G</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -325,7 +325,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-06-D-04-G-0c"><a href="#A-06">A</a>&lt;double&gt;::<a href="#A-06-D-04">D</a>&lt;float&gt;::G&lt;T*&gt;</h2>
+<h2 id="A-06-D-04-G-0c"><a href="#A-06-D-04-G-0c">A&lt;double&gt;::D&lt;float&gt;::G&lt;T*&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -343,7 +343,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-02">A&lt;long*&gt;</h2>
+<h2 id="A-02"><a href="#A-02">A&lt;long*&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -376,7 +376,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-02-B-06"><a href="#A-02">A</a>&lt;long*&gt;::B</h2>
+<h2 id="A-02-B-06"><a href="#A-02-B-06">A&lt;long*&gt;::B</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -394,7 +394,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-02-B-0d"><a href="#A-02">A</a>&lt;long*&gt;::B&lt;int&gt;</h2>
+<h2 id="A-02-B-0d"><a href="#A-02-B-0d">A&lt;long*&gt;::B&lt;int&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -412,7 +412,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-02-B-05"><a href="#A-02">A</a>&lt;long*&gt;::B&lt;int*&gt;</h2>
+<h2 id="A-02-B-05"><a href="#A-02-B-05">A&lt;long*&gt;::B&lt;int*&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -443,7 +443,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-02-B-05-C"><a href="#A-02">A</a>&lt;long*&gt;::<a href="#A-02-B-05">B</a>&lt;int*&gt;::C</h2>
+<h2 id="A-02-B-05-C"><a href="#A-02-B-05-C">A&lt;long*&gt;::B&lt;int*&gt;::C</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -460,7 +460,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-03">A&lt;T*&gt;</h2>
+<h2 id="A-03"><a href="#A-03">A&lt;T*&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -493,7 +493,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-03-B-05"><a href="#A-03">A</a>&lt;T*&gt;::B</h2>
+<h2 id="A-03-B-05"><a href="#A-03-B-05">A&lt;T*&gt;::B</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -511,7 +511,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-03-B-0b"><a href="#A-03">A</a>&lt;T*&gt;::B&lt;int&gt;</h2>
+<h2 id="A-03-B-0b"><a href="#A-03-B-0b">A&lt;T*&gt;::B&lt;int&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -529,7 +529,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-03-B-01"><a href="#A-03">A</a>&lt;T*&gt;::B&lt;U*&gt;</h2>
+<h2 id="A-03-B-01"><a href="#A-03-B-01">A&lt;T*&gt;::B&lt;U*&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -560,7 +560,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-03-B-01-C"><a href="#A-03">A</a>&lt;T*&gt;::<a href="#A-03-B-01">B</a>&lt;U*&gt;::C</h2>
+<h2 id="A-03-B-01-C"><a href="#A-03-B-01-C">A&lt;T*&gt;::B&lt;U*&gt;::C</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/record/class-template-specializations-3.adoc b/test-files/golden-tests/symbols/record/class-template-specializations-3.adoc
index fbef1690d..c16436e19 100644
--- a/test-files/golden-tests/symbols/record/class-template-specializations-3.adoc
+++ b/test-files/golden-tests/symbols/record/class-template-specializations-3.adoc
@@ -88,7 +88,7 @@ struct D;
 ----
 
 [#A-0e-B-07-D-0f]
-== <<A-0e,A>>::<<A-0e-B-07,B>>::D&lt;bool&gt;
+== <<A-0e,A>>::<<A-0e-B-07,B>>::<<A-0e-B-07-D-09,D>>&lt;bool&gt;
 
 === Synopsis
 
@@ -101,7 +101,7 @@ struct <<A-0e-B-07-D-09,D>>&lt;bool&gt;;
 ----
 
 [#A-0e-B-00]
-== <<A-0e,A>>::B&lt;double&gt;
+== <<A-0e,A>>::<<A-0e-B-07,B>>&lt;double&gt;
 
 === Synopsis
 
@@ -124,7 +124,7 @@ struct <<A-0e-B-07,B>>&lt;double&gt;;
 |===
 
 [#A-0e-B-00-C]
-== <<A-0e,A>>::<<A-0e-B-00,B>>&lt;double&gt;::C
+== <<A-0e,A>>::<<A-0e-B-00,B&lt;double&gt;>>::C
 
 === Synopsis
 
@@ -136,7 +136,7 @@ struct C;
 ----
 
 [#A-0e-B-00-D-09]
-== <<A-0e,A>>::<<A-0e-B-00,B>>&lt;double&gt;::D
+== <<A-0e,A>>::<<A-0e-B-00,B&lt;double&gt;>>::D
 
 === Synopsis
 
@@ -149,7 +149,7 @@ struct D;
 ----
 
 [#A-0e-B-00-D-0d]
-== <<A-0e,A>>::<<A-0e-B-00,B>>&lt;double&gt;::D&lt;bool&gt;
+== <<A-0e,A>>::<<A-0e-B-00,B&lt;double&gt;>>::<<A-0e-B-00-D-09,D>>&lt;bool&gt;
 
 === Synopsis
 
@@ -162,7 +162,7 @@ struct <<A-0e-B-00-D-09,D>>&lt;bool&gt;;
 ----
 
 [#A-00]
-== A&lt;short&gt;
+== <<A-0e,A>>&lt;short&gt;
 
 === Synopsis
 
@@ -185,7 +185,7 @@ struct <<A-0e,A>>&lt;short&gt;;
 |===
 
 [#A-00-B-0e]
-== <<A-00,A>>&lt;short&gt;::B
+== <<A-00,A&lt;short&gt;>>::B
 
 === Synopsis
 
@@ -198,7 +198,7 @@ struct B;
 ----
 
 [#A-00-B-00]
-== <<A-00,A>>&lt;short&gt;::B&lt;void&gt;
+== <<A-00,A&lt;short&gt;>>::<<A-0e-B-07,B>>&lt;void&gt;
 
 === Synopsis
 
@@ -221,7 +221,7 @@ struct <<A-0e-B-07,B>>&lt;void&gt;;
 |===
 
 [#A-00-B-00-C]
-== <<A-00,A>>&lt;short&gt;::<<A-00-B-00,B>>&lt;void&gt;::C
+== <<A-00,A&lt;short&gt;>>::<<A-00-B-00,B&lt;void&gt;>>::C
 
 === Synopsis
 
@@ -233,7 +233,7 @@ struct C;
 ----
 
 [#A-00-B-00-D-03]
-== <<A-00,A>>&lt;short&gt;::<<A-00-B-00,B>>&lt;void&gt;::D
+== <<A-00,A&lt;short&gt;>>::<<A-00-B-00,B&lt;void&gt;>>::D
 
 === Synopsis
 
@@ -246,7 +246,7 @@ struct D;
 ----
 
 [#A-00-B-00-D-07]
-== <<A-00,A>>&lt;short&gt;::<<A-00-B-00,B>>&lt;void&gt;::D&lt;bool&gt;
+== <<A-00,A&lt;short&gt;>>::<<A-00-B-00,B&lt;void&gt;>>::<<A-00-B-00-D-03,D>>&lt;bool&gt;
 
 === Synopsis
 
@@ -259,7 +259,7 @@ struct <<A-00-B-00-D-03,D>>&lt;bool&gt;;
 ----
 
 [#A-00-B-07]
-== <<A-00,A>>&lt;short&gt;::B&lt;double&gt;
+== <<A-00,A&lt;short&gt;>>::<<A-0e-B-07,B>>&lt;double&gt;
 
 === Synopsis
 
@@ -282,7 +282,7 @@ struct <<A-0e-B-07,B>>&lt;double&gt;;
 |===
 
 [#A-00-B-07-C]
-== <<A-00,A>>&lt;short&gt;::<<A-00-B-07,B>>&lt;double&gt;::C
+== <<A-00,A&lt;short&gt;>>::<<A-00-B-07,B&lt;double&gt;>>::C
 
 === Synopsis
 
@@ -294,7 +294,7 @@ struct C;
 ----
 
 [#A-00-B-07-D-015b]
-== <<A-00,A>>&lt;short&gt;::<<A-00-B-07,B>>&lt;double&gt;::D
+== <<A-00,A&lt;short&gt;>>::<<A-00-B-07,B&lt;double&gt;>>::D
 
 === Synopsis
 
@@ -307,7 +307,7 @@ struct D;
 ----
 
 [#A-00-B-07-D-0150]
-== <<A-00,A>>&lt;short&gt;::<<A-00-B-07,B>>&lt;double&gt;::D&lt;bool&gt;
+== <<A-00,A&lt;short&gt;>>::<<A-00-B-07,B&lt;double&gt;>>::<<A-0e-B-00-D-09,D>>&lt;bool&gt;
 
 === Synopsis
 
@@ -320,7 +320,7 @@ struct <<A-0e-B-00-D-09,D>>&lt;bool&gt;;
 ----
 
 [#A-07]
-== A&lt;unsigned int&gt;
+== <<A-0e,A>>&lt;unsigned int&gt;
 
 === Synopsis
 
@@ -343,7 +343,7 @@ struct <<A-0e,A>>&lt;unsigned int&gt;;
 |===
 
 [#A-07-B-03a]
-== <<A-07,A>>&lt;unsigned int&gt;::B
+== <<A-07,A&lt;unsigned int&gt;>>::B
 
 === Synopsis
 
@@ -356,7 +356,7 @@ struct B;
 ----
 
 [#A-07-B-05]
-== <<A-07,A>>&lt;unsigned int&gt;::B&lt;float&gt;
+== <<A-07,A&lt;unsigned int&gt;>>::<<A-0e-B-07,B>>&lt;float&gt;
 
 === Synopsis
 
@@ -379,7 +379,7 @@ struct <<A-0e-B-07,B>>&lt;float&gt;;
 |===
 
 [#A-07-B-05-C]
-== <<A-07,A>>&lt;unsigned int&gt;::<<A-07-B-05,B>>&lt;float&gt;::C
+== <<A-07,A&lt;unsigned int&gt;>>::<<A-07-B-05,B&lt;float&gt;>>::C
 
 === Synopsis
 
@@ -391,7 +391,7 @@ struct C;
 ----
 
 [#A-07-B-05-D-0e]
-== <<A-07,A>>&lt;unsigned int&gt;::<<A-07-B-05,B>>&lt;float&gt;::D
+== <<A-07,A&lt;unsigned int&gt;>>::<<A-07-B-05,B&lt;float&gt;>>::D
 
 === Synopsis
 
@@ -404,7 +404,7 @@ struct D;
 ----
 
 [#A-07-B-05-D-01]
-== <<A-07,A>>&lt;unsigned int&gt;::<<A-07-B-05,B>>&lt;float&gt;::D&lt;bool&gt;
+== <<A-07,A&lt;unsigned int&gt;>>::<<A-07-B-05,B&lt;float&gt;>>::<<A-0e-B-07-D-09,D>>&lt;bool&gt;
 
 === Synopsis
 
@@ -417,7 +417,7 @@ struct <<A-0e-B-07-D-09,D>>&lt;bool&gt;;
 ----
 
 [#A-07-B-03e]
-== <<A-07,A>>&lt;unsigned int&gt;::B&lt;double&gt;
+== <<A-07,A&lt;unsigned int&gt;>>::<<A-0e-B-07,B>>&lt;double&gt;
 
 === Synopsis
 
@@ -440,7 +440,7 @@ struct <<A-0e-B-07,B>>&lt;double&gt;;
 |===
 
 [#A-07-B-03e-C]
-== <<A-07,A>>&lt;unsigned int&gt;::<<A-07-B-03e,B>>&lt;double&gt;::C
+== <<A-07,A&lt;unsigned int&gt;>>::<<A-07-B-03e,B&lt;double&gt;>>::C
 
 === Synopsis
 
@@ -452,7 +452,7 @@ struct C;
 ----
 
 [#A-07-B-03e-D-01]
-== <<A-07,A>>&lt;unsigned int&gt;::<<A-07-B-03e,B>>&lt;double&gt;::D
+== <<A-07,A&lt;unsigned int&gt;>>::<<A-07-B-03e,B&lt;double&gt;>>::D
 
 === Synopsis
 
@@ -465,7 +465,7 @@ struct D;
 ----
 
 [#A-07-B-03e-D-0f]
-== <<A-07,A>>&lt;unsigned int&gt;::<<A-07-B-03e,B>>&lt;double&gt;::D&lt;bool&gt;
+== <<A-07,A&lt;unsigned int&gt;>>::<<A-07-B-03e,B&lt;double&gt;>>::<<A-0e-B-00-D-09,D>>&lt;bool&gt;
 
 === Synopsis
 
@@ -478,7 +478,7 @@ struct <<A-0e-B-00-D-09,D>>&lt;bool&gt;;
 ----
 
 [#A-0c]
-== A&lt;long&gt;
+== <<A-0e,A>>&lt;long&gt;
 
 === Synopsis
 
@@ -501,7 +501,7 @@ struct <<A-0e,A>>&lt;long&gt;;
 |===
 
 [#A-0c-B-0b]
-== <<A-0c,A>>&lt;long&gt;::B
+== <<A-0c,A&lt;long&gt;>>::B
 
 === Synopsis
 
@@ -524,7 +524,7 @@ struct B;
 |===
 
 [#A-0c-B-0b-C]
-== <<A-0c,A>>&lt;long&gt;::<<A-0c-B-0b,B>>::C
+== <<A-0c,A&lt;long&gt;>>::<<A-0c-B-0b,B>>::C
 
 === Synopsis
 
@@ -536,7 +536,7 @@ struct C;
 ----
 
 [#A-0c-B-0b-D-00]
-== <<A-0c,A>>&lt;long&gt;::<<A-0c-B-0b,B>>::D
+== <<A-0c,A&lt;long&gt;>>::<<A-0c-B-0b,B>>::D
 
 === Synopsis
 
@@ -549,7 +549,7 @@ struct D;
 ----
 
 [#A-0c-B-0b-D-0b]
-== <<A-0c,A>>&lt;long&gt;::<<A-0c-B-0b,B>>::D&lt;bool&gt;
+== <<A-0c,A&lt;long&gt;>>::<<A-0c-B-0b,B>>::<<A-0c-B-0b-D-00,D>>&lt;bool&gt;
 
 === Synopsis
 
@@ -562,7 +562,7 @@ struct <<A-0c-B-0b-D-00,D>>&lt;bool&gt;;
 ----
 
 [#A-0c-B-08]
-== <<A-0c,A>>&lt;long&gt;::B&lt;float&gt;
+== <<A-0c,A&lt;long&gt;>>::<<A-0c-B-0b,B>>&lt;float&gt;
 
 === Synopsis
 
@@ -585,7 +585,7 @@ struct <<A-0c-B-0b,B>>&lt;float&gt;;
 |===
 
 [#A-0c-B-08-C]
-== <<A-0c,A>>&lt;long&gt;::<<A-0c-B-08,B>>&lt;float&gt;::C
+== <<A-0c,A&lt;long&gt;>>::<<A-0c-B-08,B&lt;float&gt;>>::C
 
 === Synopsis
 
@@ -597,7 +597,7 @@ struct C;
 ----
 
 [#A-0c-B-08-D-08]
-== <<A-0c,A>>&lt;long&gt;::<<A-0c-B-08,B>>&lt;float&gt;::D
+== <<A-0c,A&lt;long&gt;>>::<<A-0c-B-08,B&lt;float&gt;>>::D
 
 === Synopsis
 
@@ -610,7 +610,7 @@ struct D;
 ----
 
 [#A-0c-B-08-D-03]
-== <<A-0c,A>>&lt;long&gt;::<<A-0c-B-08,B>>&lt;float&gt;::D&lt;bool&gt;
+== <<A-0c,A&lt;long&gt;>>::<<A-0c-B-08,B&lt;float&gt;>>::<<A-0c-B-0b-D-00,D>>&lt;bool&gt;
 
 === Synopsis
 
@@ -623,7 +623,7 @@ struct <<A-0c-B-0b-D-00,D>>&lt;bool&gt;;
 ----
 
 [#A-0c-B-0d]
-== <<A-0c,A>>&lt;long&gt;::B&lt;double&gt;
+== <<A-0c,A&lt;long&gt;>>::<<A-0c-B-0b,B>>&lt;double&gt;
 
 === Synopsis
 
@@ -646,7 +646,7 @@ struct <<A-0c-B-0b,B>>&lt;double&gt;;
 |===
 
 [#A-0c-B-0d-C]
-== <<A-0c,A>>&lt;long&gt;::<<A-0c-B-0d,B>>&lt;double&gt;::C
+== <<A-0c,A&lt;long&gt;>>::<<A-0c-B-0d,B&lt;double&gt;>>::C
 
 === Synopsis
 
@@ -658,7 +658,7 @@ struct C;
 ----
 
 [#A-0c-B-0d-D-0c]
-== <<A-0c,A>>&lt;long&gt;::<<A-0c-B-0d,B>>&lt;double&gt;::D
+== <<A-0c,A&lt;long&gt;>>::<<A-0c-B-0d,B&lt;double&gt;>>::D
 
 === Synopsis
 
@@ -671,7 +671,7 @@ struct D;
 ----
 
 [#A-0c-B-0d-D-03]
-== <<A-0c,A>>&lt;long&gt;::<<A-0c-B-0d,B>>&lt;double&gt;::D&lt;bool&gt;
+== <<A-0c,A&lt;long&gt;>>::<<A-0c-B-0d,B&lt;double&gt;>>::<<A-0e-B-00-D-09,D>>&lt;bool&gt;
 
 === Synopsis
 
@@ -684,7 +684,7 @@ struct <<A-0e-B-00-D-09,D>>&lt;bool&gt;;
 ----
 
 [#A-01]
-== A&lt;float&gt;
+== <<A-0e,A>>&lt;float&gt;
 
 === Synopsis
 
@@ -706,7 +706,7 @@ struct <<A-0e,A>>&lt;float&gt;;
 |===
 
 [#A-01-B-07]
-== <<A-01,A>>&lt;float&gt;::B
+== <<A-01,A&lt;float&gt;>>::B
 
 === Synopsis
 
@@ -719,7 +719,7 @@ struct B;
 ----
 
 [#A-01-B-08]
-== <<A-01,A>>&lt;float&gt;::B&lt;double, double&gt;
+== <<A-01,A&lt;float&gt;>>::<<A-0e-B-07,B>>&lt;double, double&gt;
 
 === Synopsis
 
@@ -742,7 +742,7 @@ struct <<A-0e-B-07,B>>&lt;double, double&gt;;
 |===
 
 [#A-01-B-08-C]
-== <<A-01,A>>&lt;float&gt;::<<A-01-B-08,B>>&lt;double, double&gt;::C
+== <<A-01,A&lt;float&gt;>>::<<A-01-B-08,B&lt;double, double&gt;>>::C
 
 === Synopsis
 
@@ -754,7 +754,7 @@ struct C;
 ----
 
 [#A-01-B-08-D-0ae]
-== <<A-01,A>>&lt;float&gt;::<<A-01-B-08,B>>&lt;double, double&gt;::D
+== <<A-01,A&lt;float&gt;>>::<<A-01-B-08,B&lt;double, double&gt;>>::D
 
 === Synopsis
 
@@ -767,7 +767,7 @@ struct D;
 ----
 
 [#A-01-B-08-D-0af]
-== <<A-01,A>>&lt;float&gt;::<<A-01-B-08,B>>&lt;double, double&gt;::D&lt;bool, bool&gt;
+== <<A-01,A&lt;float&gt;>>::<<A-01-B-08,B&lt;double, double&gt;>>::<<A-0e-B-00-D-09,D>>&lt;bool, bool&gt;
 
 === Synopsis
 
diff --git a/test-files/golden-tests/symbols/record/class-template-specializations-3.html b/test-files/golden-tests/symbols/record/class-template-specializations-3.html
index 89443e3f7..b2720026d 100644
--- a/test-files/golden-tests/symbols/record/class-template-specializations-3.html
+++ b/test-files/golden-tests/symbols/record/class-template-specializations-3.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -30,7 +30,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-0e">A</h2>
+<h2 id="A-0e"><a href="#A-0e">A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -62,7 +62,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-0e-B-07"><a href="#A-0e">A</a>::B</h2>
+<h2 id="A-0e-B-07"><a href="#A-0e-B-07">A::B</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -95,7 +95,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-0e-B-07-C"><a href="#A-0e">A</a>::<a href="#A-0e-B-07">B</a>::C</h2>
+<h2 id="A-0e-B-07-C"><a href="#A-0e-B-07-C">A::B::C</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -112,7 +112,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-0e-B-07-D-09"><a href="#A-0e">A</a>::<a href="#A-0e-B-07">B</a>::D</h2>
+<h2 id="A-0e-B-07-D-09"><a href="#A-0e-B-07-D-09">A::B::D</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -130,7 +130,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-0e-B-07-D-0f"><a href="#A-0e">A</a>::<a href="#A-0e-B-07">B</a>::D&lt;bool&gt;</h2>
+<h2 id="A-0e-B-07-D-0f"><a href="#A-0e-B-07-D-0f">A::B::D&lt;bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -148,7 +148,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-0e-B-00"><a href="#A-0e">A</a>::B&lt;double&gt;</h2>
+<h2 id="A-0e-B-00"><a href="#A-0e-B-00">A::B&lt;double&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -181,7 +181,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-0e-B-00-C"><a href="#A-0e">A</a>::<a href="#A-0e-B-00">B</a>&lt;double&gt;::C</h2>
+<h2 id="A-0e-B-00-C"><a href="#A-0e-B-00-C">A::B&lt;double&gt;::C</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -198,7 +198,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-0e-B-00-D-09"><a href="#A-0e">A</a>::<a href="#A-0e-B-00">B</a>&lt;double&gt;::D</h2>
+<h2 id="A-0e-B-00-D-09"><a href="#A-0e-B-00-D-09">A::B&lt;double&gt;::D</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -216,7 +216,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-0e-B-00-D-0d"><a href="#A-0e">A</a>::<a href="#A-0e-B-00">B</a>&lt;double&gt;::D&lt;bool&gt;</h2>
+<h2 id="A-0e-B-00-D-0d"><a href="#A-0e-B-00-D-0d">A::B&lt;double&gt;::D&lt;bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -234,7 +234,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-00">A&lt;short&gt;</h2>
+<h2 id="A-00"><a href="#A-00">A&lt;short&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -267,7 +267,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-00-B-0e"><a href="#A-00">A</a>&lt;short&gt;::B</h2>
+<h2 id="A-00-B-0e"><a href="#A-00-B-0e">A&lt;short&gt;::B</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -285,7 +285,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-00-B-00"><a href="#A-00">A</a>&lt;short&gt;::B&lt;void&gt;</h2>
+<h2 id="A-00-B-00"><a href="#A-00-B-00">A&lt;short&gt;::B&lt;void&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -318,7 +318,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-00-B-00-C"><a href="#A-00">A</a>&lt;short&gt;::<a href="#A-00-B-00">B</a>&lt;void&gt;::C</h2>
+<h2 id="A-00-B-00-C"><a href="#A-00-B-00-C">A&lt;short&gt;::B&lt;void&gt;::C</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -335,7 +335,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-00-B-00-D-03"><a href="#A-00">A</a>&lt;short&gt;::<a href="#A-00-B-00">B</a>&lt;void&gt;::D</h2>
+<h2 id="A-00-B-00-D-03"><a href="#A-00-B-00-D-03">A&lt;short&gt;::B&lt;void&gt;::D</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -353,7 +353,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-00-B-00-D-07"><a href="#A-00">A</a>&lt;short&gt;::<a href="#A-00-B-00">B</a>&lt;void&gt;::D&lt;bool&gt;</h2>
+<h2 id="A-00-B-00-D-07"><a href="#A-00-B-00-D-07">A&lt;short&gt;::B&lt;void&gt;::D&lt;bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -371,7 +371,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-00-B-07"><a href="#A-00">A</a>&lt;short&gt;::B&lt;double&gt;</h2>
+<h2 id="A-00-B-07"><a href="#A-00-B-07">A&lt;short&gt;::B&lt;double&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -404,7 +404,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-00-B-07-C"><a href="#A-00">A</a>&lt;short&gt;::<a href="#A-00-B-07">B</a>&lt;double&gt;::C</h2>
+<h2 id="A-00-B-07-C"><a href="#A-00-B-07-C">A&lt;short&gt;::B&lt;double&gt;::C</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -421,7 +421,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-00-B-07-D-015b"><a href="#A-00">A</a>&lt;short&gt;::<a href="#A-00-B-07">B</a>&lt;double&gt;::D</h2>
+<h2 id="A-00-B-07-D-015b"><a href="#A-00-B-07-D-015b">A&lt;short&gt;::B&lt;double&gt;::D</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -439,7 +439,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-00-B-07-D-0150"><a href="#A-00">A</a>&lt;short&gt;::<a href="#A-00-B-07">B</a>&lt;double&gt;::D&lt;bool&gt;</h2>
+<h2 id="A-00-B-07-D-0150"><a href="#A-00-B-07-D-0150">A&lt;short&gt;::B&lt;double&gt;::D&lt;bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -457,7 +457,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-07">A&lt;unsigned int&gt;</h2>
+<h2 id="A-07"><a href="#A-07">A&lt;unsigned int&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -490,7 +490,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-07-B-03a"><a href="#A-07">A</a>&lt;unsigned int&gt;::B</h2>
+<h2 id="A-07-B-03a"><a href="#A-07-B-03a">A&lt;unsigned int&gt;::B</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -508,7 +508,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-07-B-05"><a href="#A-07">A</a>&lt;unsigned int&gt;::B&lt;float&gt;</h2>
+<h2 id="A-07-B-05"><a href="#A-07-B-05">A&lt;unsigned int&gt;::B&lt;float&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -541,7 +541,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-07-B-05-C"><a href="#A-07">A</a>&lt;unsigned int&gt;::<a href="#A-07-B-05">B</a>&lt;float&gt;::C</h2>
+<h2 id="A-07-B-05-C"><a href="#A-07-B-05-C">A&lt;unsigned int&gt;::B&lt;float&gt;::C</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -558,7 +558,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-07-B-05-D-0e"><a href="#A-07">A</a>&lt;unsigned int&gt;::<a href="#A-07-B-05">B</a>&lt;float&gt;::D</h2>
+<h2 id="A-07-B-05-D-0e"><a href="#A-07-B-05-D-0e">A&lt;unsigned int&gt;::B&lt;float&gt;::D</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -576,7 +576,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-07-B-05-D-01"><a href="#A-07">A</a>&lt;unsigned int&gt;::<a href="#A-07-B-05">B</a>&lt;float&gt;::D&lt;bool&gt;</h2>
+<h2 id="A-07-B-05-D-01"><a href="#A-07-B-05-D-01">A&lt;unsigned int&gt;::B&lt;float&gt;::D&lt;bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -594,7 +594,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-07-B-03e"><a href="#A-07">A</a>&lt;unsigned int&gt;::B&lt;double&gt;</h2>
+<h2 id="A-07-B-03e"><a href="#A-07-B-03e">A&lt;unsigned int&gt;::B&lt;double&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -627,7 +627,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-07-B-03e-C"><a href="#A-07">A</a>&lt;unsigned int&gt;::<a href="#A-07-B-03e">B</a>&lt;double&gt;::C</h2>
+<h2 id="A-07-B-03e-C"><a href="#A-07-B-03e-C">A&lt;unsigned int&gt;::B&lt;double&gt;::C</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -644,7 +644,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-07-B-03e-D-01"><a href="#A-07">A</a>&lt;unsigned int&gt;::<a href="#A-07-B-03e">B</a>&lt;double&gt;::D</h2>
+<h2 id="A-07-B-03e-D-01"><a href="#A-07-B-03e-D-01">A&lt;unsigned int&gt;::B&lt;double&gt;::D</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -662,7 +662,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-07-B-03e-D-0f"><a href="#A-07">A</a>&lt;unsigned int&gt;::<a href="#A-07-B-03e">B</a>&lt;double&gt;::D&lt;bool&gt;</h2>
+<h2 id="A-07-B-03e-D-0f"><a href="#A-07-B-03e-D-0f">A&lt;unsigned int&gt;::B&lt;double&gt;::D&lt;bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -680,7 +680,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-0c">A&lt;long&gt;</h2>
+<h2 id="A-0c"><a href="#A-0c">A&lt;long&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -713,7 +713,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-0c-B-0b"><a href="#A-0c">A</a>&lt;long&gt;::B</h2>
+<h2 id="A-0c-B-0b"><a href="#A-0c-B-0b">A&lt;long&gt;::B</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -746,7 +746,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-0c-B-0b-C"><a href="#A-0c">A</a>&lt;long&gt;::<a href="#A-0c-B-0b">B</a>::C</h2>
+<h2 id="A-0c-B-0b-C"><a href="#A-0c-B-0b-C">A&lt;long&gt;::B::C</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -763,7 +763,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-0c-B-0b-D-00"><a href="#A-0c">A</a>&lt;long&gt;::<a href="#A-0c-B-0b">B</a>::D</h2>
+<h2 id="A-0c-B-0b-D-00"><a href="#A-0c-B-0b-D-00">A&lt;long&gt;::B::D</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -781,7 +781,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-0c-B-0b-D-0b"><a href="#A-0c">A</a>&lt;long&gt;::<a href="#A-0c-B-0b">B</a>::D&lt;bool&gt;</h2>
+<h2 id="A-0c-B-0b-D-0b"><a href="#A-0c-B-0b-D-0b">A&lt;long&gt;::B::D&lt;bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -799,7 +799,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-0c-B-08"><a href="#A-0c">A</a>&lt;long&gt;::B&lt;float&gt;</h2>
+<h2 id="A-0c-B-08"><a href="#A-0c-B-08">A&lt;long&gt;::B&lt;float&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -832,7 +832,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-0c-B-08-C"><a href="#A-0c">A</a>&lt;long&gt;::<a href="#A-0c-B-08">B</a>&lt;float&gt;::C</h2>
+<h2 id="A-0c-B-08-C"><a href="#A-0c-B-08-C">A&lt;long&gt;::B&lt;float&gt;::C</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -849,7 +849,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-0c-B-08-D-08"><a href="#A-0c">A</a>&lt;long&gt;::<a href="#A-0c-B-08">B</a>&lt;float&gt;::D</h2>
+<h2 id="A-0c-B-08-D-08"><a href="#A-0c-B-08-D-08">A&lt;long&gt;::B&lt;float&gt;::D</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -867,7 +867,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-0c-B-08-D-03"><a href="#A-0c">A</a>&lt;long&gt;::<a href="#A-0c-B-08">B</a>&lt;float&gt;::D&lt;bool&gt;</h2>
+<h2 id="A-0c-B-08-D-03"><a href="#A-0c-B-08-D-03">A&lt;long&gt;::B&lt;float&gt;::D&lt;bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -885,7 +885,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-0c-B-0d"><a href="#A-0c">A</a>&lt;long&gt;::B&lt;double&gt;</h2>
+<h2 id="A-0c-B-0d"><a href="#A-0c-B-0d">A&lt;long&gt;::B&lt;double&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -918,7 +918,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-0c-B-0d-C"><a href="#A-0c">A</a>&lt;long&gt;::<a href="#A-0c-B-0d">B</a>&lt;double&gt;::C</h2>
+<h2 id="A-0c-B-0d-C"><a href="#A-0c-B-0d-C">A&lt;long&gt;::B&lt;double&gt;::C</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -935,7 +935,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-0c-B-0d-D-0c"><a href="#A-0c">A</a>&lt;long&gt;::<a href="#A-0c-B-0d">B</a>&lt;double&gt;::D</h2>
+<h2 id="A-0c-B-0d-D-0c"><a href="#A-0c-B-0d-D-0c">A&lt;long&gt;::B&lt;double&gt;::D</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -953,7 +953,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-0c-B-0d-D-03"><a href="#A-0c">A</a>&lt;long&gt;::<a href="#A-0c-B-0d">B</a>&lt;double&gt;::D&lt;bool&gt;</h2>
+<h2 id="A-0c-B-0d-D-03"><a href="#A-0c-B-0d-D-03">A&lt;long&gt;::B&lt;double&gt;::D&lt;bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -971,7 +971,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-01">A&lt;float&gt;</h2>
+<h2 id="A-01"><a href="#A-01">A&lt;float&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1003,7 +1003,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-01-B-07"><a href="#A-01">A</a>&lt;float&gt;::B</h2>
+<h2 id="A-01-B-07"><a href="#A-01-B-07">A&lt;float&gt;::B</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1021,7 +1021,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-01-B-08"><a href="#A-01">A</a>&lt;float&gt;::B&lt;double, double&gt;</h2>
+<h2 id="A-01-B-08"><a href="#A-01-B-08">A&lt;float&gt;::B&lt;double, double&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1054,7 +1054,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-01-B-08-C"><a href="#A-01">A</a>&lt;float&gt;::<a href="#A-01-B-08">B</a>&lt;double, double&gt;::C</h2>
+<h2 id="A-01-B-08-C"><a href="#A-01-B-08-C">A&lt;float&gt;::B&lt;double, double&gt;::C</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1071,7 +1071,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-01-B-08-D-0ae"><a href="#A-01">A</a>&lt;float&gt;::<a href="#A-01-B-08">B</a>&lt;double, double&gt;::D</h2>
+<h2 id="A-01-B-08-D-0ae"><a href="#A-01-B-08-D-0ae">A&lt;float&gt;::B&lt;double, double&gt;::D</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1089,7 +1089,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-01-B-08-D-0af"><a href="#A-01">A</a>&lt;float&gt;::<a href="#A-01-B-08">B</a>&lt;double, double&gt;::D&lt;bool, bool&gt;</h2>
+<h2 id="A-01-B-08-D-0af"><a href="#A-01-B-08-D-0af">A&lt;float&gt;::B&lt;double, double&gt;::D&lt;bool, bool&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1107,7 +1107,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="E">E</h2>
+<h2 id="E"><a href="#E">E</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1151,7 +1151,7 @@ <h2>Data Members</h2>
 </div>
 <div>
 <div>
-<h2 id="E-m0"><a href="#E">E</a>::m0</h2>
+<h2 id="E-m0"><a href="#E-m0">E::m0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1166,7 +1166,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="E-m1"><a href="#E">E</a>::m1</h2>
+<h2 id="E-m1"><a href="#E-m1">E::m1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1181,7 +1181,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="E-m10"><a href="#E">E</a>::m10</h2>
+<h2 id="E-m10"><a href="#E-m10">E::m10</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1196,7 +1196,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="E-m11"><a href="#E">E</a>::m11</h2>
+<h2 id="E-m11"><a href="#E-m11">E::m11</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1211,7 +1211,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="E-m12"><a href="#E">E</a>::m12</h2>
+<h2 id="E-m12"><a href="#E-m12">E::m12</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1226,7 +1226,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="E-m13"><a href="#E">E</a>::m13</h2>
+<h2 id="E-m13"><a href="#E-m13">E::m13</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1241,7 +1241,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="E-m14"><a href="#E">E</a>::m14</h2>
+<h2 id="E-m14"><a href="#E-m14">E::m14</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1256,7 +1256,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="E-m2"><a href="#E">E</a>::m2</h2>
+<h2 id="E-m2"><a href="#E-m2">E::m2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1271,7 +1271,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="E-m3"><a href="#E">E</a>::m3</h2>
+<h2 id="E-m3"><a href="#E-m3">E::m3</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1286,7 +1286,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="E-m4"><a href="#E">E</a>::m4</h2>
+<h2 id="E-m4"><a href="#E-m4">E::m4</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1301,7 +1301,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="E-m5"><a href="#E">E</a>::m5</h2>
+<h2 id="E-m5"><a href="#E-m5">E::m5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1316,7 +1316,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="E-m6"><a href="#E">E</a>::m6</h2>
+<h2 id="E-m6"><a href="#E-m6">E::m6</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1331,7 +1331,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="E-m7"><a href="#E">E</a>::m7</h2>
+<h2 id="E-m7"><a href="#E-m7">E::m7</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1346,7 +1346,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="E-m8"><a href="#E">E</a>::m8</h2>
+<h2 id="E-m8"><a href="#E-m8">E::m8</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1361,7 +1361,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="E-m9"><a href="#E">E</a>::m9</h2>
+<h2 id="E-m9"><a href="#E-m9">E::m9</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/record/class-template.html b/test-files/golden-tests/symbols/record/class-template.html
index a5dacac9b..68b5b63d5 100644
--- a/test-files/golden-tests/symbols/record/class-template.html
+++ b/test-files/golden-tests/symbols/record/class-template.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -29,7 +29,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="C0">C0</h2>
+<h2 id="C0"><a href="#C0">C0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -75,7 +75,7 @@ <h2>Data Members</h2>
 </div>
 <div>
 <div>
-<h2 id="C0-N0"><a href="#C0">C0</a>::N0</h2>
+<h2 id="C0-N0"><a href="#C0-N0">C0::N0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -105,7 +105,7 @@ <h2>Data Members</h2>
 </div>
 <div>
 <div>
-<h2 id="C0-N0-z"><a href="#C0">C0</a>::<a href="#C0-N0">N0</a>::z</h2>
+<h2 id="C0-N0-z"><a href="#C0-N0-z">C0::N0::z</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -120,7 +120,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="C0-w"><a href="#C0">C0</a>::w</h2>
+<h2 id="C0-w"><a href="#C0-w">C0::w</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -135,7 +135,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="C0-x"><a href="#C0">C0</a>::x</h2>
+<h2 id="C0-x"><a href="#C0-x">C0::x</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -150,7 +150,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="C0-y"><a href="#C0">C0</a>::y</h2>
+<h2 id="C0-y"><a href="#C0-y">C0::y</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -165,7 +165,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="C1">C1</h2>
+<h2 id="C1"><a href="#C1">C1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -208,7 +208,7 @@ <h2>Data Members</h2>
 </div>
 <div>
 <div>
-<h2 id="C1-N1"><a href="#C1">C1</a>::N1</h2>
+<h2 id="C1-N1"><a href="#C1-N1">C1::N1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -241,7 +241,7 @@ <h2>Data Members</h2>
 </div>
 <div>
 <div>
-<h2 id="C1-N1-x"><a href="#C1">C1</a>::<a href="#C1-N1">N1</a>::x</h2>
+<h2 id="C1-N1-x"><a href="#C1-N1-x">C1::N1::x</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -256,7 +256,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="C1-N1-y"><a href="#C1">C1</a>::<a href="#C1-N1">N1</a>::y</h2>
+<h2 id="C1-N1-y"><a href="#C1-N1-y">C1::N1::y</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -271,7 +271,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="C1-N1-z"><a href="#C1">C1</a>::<a href="#C1-N1">N1</a>::z</h2>
+<h2 id="C1-N1-z"><a href="#C1-N1-z">C1::N1::z</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -286,7 +286,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="C1-w"><a href="#C1">C1</a>::w</h2>
+<h2 id="C1-w"><a href="#C1-w">C1::w</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -301,7 +301,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="C2">C2</h2>
+<h2 id="C2"><a href="#C2">C2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -345,7 +345,7 @@ <h2>Data Members</h2>
 </div>
 <div>
 <div>
-<h2 id="C2-N2"><a href="#C2">C2</a>::N2</h2>
+<h2 id="C2-N2"><a href="#C2-N2">C2::N2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -379,7 +379,7 @@ <h2>Data Members</h2>
 </div>
 <div>
 <div>
-<h2 id="C2-N2-w"><a href="#C2">C2</a>::<a href="#C2-N2">N2</a>::w</h2>
+<h2 id="C2-N2-w"><a href="#C2-N2-w">C2::N2::w</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -394,7 +394,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="C2-N2-x"><a href="#C2">C2</a>::<a href="#C2-N2">N2</a>::x</h2>
+<h2 id="C2-N2-x"><a href="#C2-N2-x">C2::N2::x</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -409,7 +409,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="C2-N2-y"><a href="#C2">C2</a>::<a href="#C2-N2">N2</a>::y</h2>
+<h2 id="C2-N2-y"><a href="#C2-N2-y">C2::N2::y</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -424,7 +424,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="C2-N2-z"><a href="#C2">C2</a>::<a href="#C2-N2">N2</a>::z</h2>
+<h2 id="C2-N2-z"><a href="#C2-N2-z">C2::N2::z</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -439,7 +439,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="C2-v"><a href="#C2">C2</a>::v</h2>
+<h2 id="C2-v"><a href="#C2-v">C2::v</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -454,7 +454,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="C3">C3</h2>
+<h2 id="C3"><a href="#C3">C3</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -485,7 +485,7 @@ <h2>Data Members</h2>
 </div>
 <div>
 <div>
-<h2 id="C3-v"><a href="#C3">C3</a>::v</h2>
+<h2 id="C3-v"><a href="#C3-v">C3::v</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -500,7 +500,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S">S</h2>
+<h2 id="S"><a href="#S">S</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/friend/friend-2.adoc b/test-files/golden-tests/symbols/record/friend-fn-has-docs.adoc
similarity index 77%
rename from test-files/golden-tests/symbols/friend/friend-2.adoc
rename to test-files/golden-tests/symbols/record/friend-fn-has-docs.adoc
index b73d89b16..2a995573d 100644
--- a/test-files/golden-tests/symbols/friend/friend-2.adoc
+++ b/test-files/golden-tests/symbols/record/friend-fn-has-docs.adoc
@@ -27,7 +27,7 @@
 
 === Synopsis
 
-Declared in `&lt;friend&hyphen;2&period;cpp&gt;`
+Declared in `&lt;friend&hyphen;fn&hyphen;has&hyphen;docs&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
@@ -51,7 +51,7 @@ f
 
 === Synopsis
 
-Declared in `&lt;friend&hyphen;2&period;cpp&gt;`
+Declared in `&lt;friend&hyphen;fn&hyphen;has&hyphen;docs&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/symbols/friend/friend-2.cpp b/test-files/golden-tests/symbols/record/friend-fn-has-docs.cpp
similarity index 100%
rename from test-files/golden-tests/symbols/friend/friend-2.cpp
rename to test-files/golden-tests/symbols/record/friend-fn-has-docs.cpp
diff --git a/test-files/golden-tests/symbols/friend/friend-1.html b/test-files/golden-tests/symbols/record/friend-fn-has-docs.html
similarity index 82%
rename from test-files/golden-tests/symbols/friend/friend-1.html
rename to test-files/golden-tests/symbols/record/friend-fn-has-docs.html
index cc2f999fc..a36e70bbb 100644
--- a/test-files/golden-tests/symbols/friend/friend-1.html
+++ b/test-files/golden-tests/symbols/record/friend-fn-has-docs.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -39,12 +39,12 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="T">T</h2>
+<h2 id="T"><a href="#T">T</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
 <div>
-Declared in <code>&lt;friend-1.cpp&gt;</code></div>
+Declared in <code>&lt;friend-fn-has-docs.cpp&gt;</code></div>
 <pre>
 <code class="source-code cpp">
 struct T;
@@ -74,7 +74,7 @@ <h2>Friends</h2>
 </div>
 <div>
 <div>
-<h2 id="f">f</h2>
+<h2 id="f"><a href="#f">f</a></h2>
 <div>
 <span>f</span>
 
@@ -83,7 +83,7 @@ <h2 id="f">f</h2>
 <div>
 <h3>Synopsis</h3>
 <div>
-Declared in <code>&lt;friend-1.cpp&gt;</code></div>
+Declared in <code>&lt;friend-fn-has-docs.cpp&gt;</code></div>
 <pre>
 <code class="source-code cpp">
 void
diff --git a/test-files/golden-tests/symbols/friend/friend-2.xml b/test-files/golden-tests/symbols/record/friend-fn-has-docs.xml
similarity index 66%
rename from test-files/golden-tests/symbols/friend/friend-2.xml
rename to test-files/golden-tests/symbols/record/friend-fn-has-docs.xml
index fabb41894..2afd6a631 100644
--- a/test-files/golden-tests/symbols/friend/friend-2.xml
+++ b/test-files/golden-tests/symbols/record/friend-fn-has-docs.xml
@@ -3,14 +3,14 @@
        xsi:noNamespaceSchemaLocation="https://github.com/cppalliance/mrdocs/raw/develop/mrdocs.rnc">
 <namespace id="//////////////////////////8=">
   <struct name="T" id="CgGNdHpW5mG/i5741WPYQDw28OQ=">
-    <file short-path="friend-2.cpp" source-path="friend-2.cpp" line="1" class="def"/>
+    <file short-path="friend-fn-has-docs.cpp" source-path="friend-fn-has-docs.cpp" line="1" class="def"/>
     <friend id="s6nsa+zVhpzzrN+yUVPP5rvdXqs=">
       <befriended id="s6nsa+zVhpzzrN+yUVPP5rvdXqs="/>
     </friend>
   </struct>
   <function name="f" id="s6nsa+zVhpzzrN+yUVPP5rvdXqs=">
-    <file short-path="friend-2.cpp" source-path="friend-2.cpp" line="4"/>
-    <file short-path="friend-2.cpp" source-path="friend-2.cpp" line="7"/>
+    <file short-path="friend-fn-has-docs.cpp" source-path="friend-fn-has-docs.cpp" line="4"/>
+    <file short-path="friend-fn-has-docs.cpp" source-path="friend-fn-has-docs.cpp" line="7"/>
     <doc>
       <brief>
         <text>f</text>
diff --git a/test-files/golden-tests/symbols/record/friend-fn-member.adoc b/test-files/golden-tests/symbols/record/friend-fn-member.adoc
new file mode 100644
index 000000000..17c663d36
--- /dev/null
+++ b/test-files/golden-tests/symbols/record/friend-fn-member.adoc
@@ -0,0 +1,126 @@
+= Reference
+:mrdocs:
+
+[#index]
+== Global namespace
+
+=== Types
+
+[cols=1]
+|===
+| Name
+| <<U,`U`>> 
+| <<X,`X`>> 
+|===
+
+[#U]
+== U
+
+=== Synopsis
+
+Declared in `&lt;friend&hyphen;fn&hyphen;member&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+struct U;
+----
+
+=== Friends
+
+[cols=2]
+|===
+| Name
+| Description
+| `<<X-foo,X::foo>>`
+| Friend member&hyphen;function
+| `<<X-2destructor,X::&#126;X>>`
+| Destructor
+| `<<X-2constructor,X::X>>`
+| Default constructor
+|===
+
+[#X]
+== X
+
+=== Synopsis
+
+Declared in `&lt;friend&hyphen;fn&hyphen;member&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+struct X;
+----
+
+=== Member Functions
+
+[cols=2]
+|===
+| Name
+| Description
+| <<X-2constructor,`X`>>         [.small]#[constructor]#
+| Default constructor
+| <<X-2destructor,`&#126;X`>> [.small]#[destructor]#
+| Destructor
+| <<X-foo,`foo`>> 
+| Friend member&hyphen;function
+|===
+
+[#X-2constructor]
+== <<X,X>>::X
+
+Default constructor
+
+=== Synopsis
+
+Declared in `&lt;friend&hyphen;fn&hyphen;member&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+X();
+----
+
+[#X-2destructor]
+== <<X,X>>::&#126;X
+
+Destructor
+
+=== Synopsis
+
+Declared in `&lt;friend&hyphen;fn&hyphen;member&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+&#126;X();
+----
+
+[#X-foo]
+== <<X,X>>::foo
+
+Friend member&hyphen;function
+
+=== Synopsis
+
+Declared in `&lt;friend&hyphen;fn&hyphen;member&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+char*
+foo(int i);
+----
+
+=== Return Value
+
+char&ast;
+
+=== Parameters
+
+[cols=2]
+|===
+| Name
+| Description
+| *i*
+| 
+|===
+
+
+[.small]#Created with https://www.mrdocs.com[MrDocs]#
diff --git a/test-files/golden-tests/symbols/record/friend-fn-member.cpp b/test-files/golden-tests/symbols/record/friend-fn-member.cpp
new file mode 100644
index 000000000..a4eb11e07
--- /dev/null
+++ b/test-files/golden-tests/symbols/record/friend-fn-member.cpp
@@ -0,0 +1,16 @@
+struct X
+{
+    X();
+    ~X();
+    /// Friend member-function
+    /// @param i
+    /// @return char*
+    char* foo(int i);
+};
+
+struct U
+{
+    friend X::X();
+    friend X::~X();
+    friend char* X::foo(int);
+};
diff --git a/test-files/golden-tests/symbols/record/friend-fn-member.html b/test-files/golden-tests/symbols/record/friend-fn-member.html
new file mode 100644
index 000000000..a942840c3
--- /dev/null
+++ b/test-files/golden-tests/symbols/record/friend-fn-member.html
@@ -0,0 +1,188 @@
+<html lang="en">
+<head>
+<title>Reference</title>
+</head>
+<body>
+<div>
+<h1>Reference</h1>
+<div>
+<div>
+<h2 id="index"><a href="#index"></a></h2>
+</div>
+<h2>Types</h2>
+<table style="table-layout: fixed; width: 100%;">
+<thead>
+<tr>
+<th>Name</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="#U"><code>U</code></a> </td></tr><tr>
+<td><a href="#X"><code>X</code></a> </td></tr>
+</tbody>
+</table>
+
+</div>
+<div>
+<div>
+<h2 id="U"><a href="#U">U</a></h2>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;friend-fn-member.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">
+struct U;
+</code>
+</pre>
+</div>
+
+
+<div>
+<h2>Friends</h2>
+<table>
+<thead>
+<tr>
+<th>Name</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><code><a href="#X-foo">foo</a></code></td>
+<td><span>Friend member-function</span></td>
+</tr>
+<tr>
+<td><code><a href="#X-2destructor">~X</a></code></td>
+<td><span>Destructor</span></td>
+</tr>
+<tr>
+<td><code><a href="#X-2constructor">X</a></code></td>
+<td><span>Default constructor</span></td>
+</tr>
+|===
+</tbody>
+</table>
+</div>
+</div>
+<div>
+<div>
+<h2 id="X"><a href="#X">X</a></h2>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;friend-fn-member.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">
+struct X;
+</code>
+</pre>
+</div>
+<h2>Member Functions</h2>
+<table style="table-layout: fixed; width: 100%;">
+<thead>
+<tr>
+<th>Name</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="#X-2constructor"><code>X</code></a>         <span class="small">[constructor]</span></td><td><span>Default constructor</span></td></tr><tr>
+<td><a href="#X-2destructor"><code>~X</code></a> <span class="small">[destructor]</span></td><td><span>Destructor</span></td></tr><tr>
+<td><a href="#X-foo"><code>foo</code></a> </td><td><span>Friend member-function</span></td></tr>
+</tbody>
+</table>
+
+
+
+</div>
+<div>
+<div>
+<h2 id="X-2constructor"><a href="#X-2constructor">X::X</a></h2>
+<div>
+<span>Default constructor</span>
+
+</div>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;friend-fn-member.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">
+X();
+</code>
+</pre>
+</div>
+</div>
+<div>
+<div>
+<h2 id="X-2destructor"><a href="#X-2destructor">X::~X</a></h2>
+<div>
+<span>Destructor</span>
+
+</div>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;friend-fn-member.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">
+~X();
+</code>
+</pre>
+</div>
+</div>
+<div>
+<div>
+<h2 id="X-foo"><a href="#X-foo">X::foo</a></h2>
+<div>
+<span>Friend member-function</span>
+
+</div>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;friend-fn-member.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">
+char*
+foo(int i);
+</code>
+</pre>
+</div>
+<div>
+<h3>Return Value</h3>
+<span>char*</span>
+</div>
+<div>
+<h3>Parameters</h3>
+<table>
+<thead>
+<tr>
+<th>Name</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><strong>i</strong></td>
+<td><span></span></td>
+</tr>
+</tbody>
+</table>
+</div>
+</div>
+
+</div>
+<div>
+<h4>Created with <a href="https://www.mrdocs.com">MrDocs</a></h4>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/test-files/golden-tests/symbols/record/friend-fn-member.xml b/test-files/golden-tests/symbols/record/friend-fn-member.xml
new file mode 100644
index 000000000..f11d5fd0f
--- /dev/null
+++ b/test-files/golden-tests/symbols/record/friend-fn-member.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mrdocs xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="https://github.com/cppalliance/mrdocs/raw/develop/mrdocs.rnc">
+<namespace id="//////////////////////////8=">
+  <struct name="U" id="FLgkhM3m0U3Lo2o3XLPUizWPH00=">
+    <file short-path="friend-fn-member.cpp" source-path="friend-fn-member.cpp" line="11" class="def"/>
+    <friend id="wZtQh+QR5vgNZmk34MnRmnKO5MI=">
+      <befriended id="wZtQh+QR5vgNZmk34MnRmnKO5MI="/>
+    </friend>
+    <friend id="HK6hbp0kJrHWxbYoHddN1v/GCWc=">
+      <befriended id="HK6hbp0kJrHWxbYoHddN1v/GCWc="/>
+    </friend>
+    <friend id="6Jx2eK9l4C46QIRucTvox+6PH2k=">
+      <befriended id="6Jx2eK9l4C46QIRucTvox+6PH2k="/>
+    </friend>
+  </struct>
+  <struct name="X" id="ynx5NXMLXqzSXwgOnIP6CHzNx14=">
+    <file short-path="friend-fn-member.cpp" source-path="friend-fn-member.cpp" line="1" class="def"/>
+    <function class="constructor" name="X" id="6Jx2eK9l4C46QIRucTvox+6PH2k=">
+      <file short-path="friend-fn-member.cpp" source-path="friend-fn-member.cpp" line="3"/>
+      <file short-path="friend-fn-member.cpp" source-path="friend-fn-member.cpp" line="13"/>
+      <doc>
+        <brief>
+          <text>Default constructor</text>
+        </brief>
+      </doc>
+    </function>
+    <function class="destructor" name="~X" id="HK6hbp0kJrHWxbYoHddN1v/GCWc=">
+      <file short-path="friend-fn-member.cpp" source-path="friend-fn-member.cpp" line="4"/>
+      <file short-path="friend-fn-member.cpp" source-path="friend-fn-member.cpp" line="14"/>
+      <doc>
+        <brief>
+          <text>Destructor</text>
+        </brief>
+      </doc>
+    </function>
+    <function name="foo" id="wZtQh+QR5vgNZmk34MnRmnKO5MI=">
+      <file short-path="friend-fn-member.cpp" source-path="friend-fn-member.cpp" line="8"/>
+      <file short-path="friend-fn-member.cpp" source-path="friend-fn-member.cpp" line="15"/>
+      <return>
+        <type class="pointer">
+          <pointee-type name="char"/>
+        </type>
+      </return>
+      <param name="i">
+        <type name="int"/>
+      </param>
+      <doc>
+        <brief>
+          <text>Friend member-function</text>
+        </brief>
+        <returns>
+          <text>char*</text>
+        </returns>
+        <param name="i">
+        </param>
+      </doc>
+    </function>
+  </struct>
+</namespace>
+</mrdocs>
diff --git a/test-files/golden-tests/symbols/friend/friend-4.adoc b/test-files/golden-tests/symbols/record/friend-fn-multi-2nd.adoc
similarity index 77%
rename from test-files/golden-tests/symbols/friend/friend-4.adoc
rename to test-files/golden-tests/symbols/record/friend-fn-multi-2nd.adoc
index 0b25a3ee7..1a896f914 100644
--- a/test-files/golden-tests/symbols/friend/friend-4.adoc
+++ b/test-files/golden-tests/symbols/record/friend-fn-multi-2nd.adoc
@@ -28,7 +28,7 @@
 
 === Synopsis
 
-Declared in `&lt;friend&hyphen;4&period;cpp&gt;`
+Declared in `&lt;friend&hyphen;fn&hyphen;multi&hyphen;2nd&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
@@ -50,7 +50,7 @@ struct T;
 
 === Synopsis
 
-Declared in `&lt;friend&hyphen;4&period;cpp&gt;`
+Declared in `&lt;friend&hyphen;fn&hyphen;multi&hyphen;2nd&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
@@ -74,7 +74,7 @@ U&colon;&colon;f
 
 === Synopsis
 
-Declared in `&lt;friend&hyphen;4&period;cpp&gt;`
+Declared in `&lt;friend&hyphen;fn&hyphen;multi&hyphen;2nd&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/symbols/friend/friend-4.cpp b/test-files/golden-tests/symbols/record/friend-fn-multi-2nd.cpp
similarity index 100%
rename from test-files/golden-tests/symbols/friend/friend-4.cpp
rename to test-files/golden-tests/symbols/record/friend-fn-multi-2nd.cpp
diff --git a/test-files/golden-tests/symbols/friend/friend-4.html b/test-files/golden-tests/symbols/record/friend-fn-multi-2nd.html
similarity index 81%
rename from test-files/golden-tests/symbols/friend/friend-4.html
rename to test-files/golden-tests/symbols/record/friend-fn-multi-2nd.html
index c9d0f43bd..ec3e397b4 100644
--- a/test-files/golden-tests/symbols/friend/friend-4.html
+++ b/test-files/golden-tests/symbols/record/friend-fn-multi-2nd.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -40,12 +40,12 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="T">T</h2>
+<h2 id="T"><a href="#T">T</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
 <div>
-Declared in <code>&lt;friend-4.cpp&gt;</code></div>
+Declared in <code>&lt;friend-fn-multi-2nd.cpp&gt;</code></div>
 <pre>
 <code class="source-code cpp">
 struct T;
@@ -75,12 +75,12 @@ <h2>Friends</h2>
 </div>
 <div>
 <div>
-<h2 id="U">U</h2>
+<h2 id="U"><a href="#U">U</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
 <div>
-Declared in <code>&lt;friend-4.cpp&gt;</code></div>
+Declared in <code>&lt;friend-fn-multi-2nd.cpp&gt;</code></div>
 <pre>
 <code class="source-code cpp">
 struct U;
@@ -110,7 +110,7 @@ <h2>Friends</h2>
 </div>
 <div>
 <div>
-<h2 id="f">f</h2>
+<h2 id="f"><a href="#f">f</a></h2>
 <div>
 <span>U::f</span>
 
@@ -119,7 +119,7 @@ <h2 id="f">f</h2>
 <div>
 <h3>Synopsis</h3>
 <div>
-Declared in <code>&lt;friend-4.cpp&gt;</code></div>
+Declared in <code>&lt;friend-fn-multi-2nd.cpp&gt;</code></div>
 <pre>
 <code class="source-code cpp">
 void
diff --git a/test-files/golden-tests/symbols/friend/friend-4.xml b/test-files/golden-tests/symbols/record/friend-fn-multi-2nd.xml
similarity index 60%
rename from test-files/golden-tests/symbols/friend/friend-4.xml
rename to test-files/golden-tests/symbols/record/friend-fn-multi-2nd.xml
index e518a2cbb..05979e1b7 100644
--- a/test-files/golden-tests/symbols/friend/friend-4.xml
+++ b/test-files/golden-tests/symbols/record/friend-fn-multi-2nd.xml
@@ -3,21 +3,21 @@
        xsi:noNamespaceSchemaLocation="https://github.com/cppalliance/mrdocs/raw/develop/mrdocs.rnc">
 <namespace id="//////////////////////////8=">
   <struct name="T" id="CgGNdHpW5mG/i5741WPYQDw28OQ=">
-    <file short-path="friend-4.cpp" source-path="friend-4.cpp" line="1" class="def"/>
+    <file short-path="friend-fn-multi-2nd.cpp" source-path="friend-fn-multi-2nd.cpp" line="1" class="def"/>
     <friend id="s6nsa+zVhpzzrN+yUVPP5rvdXqs=">
       <befriended id="s6nsa+zVhpzzrN+yUVPP5rvdXqs="/>
     </friend>
   </struct>
   <struct name="U" id="FLgkhM3m0U3Lo2o3XLPUizWPH00=">
-    <file short-path="friend-4.cpp" source-path="friend-4.cpp" line="6" class="def"/>
+    <file short-path="friend-fn-multi-2nd.cpp" source-path="friend-fn-multi-2nd.cpp" line="6" class="def"/>
     <friend id="s6nsa+zVhpzzrN+yUVPP5rvdXqs=">
       <befriended id="s6nsa+zVhpzzrN+yUVPP5rvdXqs="/>
     </friend>
   </struct>
   <function name="f" id="s6nsa+zVhpzzrN+yUVPP5rvdXqs=">
-    <file short-path="friend-4.cpp" source-path="friend-4.cpp" line="3"/>
-    <file short-path="friend-4.cpp" source-path="friend-4.cpp" line="9"/>
-    <file short-path="friend-4.cpp" source-path="friend-4.cpp" line="12"/>
+    <file short-path="friend-fn-multi-2nd.cpp" source-path="friend-fn-multi-2nd.cpp" line="3"/>
+    <file short-path="friend-fn-multi-2nd.cpp" source-path="friend-fn-multi-2nd.cpp" line="9"/>
+    <file short-path="friend-fn-multi-2nd.cpp" source-path="friend-fn-multi-2nd.cpp" line="12"/>
     <doc>
       <brief>
         <text>U::f</text>
diff --git a/test-files/golden-tests/symbols/friend/friend-5.adoc b/test-files/golden-tests/symbols/record/friend-fn-multi-free.adoc
similarity index 75%
rename from test-files/golden-tests/symbols/friend/friend-5.adoc
rename to test-files/golden-tests/symbols/record/friend-fn-multi-free.adoc
index 61414d97f..8ea1bc7d4 100644
--- a/test-files/golden-tests/symbols/friend/friend-5.adoc
+++ b/test-files/golden-tests/symbols/record/friend-fn-multi-free.adoc
@@ -28,7 +28,7 @@
 
 === Synopsis
 
-Declared in `&lt;friend&hyphen;5&period;cpp&gt;`
+Declared in `&lt;friend&hyphen;fn&hyphen;multi&hyphen;free&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
@@ -50,7 +50,7 @@ struct T;
 
 === Synopsis
 
-Declared in `&lt;friend&hyphen;5&period;cpp&gt;`
+Declared in `&lt;friend&hyphen;fn&hyphen;multi&hyphen;free&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
@@ -74,7 +74,7 @@ f
 
 === Synopsis
 
-Declared in `&lt;friend&hyphen;5&period;cpp&gt;`
+Declared in `&lt;friend&hyphen;fn&hyphen;multi&hyphen;free&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/symbols/friend/friend-5.cpp b/test-files/golden-tests/symbols/record/friend-fn-multi-free.cpp
similarity index 100%
rename from test-files/golden-tests/symbols/friend/friend-5.cpp
rename to test-files/golden-tests/symbols/record/friend-fn-multi-free.cpp
diff --git a/test-files/golden-tests/symbols/friend/friend-5.html b/test-files/golden-tests/symbols/record/friend-fn-multi-free.html
similarity index 81%
rename from test-files/golden-tests/symbols/friend/friend-5.html
rename to test-files/golden-tests/symbols/record/friend-fn-multi-free.html
index 29e4c80d2..121ee254c 100644
--- a/test-files/golden-tests/symbols/friend/friend-5.html
+++ b/test-files/golden-tests/symbols/record/friend-fn-multi-free.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -40,12 +40,12 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="T">T</h2>
+<h2 id="T"><a href="#T">T</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
 <div>
-Declared in <code>&lt;friend-5.cpp&gt;</code></div>
+Declared in <code>&lt;friend-fn-multi-free.cpp&gt;</code></div>
 <pre>
 <code class="source-code cpp">
 struct T;
@@ -75,12 +75,12 @@ <h2>Friends</h2>
 </div>
 <div>
 <div>
-<h2 id="U">U</h2>
+<h2 id="U"><a href="#U">U</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
 <div>
-Declared in <code>&lt;friend-5.cpp&gt;</code></div>
+Declared in <code>&lt;friend-fn-multi-free.cpp&gt;</code></div>
 <pre>
 <code class="source-code cpp">
 struct U;
@@ -110,7 +110,7 @@ <h2>Friends</h2>
 </div>
 <div>
 <div>
-<h2 id="f">f</h2>
+<h2 id="f"><a href="#f">f</a></h2>
 <div>
 <span>f</span>
 
@@ -119,7 +119,7 @@ <h2 id="f">f</h2>
 <div>
 <h3>Synopsis</h3>
 <div>
-Declared in <code>&lt;friend-5.cpp&gt;</code></div>
+Declared in <code>&lt;friend-fn-multi-free.cpp&gt;</code></div>
 <pre>
 <code class="source-code cpp">
 void
diff --git a/test-files/golden-tests/symbols/friend/friend-5.xml b/test-files/golden-tests/symbols/record/friend-fn-multi-free.xml
similarity index 60%
rename from test-files/golden-tests/symbols/friend/friend-5.xml
rename to test-files/golden-tests/symbols/record/friend-fn-multi-free.xml
index 008bb1880..17373780b 100644
--- a/test-files/golden-tests/symbols/friend/friend-5.xml
+++ b/test-files/golden-tests/symbols/record/friend-fn-multi-free.xml
@@ -3,21 +3,21 @@
        xsi:noNamespaceSchemaLocation="https://github.com/cppalliance/mrdocs/raw/develop/mrdocs.rnc">
 <namespace id="//////////////////////////8=">
   <struct name="T" id="CgGNdHpW5mG/i5741WPYQDw28OQ=">
-    <file short-path="friend-5.cpp" source-path="friend-5.cpp" line="1" class="def"/>
+    <file short-path="friend-fn-multi-free.cpp" source-path="friend-fn-multi-free.cpp" line="1" class="def"/>
     <friend id="s6nsa+zVhpzzrN+yUVPP5rvdXqs=">
       <befriended id="s6nsa+zVhpzzrN+yUVPP5rvdXqs="/>
     </friend>
   </struct>
   <struct name="U" id="FLgkhM3m0U3Lo2o3XLPUizWPH00=">
-    <file short-path="friend-5.cpp" source-path="friend-5.cpp" line="6" class="def"/>
+    <file short-path="friend-fn-multi-free.cpp" source-path="friend-fn-multi-free.cpp" line="6" class="def"/>
     <friend id="s6nsa+zVhpzzrN+yUVPP5rvdXqs=">
       <befriended id="s6nsa+zVhpzzrN+yUVPP5rvdXqs="/>
     </friend>
   </struct>
   <function name="f" id="s6nsa+zVhpzzrN+yUVPP5rvdXqs=">
-    <file short-path="friend-5.cpp" source-path="friend-5.cpp" line="3"/>
-    <file short-path="friend-5.cpp" source-path="friend-5.cpp" line="8"/>
-    <file short-path="friend-5.cpp" source-path="friend-5.cpp" line="12"/>
+    <file short-path="friend-fn-multi-free.cpp" source-path="friend-fn-multi-free.cpp" line="3"/>
+    <file short-path="friend-fn-multi-free.cpp" source-path="friend-fn-multi-free.cpp" line="8"/>
+    <file short-path="friend-fn-multi-free.cpp" source-path="friend-fn-multi-free.cpp" line="12"/>
     <doc>
       <brief>
         <text>f</text>
diff --git a/test-files/golden-tests/symbols/friend/friend-3.adoc b/test-files/golden-tests/symbols/record/friend-fn-multi.adoc
similarity index 80%
rename from test-files/golden-tests/symbols/friend/friend-3.adoc
rename to test-files/golden-tests/symbols/record/friend-fn-multi.adoc
index b97c4b15e..48003af8a 100644
--- a/test-files/golden-tests/symbols/friend/friend-3.adoc
+++ b/test-files/golden-tests/symbols/record/friend-fn-multi.adoc
@@ -28,7 +28,7 @@
 
 === Synopsis
 
-Declared in `&lt;friend&hyphen;3&period;cpp&gt;`
+Declared in `&lt;friend&hyphen;fn&hyphen;multi&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
@@ -50,7 +50,7 @@ struct T;
 
 === Synopsis
 
-Declared in `&lt;friend&hyphen;3&period;cpp&gt;`
+Declared in `&lt;friend&hyphen;fn&hyphen;multi&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
@@ -74,7 +74,7 @@ T&colon;&colon;f
 
 === Synopsis
 
-Declared in `&lt;friend&hyphen;3&period;cpp&gt;`
+Declared in `&lt;friend&hyphen;fn&hyphen;multi&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/symbols/friend/friend-3.cpp b/test-files/golden-tests/symbols/record/friend-fn-multi.cpp
similarity index 100%
rename from test-files/golden-tests/symbols/friend/friend-3.cpp
rename to test-files/golden-tests/symbols/record/friend-fn-multi.cpp
diff --git a/test-files/golden-tests/symbols/friend/friend-3.html b/test-files/golden-tests/symbols/record/friend-fn-multi.html
similarity index 82%
rename from test-files/golden-tests/symbols/friend/friend-3.html
rename to test-files/golden-tests/symbols/record/friend-fn-multi.html
index 89fe8a565..46b487135 100644
--- a/test-files/golden-tests/symbols/friend/friend-3.html
+++ b/test-files/golden-tests/symbols/record/friend-fn-multi.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -40,12 +40,12 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="T">T</h2>
+<h2 id="T"><a href="#T">T</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
 <div>
-Declared in <code>&lt;friend-3.cpp&gt;</code></div>
+Declared in <code>&lt;friend-fn-multi.cpp&gt;</code></div>
 <pre>
 <code class="source-code cpp">
 struct T;
@@ -75,12 +75,12 @@ <h2>Friends</h2>
 </div>
 <div>
 <div>
-<h2 id="U">U</h2>
+<h2 id="U"><a href="#U">U</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
 <div>
-Declared in <code>&lt;friend-3.cpp&gt;</code></div>
+Declared in <code>&lt;friend-fn-multi.cpp&gt;</code></div>
 <pre>
 <code class="source-code cpp">
 struct U;
@@ -110,7 +110,7 @@ <h2>Friends</h2>
 </div>
 <div>
 <div>
-<h2 id="f">f</h2>
+<h2 id="f"><a href="#f">f</a></h2>
 <div>
 <span>T::f</span>
 
@@ -119,7 +119,7 @@ <h2 id="f">f</h2>
 <div>
 <h3>Synopsis</h3>
 <div>
-Declared in <code>&lt;friend-3.cpp&gt;</code></div>
+Declared in <code>&lt;friend-fn-multi.cpp&gt;</code></div>
 <pre>
 <code class="source-code cpp">
 void
diff --git a/test-files/golden-tests/symbols/friend/friend-3.xml b/test-files/golden-tests/symbols/record/friend-fn-multi.xml
similarity index 62%
rename from test-files/golden-tests/symbols/friend/friend-3.xml
rename to test-files/golden-tests/symbols/record/friend-fn-multi.xml
index 76b0ed508..27b82123a 100644
--- a/test-files/golden-tests/symbols/friend/friend-3.xml
+++ b/test-files/golden-tests/symbols/record/friend-fn-multi.xml
@@ -3,21 +3,21 @@
        xsi:noNamespaceSchemaLocation="https://github.com/cppalliance/mrdocs/raw/develop/mrdocs.rnc">
 <namespace id="//////////////////////////8=">
   <struct name="T" id="CgGNdHpW5mG/i5741WPYQDw28OQ=">
-    <file short-path="friend-3.cpp" source-path="friend-3.cpp" line="1" class="def"/>
+    <file short-path="friend-fn-multi.cpp" source-path="friend-fn-multi.cpp" line="1" class="def"/>
     <friend id="s6nsa+zVhpzzrN+yUVPP5rvdXqs=">
       <befriended id="s6nsa+zVhpzzrN+yUVPP5rvdXqs="/>
     </friend>
   </struct>
   <struct name="U" id="FLgkhM3m0U3Lo2o3XLPUizWPH00=">
-    <file short-path="friend-3.cpp" source-path="friend-3.cpp" line="7" class="def"/>
+    <file short-path="friend-fn-multi.cpp" source-path="friend-fn-multi.cpp" line="7" class="def"/>
     <friend id="s6nsa+zVhpzzrN+yUVPP5rvdXqs=">
       <befriended id="s6nsa+zVhpzzrN+yUVPP5rvdXqs="/>
     </friend>
   </struct>
   <function name="f" id="s6nsa+zVhpzzrN+yUVPP5rvdXqs=">
-    <file short-path="friend-3.cpp" source-path="friend-3.cpp" line="4"/>
-    <file short-path="friend-3.cpp" source-path="friend-3.cpp" line="9"/>
-    <file short-path="friend-3.cpp" source-path="friend-3.cpp" line="12"/>
+    <file short-path="friend-fn-multi.cpp" source-path="friend-fn-multi.cpp" line="4"/>
+    <file short-path="friend-fn-multi.cpp" source-path="friend-fn-multi.cpp" line="9"/>
+    <file short-path="friend-fn-multi.cpp" source-path="friend-fn-multi.cpp" line="12"/>
     <doc>
       <brief>
         <text>T::f</text>
diff --git a/test-files/golden-tests/symbols/friend/friend-1.adoc b/test-files/golden-tests/symbols/record/friend-fn.adoc
similarity index 83%
rename from test-files/golden-tests/symbols/friend/friend-1.adoc
rename to test-files/golden-tests/symbols/record/friend-fn.adoc
index dd945a870..751f3321b 100644
--- a/test-files/golden-tests/symbols/friend/friend-1.adoc
+++ b/test-files/golden-tests/symbols/record/friend-fn.adoc
@@ -27,7 +27,7 @@
 
 === Synopsis
 
-Declared in `&lt;friend&hyphen;1&period;cpp&gt;`
+Declared in `&lt;friend&hyphen;fn&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
@@ -51,7 +51,7 @@ f
 
 === Synopsis
 
-Declared in `&lt;friend&hyphen;1&period;cpp&gt;`
+Declared in `&lt;friend&hyphen;fn&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/symbols/friend/friend-1.cpp b/test-files/golden-tests/symbols/record/friend-fn.cpp
similarity index 100%
rename from test-files/golden-tests/symbols/friend/friend-1.cpp
rename to test-files/golden-tests/symbols/record/friend-fn.cpp
diff --git a/test-files/golden-tests/symbols/friend/friend-2.html b/test-files/golden-tests/symbols/record/friend-fn.html
similarity index 83%
rename from test-files/golden-tests/symbols/friend/friend-2.html
rename to test-files/golden-tests/symbols/record/friend-fn.html
index 859ac1b80..fa722b384 100644
--- a/test-files/golden-tests/symbols/friend/friend-2.html
+++ b/test-files/golden-tests/symbols/record/friend-fn.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -39,12 +39,12 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="T">T</h2>
+<h2 id="T"><a href="#T">T</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
 <div>
-Declared in <code>&lt;friend-2.cpp&gt;</code></div>
+Declared in <code>&lt;friend-fn.cpp&gt;</code></div>
 <pre>
 <code class="source-code cpp">
 struct T;
@@ -74,7 +74,7 @@ <h2>Friends</h2>
 </div>
 <div>
 <div>
-<h2 id="f">f</h2>
+<h2 id="f"><a href="#f">f</a></h2>
 <div>
 <span>f</span>
 
@@ -83,7 +83,7 @@ <h2 id="f">f</h2>
 <div>
 <h3>Synopsis</h3>
 <div>
-Declared in <code>&lt;friend-2.cpp&gt;</code></div>
+Declared in <code>&lt;friend-fn.cpp&gt;</code></div>
 <pre>
 <code class="source-code cpp">
 void
diff --git a/test-files/golden-tests/symbols/friend/friend-1.xml b/test-files/golden-tests/symbols/record/friend-fn.xml
similarity index 78%
rename from test-files/golden-tests/symbols/friend/friend-1.xml
rename to test-files/golden-tests/symbols/record/friend-fn.xml
index 28e4124a2..ef9a0576e 100644
--- a/test-files/golden-tests/symbols/friend/friend-1.xml
+++ b/test-files/golden-tests/symbols/record/friend-fn.xml
@@ -3,13 +3,13 @@
        xsi:noNamespaceSchemaLocation="https://github.com/cppalliance/mrdocs/raw/develop/mrdocs.rnc">
 <namespace id="//////////////////////////8=">
   <struct name="T" id="CgGNdHpW5mG/i5741WPYQDw28OQ=">
-    <file short-path="friend-1.cpp" source-path="friend-1.cpp" line="1" class="def"/>
+    <file short-path="friend-fn.cpp" source-path="friend-fn.cpp" line="1" class="def"/>
     <friend id="s6nsa+zVhpzzrN+yUVPP5rvdXqs=">
       <befriended id="s6nsa+zVhpzzrN+yUVPP5rvdXqs="/>
     </friend>
   </struct>
   <function name="f" id="s6nsa+zVhpzzrN+yUVPP5rvdXqs=">
-    <file short-path="friend-1.cpp" source-path="friend-1.cpp" line="4"/>
+    <file short-path="friend-fn.cpp" source-path="friend-fn.cpp" line="4"/>
     <doc>
       <brief>
         <text>f</text>
diff --git a/test-files/golden-tests/symbols/friend/friend-6.adoc b/test-files/golden-tests/symbols/record/friend-type.adoc
similarity index 83%
rename from test-files/golden-tests/symbols/friend/friend-6.adoc
rename to test-files/golden-tests/symbols/record/friend-type.adoc
index 10fd7bb8b..f42427ec0 100644
--- a/test-files/golden-tests/symbols/friend/friend-6.adoc
+++ b/test-files/golden-tests/symbols/record/friend-type.adoc
@@ -27,7 +27,7 @@ Struct T brief
 
 === Synopsis
 
-Declared in `&lt;friend&hyphen;6&period;cpp&gt;`
+Declared in `&lt;friend&hyphen;type&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
@@ -51,7 +51,7 @@ Struct U brief
 
 === Synopsis
 
-Declared in `&lt;friend&hyphen;6&period;cpp&gt;`
+Declared in `&lt;friend&hyphen;type&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
@@ -75,7 +75,7 @@ Struct V brief
 
 === Synopsis
 
-Declared in `&lt;friend&hyphen;6&period;cpp&gt;`
+Declared in `&lt;friend&hyphen;type&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
@@ -99,7 +99,7 @@ Friend class Z brief
 
 === Synopsis
 
-Declared in `&lt;friend&hyphen;6&period;cpp&gt;`
+Declared in `&lt;friend&hyphen;type&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/symbols/friend/friend-6.cpp b/test-files/golden-tests/symbols/record/friend-type.cpp
similarity index 100%
rename from test-files/golden-tests/symbols/friend/friend-6.cpp
rename to test-files/golden-tests/symbols/record/friend-type.cpp
diff --git a/test-files/golden-tests/symbols/friend/friend-6.html b/test-files/golden-tests/symbols/record/friend-type.html
similarity index 83%
rename from test-files/golden-tests/symbols/friend/friend-6.html
rename to test-files/golden-tests/symbols/record/friend-type.html
index 9d5211aab..282622802 100644
--- a/test-files/golden-tests/symbols/friend/friend-6.html
+++ b/test-files/golden-tests/symbols/record/friend-type.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -29,7 +29,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="T">T</h2>
+<h2 id="T"><a href="#T">T</a></h2>
 <div>
 <span>Struct T brief</span>
 
@@ -38,7 +38,7 @@ <h2 id="T">T</h2>
 <div>
 <h3>Synopsis</h3>
 <div>
-Declared in <code>&lt;friend-6.cpp&gt;</code></div>
+Declared in <code>&lt;friend-type.cpp&gt;</code></div>
 <pre>
 <code class="source-code cpp">
 struct T;
@@ -68,7 +68,7 @@ <h2>Friends</h2>
 </div>
 <div>
 <div>
-<h2 id="U">U</h2>
+<h2 id="U"><a href="#U">U</a></h2>
 <div>
 <span>Struct U brief</span>
 
@@ -77,7 +77,7 @@ <h2 id="U">U</h2>
 <div>
 <h3>Synopsis</h3>
 <div>
-Declared in <code>&lt;friend-6.cpp&gt;</code></div>
+Declared in <code>&lt;friend-type.cpp&gt;</code></div>
 <pre>
 <code class="source-code cpp">
 struct U;
@@ -107,7 +107,7 @@ <h2>Friends</h2>
 </div>
 <div>
 <div>
-<h2 id="V">V</h2>
+<h2 id="V"><a href="#V">V</a></h2>
 <div>
 <span>Struct V brief</span>
 
@@ -116,7 +116,7 @@ <h2 id="V">V</h2>
 <div>
 <h3>Synopsis</h3>
 <div>
-Declared in <code>&lt;friend-6.cpp&gt;</code></div>
+Declared in <code>&lt;friend-type.cpp&gt;</code></div>
 <pre>
 <code class="source-code cpp">
 struct V;
@@ -146,7 +146,7 @@ <h2>Friends</h2>
 </div>
 <div>
 <div>
-<h2 id="Z">Z</h2>
+<h2 id="Z"><a href="#Z">Z</a></h2>
 <div>
 <span>Friend class Z brief</span>
 
@@ -155,7 +155,7 @@ <h2 id="Z">Z</h2>
 <div>
 <h3>Synopsis</h3>
 <div>
-Declared in <code>&lt;friend-6.cpp&gt;</code></div>
+Declared in <code>&lt;friend-type.cpp&gt;</code></div>
 <pre>
 <code class="source-code cpp">
 class Z;
diff --git a/test-files/golden-tests/symbols/friend/friend-6.xml b/test-files/golden-tests/symbols/record/friend-type.xml
similarity index 77%
rename from test-files/golden-tests/symbols/friend/friend-6.xml
rename to test-files/golden-tests/symbols/record/friend-type.xml
index 2c7ba9ee4..0fd4ab9f9 100644
--- a/test-files/golden-tests/symbols/friend/friend-6.xml
+++ b/test-files/golden-tests/symbols/record/friend-type.xml
@@ -3,7 +3,7 @@
        xsi:noNamespaceSchemaLocation="https://github.com/cppalliance/mrdocs/raw/develop/mrdocs.rnc">
 <namespace id="//////////////////////////8=">
   <struct name="T" id="CgGNdHpW5mG/i5741WPYQDw28OQ=">
-    <file short-path="friend-6.cpp" source-path="friend-6.cpp" line="2" class="def"/>
+    <file short-path="friend-type.cpp" source-path="friend-type.cpp" line="2" class="def"/>
     <friend id="NQ8uQgTcafPcttyBMHHLHAXA4MA=">
       <befriended id="NQ8uQgTcafPcttyBMHHLHAXA4MA="/>
     </friend>
@@ -14,7 +14,7 @@
     </doc>
   </struct>
   <struct name="U" id="FLgkhM3m0U3Lo2o3XLPUizWPH00=">
-    <file short-path="friend-6.cpp" source-path="friend-6.cpp" line="12" class="def"/>
+    <file short-path="friend-type.cpp" source-path="friend-type.cpp" line="12" class="def"/>
     <friend id="CgGNdHpW5mG/i5741WPYQDw28OQ=">
       <befriended id="CgGNdHpW5mG/i5741WPYQDw28OQ="/>
     </friend>
@@ -25,7 +25,7 @@
     </doc>
   </struct>
   <struct name="V" id="9kzYwt0WPztMEDUaFxul1Jvqqs8=">
-    <file short-path="friend-6.cpp" source-path="friend-6.cpp" line="19" class="def"/>
+    <file short-path="friend-type.cpp" source-path="friend-type.cpp" line="19" class="def"/>
     <friend id="FLgkhM3m0U3Lo2o3XLPUizWPH00=">
       <befriended id="FLgkhM3m0U3Lo2o3XLPUizWPH00="/>
     </friend>
@@ -36,7 +36,7 @@
     </doc>
   </struct>
   <class name="Z" id="NQ8uQgTcafPcttyBMHHLHAXA4MA=">
-    <file short-path="friend-6.cpp" source-path="friend-6.cpp" line="8"/>
+    <file short-path="friend-type.cpp" source-path="friend-type.cpp" line="8"/>
     <doc>
       <brief>
         <text>Friend class Z brief</text>
diff --git a/test-files/golden-tests/symbols/record/local-class.html b/test-files/golden-tests/symbols/record/local-class.html
index 4604d524a..2d99e148a 100644
--- a/test-files/golden-tests/symbols/record/local-class.html
+++ b/test-files/golden-tests/symbols/record/local-class.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -38,7 +38,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="B">B</h2>
+<h2 id="B"><a href="#B">B</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -70,7 +70,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="f">f</h2>
+<h2 id="f"><a href="#f">f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/record/out-of-line-record-def.html b/test-files/golden-tests/symbols/record/out-of-line-record-def.html
index ef6daa458..676a3c2a8 100644
--- a/test-files/golden-tests/symbols/record/out-of-line-record-def.html
+++ b/test-files/golden-tests/symbols/record/out-of-line-record-def.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,7 +25,7 @@ <h2>Namespaces</h2>
 </div>
 <div>
 <div>
-<h2 id="N">N</h2>
+<h2 id="N"><a href="#N">N</a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -43,7 +43,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="N-S"><a href="#N">N</a>::S</h2>
+<h2 id="N-S"><a href="#N-S">N::S</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/record/record-1.html b/test-files/golden-tests/symbols/record/record-1.html
index 239f18477..e143f4571 100644
--- a/test-files/golden-tests/symbols/record/record-1.html
+++ b/test-files/golden-tests/symbols/record/record-1.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,7 +25,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="T">T</h2>
+<h2 id="T"><a href="#T">T</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -87,7 +87,7 @@ <h2>Protected Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="T-U1"><a href="#T">T</a>::U1</h2>
+<h2 id="T-U1"><a href="#T-U1">T::U1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -102,7 +102,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="T-U2"><a href="#T">T</a>::U2</h2>
+<h2 id="T-U2"><a href="#T-U2">T::U2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -117,7 +117,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="T-f1"><a href="#T">T</a>::f1</h2>
+<h2 id="T-f1"><a href="#T-f1">T::f1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -133,7 +133,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="T-f2"><a href="#T">T</a>::f2</h2>
+<h2 id="T-f2"><a href="#T-f2">T::f2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -149,7 +149,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="T-f3"><a href="#T">T</a>::f3</h2>
+<h2 id="T-f3"><a href="#T-f3">T::f3</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -165,7 +165,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="T-g1"><a href="#T">T</a>::g1</h2>
+<h2 id="T-g1"><a href="#T-g1">T::g1</a></h2>
 <div>
 <span>brief-g1</span>
 
@@ -189,7 +189,7 @@ <h3>Description</h3>
 </div>
 <div>
 <div>
-<h2 id="T-g2"><a href="#T">T</a>::g2</h2>
+<h2 id="T-g2"><a href="#T-g2">T::g2</a></h2>
 <div>
 <span>brief-g2</span>
 
@@ -213,7 +213,7 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="T-g3"><a href="#T">T</a>::g3</h2>
+<h2 id="T-g3"><a href="#T-g3">T::g3</a></h2>
 <div>
 <span>brief-g3</span>
 
diff --git a/test-files/golden-tests/symbols/record/record-access.html b/test-files/golden-tests/symbols/record/record-access.html
index 5a8d0e683..d8405dbb2 100644
--- a/test-files/golden-tests/symbols/record/record-access.html
+++ b/test-files/golden-tests/symbols/record/record-access.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -27,7 +27,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="C0">C0</h2>
+<h2 id="C0"><a href="#C0">C0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -83,7 +83,7 @@ <h2>Private Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="C0-f2"><a href="#C0">C0</a>::f2</h2>
+<h2 id="C0-f2"><a href="#C0-f2">C0::f2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -99,7 +99,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="C0-f1"><a href="#C0">C0</a>::f1</h2>
+<h2 id="C0-f1"><a href="#C0-f1">C0::f1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -115,7 +115,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="C0-f0"><a href="#C0">C0</a>::f0</h2>
+<h2 id="C0-f0"><a href="#C0-f0">C0::f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -131,7 +131,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0">S0</h2>
+<h2 id="S0"><a href="#S0">S0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -187,7 +187,7 @@ <h2>Private Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-f0"><a href="#S0">S0</a>::f0</h2>
+<h2 id="S0-f0"><a href="#S0-f0">S0::f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -203,7 +203,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-f1"><a href="#S0">S0</a>::f1</h2>
+<h2 id="S0-f1"><a href="#S0-f1">S0::f1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -219,7 +219,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-f2"><a href="#S0">S0</a>::f2</h2>
+<h2 id="S0-f2"><a href="#S0-f2">S0::f2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -235,7 +235,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="U0">U0</h2>
+<h2 id="U0"><a href="#U0">U0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -291,7 +291,7 @@ <h2>Private Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="U0-f0"><a href="#U0">U0</a>::f0</h2>
+<h2 id="U0-f0"><a href="#U0-f0">U0::f0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -307,7 +307,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="U0-f1"><a href="#U0">U0</a>::f1</h2>
+<h2 id="U0-f1"><a href="#U0-f1">U0::f1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -323,7 +323,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="U0-f2"><a href="#U0">U0</a>::f2</h2>
+<h2 id="U0-f2"><a href="#U0-f2">U0::f2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/record/record-data.html b/test-files/golden-tests/symbols/record/record-data.html
index 1e09766ed..90fc65c9c 100644
--- a/test-files/golden-tests/symbols/record/record-data.html
+++ b/test-files/golden-tests/symbols/record/record-data.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -29,7 +29,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="T">T</h2>
+<h2 id="T"><a href="#T">T</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -63,7 +63,7 @@ <h2>Data Members</h2>
 </div>
 <div>
 <div>
-<h2 id="T-i"><a href="#T">T</a>::i</h2>
+<h2 id="T-i"><a href="#T-i">T::i</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -78,7 +78,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="T-j"><a href="#T">T</a>::j</h2>
+<h2 id="T-j"><a href="#T-j">T::j</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -93,7 +93,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="T-k"><a href="#T">T</a>::k</h2>
+<h2 id="T-k"><a href="#T-k">T::k</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -109,7 +109,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="T-l"><a href="#T">T</a>::l</h2>
+<h2 id="T-l"><a href="#T-l">T::l</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -124,7 +124,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="T-m"><a href="#T">T</a>::m</h2>
+<h2 id="T-m"><a href="#T-m">T::m</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -139,7 +139,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="U">U</h2>
+<h2 id="U"><a href="#U">U</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -169,7 +169,7 @@ <h2>Data Members</h2>
 </div>
 <div>
 <div>
-<h2 id="U-t"><a href="#U">U</a>::t</h2>
+<h2 id="U-t"><a href="#U-t">U::t</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -184,7 +184,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="V">V</h2>
+<h2 id="V"><a href="#V">V</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -228,7 +228,7 @@ <h2>Private Data Members</h2>
 </div>
 <div>
 <div>
-<h2 id="V-j"><a href="#V">V</a>::j</h2>
+<h2 id="V-j"><a href="#V-j">V::j</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -243,7 +243,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="V-i"><a href="#V">V</a>::i</h2>
+<h2 id="V-i"><a href="#V-i">V::i</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -258,7 +258,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="V-k"><a href="#V">V</a>::k</h2>
+<h2 id="V-k"><a href="#V-k">V::k</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -273,7 +273,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="W">W</h2>
+<h2 id="W"><a href="#W">W</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -303,7 +303,7 @@ <h2>Data Members</h2>
 </div>
 <div>
 <div>
-<h2 id="W-buf"><a href="#W">W</a>::buf</h2>
+<h2 id="W-buf"><a href="#W-buf">W::buf</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -318,7 +318,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="X">X</h2>
+<h2 id="X"><a href="#X">X</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -368,7 +368,7 @@ <h2>Data Members</h2>
 </div>
 <div>
 <div>
-<h2 id="X-Q"><a href="#X">X</a>::Q</h2>
+<h2 id="X-Q"><a href="#X-Q">X::Q</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -383,7 +383,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="X-x0"><a href="#X">X</a>::x0</h2>
+<h2 id="X-x0"><a href="#X-x0">X::x0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -398,7 +398,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="X-x1"><a href="#X">X</a>::x1</h2>
+<h2 id="X-x1"><a href="#X-x1">X::x1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -413,7 +413,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="X-x2"><a href="#X">X</a>::x2</h2>
+<h2 id="X-x2"><a href="#X-x2">X::x2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -428,7 +428,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="X-x3"><a href="#X">X</a>::x3</h2>
+<h2 id="X-x3"><a href="#X-x3">X::x3</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -443,7 +443,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="X-x4"><a href="#X">X</a>::x4</h2>
+<h2 id="X-x4"><a href="#X-x4">X::x4</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/record/record-inheritance.html b/test-files/golden-tests/symbols/record/record-inheritance.html
index f4d090162..8e1fe4bca 100644
--- a/test-files/golden-tests/symbols/record/record-inheritance.html
+++ b/test-files/golden-tests/symbols/record/record-inheritance.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -40,7 +40,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="C0">C0</h2>
+<h2 id="C0"><a href="#C0">C0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -72,7 +72,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="C1">C1</h2>
+<h2 id="C1"><a href="#C1">C1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -90,7 +90,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="C2">C2</h2>
+<h2 id="C2"><a href="#C2">C2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -122,7 +122,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="C3">C3</h2>
+<h2 id="C3"><a href="#C3">C3</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -140,7 +140,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="C4">C4</h2>
+<h2 id="C4"><a href="#C4">C4</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -158,7 +158,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="C5">C5</h2>
+<h2 id="C5"><a href="#C5">C5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -191,7 +191,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="C6">C6</h2>
+<h2 id="C6"><a href="#C6">C6</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -224,7 +224,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="C7">C7</h2>
+<h2 id="C7"><a href="#C7">C7</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -258,7 +258,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="S0">S0</h2>
+<h2 id="S0"><a href="#S0">S0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -290,7 +290,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="S1">S1</h2>
+<h2 id="S1"><a href="#S1">S1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -322,7 +322,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="S2">S2</h2>
+<h2 id="S2"><a href="#S2">S2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -369,7 +369,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="S3">S3</h2>
+<h2 id="S3"><a href="#S3">S3</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -416,7 +416,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="S4">S4</h2>
+<h2 id="S4"><a href="#S4">S4</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -450,7 +450,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="S5">S5</h2>
+<h2 id="S5"><a href="#S5">S5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -469,7 +469,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S6">S6</h2>
+<h2 id="S6"><a href="#S6">S6</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -502,7 +502,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="U0">U0</h2>
+<h2 id="U0"><a href="#U0">U0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/record/template-specialization-inheritance.adoc b/test-files/golden-tests/symbols/record/template-specialization-inheritance.adoc
index ba506616e..b5477683b 100644
--- a/test-files/golden-tests/symbols/record/template-specialization-inheritance.adoc
+++ b/test-files/golden-tests/symbols/record/template-specialization-inheritance.adoc
@@ -181,7 +181,7 @@ struct S1;
 ----
 
 [#S0-09]
-== S0&lt;2&gt;
+== <<S0-0c,S0>>&lt;2&gt;
 
 === Synopsis
 
@@ -194,7 +194,7 @@ struct <<S0-0c,S0>>&lt;2&gt;;
 ----
 
 [#S0-073]
-== S0&lt;3&gt;
+== <<S0-0c,S0>>&lt;3&gt;
 
 === Synopsis
 
@@ -217,7 +217,7 @@ struct <<S0-0c,S0>>&lt;3&gt;;
 |===
 
 [#S0-0e]
-== S0&lt;5&gt;
+== <<S0-0c,S0>>&lt;5&gt;
 
 === Synopsis
 
@@ -238,7 +238,7 @@ struct <<S0-0c,S0>>&lt;5&gt;;
 |===
 
 [#S0-0e-S1]
-== <<S0-0e,S0>>&lt;5&gt;::S1
+== <<S0-0e,S0&lt;5&gt;>>::S1
 
 === Synopsis
 
@@ -250,7 +250,7 @@ struct S1;
 ----
 
 [#S0-07e]
-== S0&lt;6&gt;
+== <<S0-0c,S0>>&lt;6&gt;
 
 === Synopsis
 
diff --git a/test-files/golden-tests/symbols/record/template-specialization-inheritance.html b/test-files/golden-tests/symbols/record/template-specialization-inheritance.html
index 34578bc3f..30b557eaa 100644
--- a/test-files/golden-tests/symbols/record/template-specialization-inheritance.html
+++ b/test-files/golden-tests/symbols/record/template-specialization-inheritance.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -35,7 +35,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="U1">U1</h2>
+<h2 id="U1"><a href="#U1">U1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -50,7 +50,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="U2">U2</h2>
+<h2 id="U2"><a href="#U2">U2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -65,7 +65,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="U3">U3</h2>
+<h2 id="U3"><a href="#U3">U3</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -80,7 +80,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="R0">R0</h2>
+<h2 id="R0"><a href="#R0">R0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -125,7 +125,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="R1">R1</h2>
+<h2 id="R1"><a href="#R1">R1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -157,7 +157,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="R2">R2</h2>
+<h2 id="R2"><a href="#R2">R2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -189,7 +189,7 @@ <h2>Base Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0c">S0</h2>
+<h2 id="S0-0c"><a href="#S0-0c">S0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -237,7 +237,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0c-S1"><a href="#S0-0c">S0</a>::S1</h2>
+<h2 id="S0-0c-S1"><a href="#S0-0c-S1">S0::S1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -254,7 +254,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-09">S0&lt;2&gt;</h2>
+<h2 id="S0-09"><a href="#S0-09">S0&lt;2&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -272,7 +272,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-073">S0&lt;3&gt;</h2>
+<h2 id="S0-073"><a href="#S0-073">S0&lt;3&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -305,7 +305,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0e">S0&lt;5&gt;</h2>
+<h2 id="S0-0e"><a href="#S0-0e">S0&lt;5&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -336,7 +336,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-0e-S1"><a href="#S0-0e">S0</a>&lt;5&gt;::S1</h2>
+<h2 id="S0-0e-S1"><a href="#S0-0e-S1">S0&lt;5&gt;::S1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -353,7 +353,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-07e">S0&lt;6&gt;</h2>
+<h2 id="S0-07e"><a href="#S0-07e">S0&lt;6&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/record/union.html b/test-files/golden-tests/symbols/record/union.html
index dbe94aafe..ef30e143c 100644
--- a/test-files/golden-tests/symbols/record/union.html
+++ b/test-files/golden-tests/symbols/record/union.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -26,7 +26,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -57,7 +57,7 @@ <h2>Data Members</h2>
 </div>
 <div>
 <div>
-<h2 id="A-x"><a href="#A">A</a>::x</h2>
+<h2 id="A-x"><a href="#A-x">A::x</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -72,7 +72,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-y"><a href="#A">A</a>::y</h2>
+<h2 id="A-y"><a href="#A-y">A::y</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -87,7 +87,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="B">B</h2>
+<h2 id="B"><a href="#B">B</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -119,7 +119,7 @@ <h2>Data Members</h2>
 </div>
 <div>
 <div>
-<h2 id="B-x"><a href="#B">B</a>::x</h2>
+<h2 id="B-x"><a href="#B-x">B::x</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -134,7 +134,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="B-y"><a href="#B">B</a>::y</h2>
+<h2 id="B-y"><a href="#B-y">B::y</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -149,7 +149,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="B-z"><a href="#B">B</a>::z</h2>
+<h2 id="B-z"><a href="#B-z">B::z</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/using/alias-template.html b/test-files/golden-tests/symbols/using/alias-template.html
index 6c08fcf77..415b88ce9 100644
--- a/test-files/golden-tests/symbols/using/alias-template.html
+++ b/test-files/golden-tests/symbols/using/alias-template.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -28,7 +28,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="C">C</h2>
+<h2 id="C"><a href="#C">C</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -44,7 +44,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -62,7 +62,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="B">B</h2>
+<h2 id="B"><a href="#B">B</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -82,7 +82,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="D">D</h2>
+<h2 id="D"><a href="#D">D</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -113,7 +113,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="D-E"><a href="#D">D</a>::E</h2>
+<h2 id="D-E"><a href="#D-E">D::E</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/using/decay-to-primary.adoc b/test-files/golden-tests/symbols/using/decay-to-primary.adoc
index 387ec70c8..131419c37 100644
--- a/test-files/golden-tests/symbols/using/decay-to-primary.adoc
+++ b/test-files/golden-tests/symbols/using/decay-to-primary.adoc
@@ -88,7 +88,7 @@ using M1 = <<S0-03,S0>>&lt;U&gt;;
 ----
 
 [#S0-00]
-== S0&lt;void&gt;
+== <<S0-03,S0>>&lt;void&gt;
 
 === Synopsis
 
@@ -110,7 +110,7 @@ struct <<S0-03,S0>>&lt;void&gt;;
 |===
 
 [#S0-00-M0]
-== <<S0-00,S0>>&lt;void&gt;::M0
+== <<S0-00,S0&lt;void&gt;>>::M0
 
 === Synopsis
 
@@ -122,7 +122,7 @@ using M0 = void;
 ----
 
 [#S0-00-M1]
-== <<S0-00,S0>>&lt;void&gt;::M1
+== <<S0-00,S0&lt;void&gt;>>::M1
 
 === Synopsis
 
@@ -135,7 +135,7 @@ using M1 = <<S0-03,S0>>&lt;U&gt;;
 ----
 
 [#S0-09]
-== S0&lt;short&gt;
+== <<S0-03,S0>>&lt;short&gt;
 
 === Synopsis
 
@@ -157,7 +157,7 @@ struct <<S0-03,S0>>&lt;short&gt;;
 |===
 
 [#S0-09-M0]
-== <<S0-09,S0>>&lt;short&gt;::M0
+== <<S0-09,S0&lt;short&gt;>>::M0
 
 === Synopsis
 
@@ -169,7 +169,7 @@ using M0 = short;
 ----
 
 [#S0-09-M1]
-== <<S0-09,S0>>&lt;short&gt;::M1
+== <<S0-09,S0&lt;short&gt;>>::M1
 
 === Synopsis
 
diff --git a/test-files/golden-tests/symbols/using/decay-to-primary.html b/test-files/golden-tests/symbols/using/decay-to-primary.html
index e5fdf8e3a..20dd1b1ed 100644
--- a/test-files/golden-tests/symbols/using/decay-to-primary.html
+++ b/test-files/golden-tests/symbols/using/decay-to-primary.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -29,7 +29,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A0">A0</h2>
+<h2 id="A0"><a href="#A0">A0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -44,7 +44,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A1">A1</h2>
+<h2 id="A1"><a href="#A1">A1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -59,7 +59,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-03">S0</h2>
+<h2 id="S0-03"><a href="#S0-03">S0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -91,7 +91,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-03-M0"><a href="#S0-03">S0</a>::M0</h2>
+<h2 id="S0-03-M0"><a href="#S0-03-M0">S0::M0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -106,7 +106,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-03-M1"><a href="#S0-03">S0</a>::M1</h2>
+<h2 id="S0-03-M1"><a href="#S0-03-M1">S0::M1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -122,7 +122,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-00">S0&lt;void&gt;</h2>
+<h2 id="S0-00"><a href="#S0-00">S0&lt;void&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -154,7 +154,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-00-M0"><a href="#S0-00">S0</a>&lt;void&gt;::M0</h2>
+<h2 id="S0-00-M0"><a href="#S0-00-M0">S0&lt;void&gt;::M0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -169,7 +169,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-00-M1"><a href="#S0-00">S0</a>&lt;void&gt;::M1</h2>
+<h2 id="S0-00-M1"><a href="#S0-00-M1">S0&lt;void&gt;::M1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -185,7 +185,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-09">S0&lt;short&gt;</h2>
+<h2 id="S0-09"><a href="#S0-09">S0&lt;short&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -217,7 +217,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-09-M0"><a href="#S0-09">S0</a>&lt;short&gt;::M0</h2>
+<h2 id="S0-09-M0"><a href="#S0-09-M0">S0&lt;short&gt;::M0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -232,7 +232,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-09-M1"><a href="#S0-09">S0</a>&lt;short&gt;::M1</h2>
+<h2 id="S0-09-M1"><a href="#S0-09-M1">S0&lt;short&gt;::M1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/using/dependency-propagation.html b/test-files/golden-tests/symbols/using/dependency-propagation.html
index fefb0c636..e3fe16eb0 100644
--- a/test-files/golden-tests/symbols/using/dependency-propagation.html
+++ b/test-files/golden-tests/symbols/using/dependency-propagation.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -38,7 +38,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="N">N</h2>
+<h2 id="N"><a href="#N">N</a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -59,7 +59,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="N-B"><a href="#N">N</a>::B</h2>
+<h2 id="N-B"><a href="#N-B">N::B</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -75,7 +75,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="N-C"><a href="#N">N</a>::C</h2>
+<h2 id="N-C"><a href="#N-C">N::C</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -91,7 +91,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="N-A"><a href="#N">N</a>::A</h2>
+<h2 id="N-A"><a href="#N-A">N::A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -109,7 +109,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="N-D"><a href="#N">N</a>::D</h2>
+<h2 id="N-D"><a href="#N-D">N::D</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -126,7 +126,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="E">E</h2>
+<h2 id="E"><a href="#E">E</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/using/implicit-instantiation-member-ref.adoc b/test-files/golden-tests/symbols/using/implicit-instantiation-member-ref.adoc
index c9f415ca8..5f4557d0a 100644
--- a/test-files/golden-tests/symbols/using/implicit-instantiation-member-ref.adoc
+++ b/test-files/golden-tests/symbols/using/implicit-instantiation-member-ref.adoc
@@ -108,7 +108,7 @@ using M3 = <<S0-03-S2,S2>>&lt;U&gt;;
 ----
 
 [#S0-00]
-== S0&lt;void&gt;
+== <<S0-03,S0>>&lt;void&gt;
 
 === Synopsis
 
@@ -130,7 +130,7 @@ struct <<S0-03,S0>>&lt;void&gt;;
 |===
 
 [#S0-00-S2-0d]
-== <<S0-00,S0>>&lt;void&gt;::S2
+== <<S0-00,S0&lt;void&gt;>>::S2
 
 === Synopsis
 
@@ -143,7 +143,7 @@ struct S2;
 ----
 
 [#S0-00-S2-02]
-== <<S0-00,S0>>&lt;void&gt;::S2&lt;char&gt;
+== <<S0-00,S0&lt;void&gt;>>::<<S0-03-S2,S2>>&lt;char&gt;
 
 === Synopsis
 
@@ -165,7 +165,7 @@ struct <<S0-03-S2,S2>>&lt;char&gt;;
 |===
 
 [#S0-00-S2-02-M2]
-== <<S0-00,S0>>&lt;void&gt;::<<S0-00-S2-02,S2>>&lt;char&gt;::M2
+== <<S0-00,S0&lt;void&gt;>>::<<S0-00-S2-02,S2&lt;char&gt;>>::M2
 
 === Synopsis
 
@@ -177,7 +177,7 @@ using M2 = char;
 ----
 
 [#S0-00-S2-02-M3]
-== <<S0-00,S0>>&lt;void&gt;::<<S0-00-S2-02,S2>>&lt;char&gt;::M3
+== <<S0-00,S0&lt;void&gt;>>::<<S0-00-S2-02,S2&lt;char&gt;>>::M3
 
 === Synopsis
 
diff --git a/test-files/golden-tests/symbols/using/implicit-instantiation-member-ref.html b/test-files/golden-tests/symbols/using/implicit-instantiation-member-ref.html
index 0e4e97caf..bb26b3cf2 100644
--- a/test-files/golden-tests/symbols/using/implicit-instantiation-member-ref.html
+++ b/test-files/golden-tests/symbols/using/implicit-instantiation-member-ref.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -28,7 +28,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A5">A5</h2>
+<h2 id="A5"><a href="#A5">A5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -43,7 +43,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A9">A9</h2>
+<h2 id="A9"><a href="#A9">A9</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -58,7 +58,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-03">S0</h2>
+<h2 id="S0-03"><a href="#S0-03">S0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -89,7 +89,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-03-S2"><a href="#S0-03">S0</a>::S2</h2>
+<h2 id="S0-03-S2"><a href="#S0-03-S2">S0::S2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -121,7 +121,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-03-S2-M2"><a href="#S0-03">S0</a>::<a href="#S0-03-S2">S2</a>::M2</h2>
+<h2 id="S0-03-S2-M2"><a href="#S0-03-S2-M2">S0::S2::M2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -136,7 +136,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-03-S2-M3"><a href="#S0-03">S0</a>::<a href="#S0-03-S2">S2</a>::M3</h2>
+<h2 id="S0-03-S2-M3"><a href="#S0-03-S2-M3">S0::S2::M3</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -152,7 +152,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-00">S0&lt;void&gt;</h2>
+<h2 id="S0-00"><a href="#S0-00">S0&lt;void&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -184,7 +184,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-00-S2-0d"><a href="#S0-00">S0</a>&lt;void&gt;::S2</h2>
+<h2 id="S0-00-S2-0d"><a href="#S0-00-S2-0d">S0&lt;void&gt;::S2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -202,7 +202,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-00-S2-02"><a href="#S0-00">S0</a>&lt;void&gt;::S2&lt;char&gt;</h2>
+<h2 id="S0-00-S2-02"><a href="#S0-00-S2-02">S0&lt;void&gt;::S2&lt;char&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -234,7 +234,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="S0-00-S2-02-M2"><a href="#S0-00">S0</a>&lt;void&gt;::<a href="#S0-00-S2-02">S2</a>&lt;char&gt;::M2</h2>
+<h2 id="S0-00-S2-02-M2"><a href="#S0-00-S2-02-M2">S0&lt;void&gt;::S2&lt;char&gt;::M2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -249,7 +249,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S0-00-S2-02-M3"><a href="#S0-00">S0</a>&lt;void&gt;::<a href="#S0-00-S2-02">S2</a>&lt;char&gt;::M3</h2>
+<h2 id="S0-00-S2-02-M3"><a href="#S0-00-S2-02-M3">S0&lt;void&gt;::S2&lt;char&gt;::M3</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/using/using-1.html b/test-files/golden-tests/symbols/using/using-1.html
index 08fe109ab..f7d0942cb 100644
--- a/test-files/golden-tests/symbols/using/using-1.html
+++ b/test-files/golden-tests/symbols/using/using-1.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -42,7 +42,7 @@ <h2>Using Namespace Directives</h2>
 </div>
 <div>
 <div>
-<h2 id="LongName">LongName</h2>
+<h2 id="LongName"><a href="#LongName">LongName</a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -60,7 +60,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="LongName-A"><a href="#LongName">LongName</a>::A</h2>
+<h2 id="LongName-A"><a href="#LongName-A">LongName::A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/using/using-2.html b/test-files/golden-tests/symbols/using/using-2.html
index 58757f0ee..40b92ecc2 100644
--- a/test-files/golden-tests/symbols/using/using-2.html
+++ b/test-files/golden-tests/symbols/using/using-2.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,7 +25,7 @@ <h2>Namespaces</h2>
 </div>
 <div>
 <div>
-<h2 id="LongName">LongName</h2>
+<h2 id="LongName"><a href="#LongName">LongName</a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -44,7 +44,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="LongName-S1"><a href="#LongName">LongName</a>::S1</h2>
+<h2 id="LongName-S1"><a href="#LongName-S1">LongName::S1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -61,7 +61,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="LongName-S2"><a href="#LongName">LongName</a>::S2</h2>
+<h2 id="LongName-S2"><a href="#LongName-S2">LongName::S2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -78,7 +78,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="S1">S1</h2>
+<h2 id="S1"><a href="#S1">S1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -109,7 +109,7 @@ <h3>Introduced Symbols</h3>
 </div>
 <div>
 <div>
-<h2 id="S2">S2</h2>
+<h2 id="S2"><a href="#S2">S2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/using/using-3.html b/test-files/golden-tests/symbols/using/using-3.html
index a57328b96..f6530dfc4 100644
--- a/test-files/golden-tests/symbols/using/using-3.html
+++ b/test-files/golden-tests/symbols/using/using-3.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -27,7 +27,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -72,7 +72,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="A-f"><a href="#A">A</a>::f</h2>
+<h2 id="A-f"><a href="#A-f">A::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -88,7 +88,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="B">B</h2>
+<h2 id="B"><a href="#B">B</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -133,7 +133,7 @@ <h2>Derived Classes</h2>
 </div>
 <div>
 <div>
-<h2 id="B-f"><a href="#B">B</a>::f</h2>
+<h2 id="B-f"><a href="#B-f">B::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -149,7 +149,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="C">C</h2>
+<h2 id="C"><a href="#C">C</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -211,7 +211,7 @@ <h2>Using Declarations</h2>
 </div>
 <div>
 <div>
-<h2 id="C-f-0e"><a href="#C">C</a>::f</h2>
+<h2 id="C-f-0e"><a href="#C-f-0e">C::f</a></h2>
 </div>
 <div>
 <h3>Synopses</h3>
@@ -238,7 +238,7 @@ <h3>Synopses</h3>
 </div>
 <div>
 <div>
-<h2 id="B-f"><a href="#B">B</a>::f</h2>
+<h2 id="B-f"><a href="#B-f">B::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -254,7 +254,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-f"><a href="#A">A</a>::f</h2>
+<h2 id="A-f"><a href="#A-f">A::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -270,7 +270,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="C-f-08"><a href="#C">C</a>::f</h2>
+<h2 id="C-f-08"><a href="#C-f-08">C::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -301,7 +301,7 @@ <h3>Introduced Symbols</h3>
 </div>
 <div>
 <div>
-<h2 id="C-f-03"><a href="#C">C</a>::f</h2>
+<h2 id="C-f-03"><a href="#C-f-03">C::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/variable/no_unique_address.html b/test-files/golden-tests/symbols/variable/no_unique_address.html
index 68717c2fa..a21ac2109 100644
--- a/test-files/golden-tests/symbols/variable/no_unique_address.html
+++ b/test-files/golden-tests/symbols/variable/no_unique_address.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -26,7 +26,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="Empty">Empty</h2>
+<h2 id="Empty"><a href="#Empty">Empty</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -43,7 +43,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="T">T</h2>
+<h2 id="T"><a href="#T">T</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -74,7 +74,7 @@ <h2>Data Members</h2>
 </div>
 <div>
 <div>
-<h2 id="T-e"><a href="#T">T</a>::e</h2>
+<h2 id="T-e"><a href="#T-e">T::e</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -90,7 +90,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="T-i"><a href="#T">T</a>::i</h2>
+<h2 id="T-i"><a href="#T-i">T::i</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/variable/ns-variables.html b/test-files/golden-tests/symbols/variable/ns-variables.html
index 60c89ae1f..e9399004f 100644
--- a/test-files/golden-tests/symbols/variable/ns-variables.html
+++ b/test-files/golden-tests/symbols/variable/ns-variables.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -46,7 +46,7 @@ <h2>Variables</h2>
 </div>
 <div>
 <div>
-<h2 id="T">T</h2>
+<h2 id="T"><a href="#T">T</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -63,7 +63,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="i">i</h2>
+<h2 id="i"><a href="#i">i</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -78,7 +78,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="j">j</h2>
+<h2 id="j"><a href="#j">j</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -93,7 +93,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="k">k</h2>
+<h2 id="k"><a href="#k">k</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -109,7 +109,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="l">l</h2>
+<h2 id="l"><a href="#l">l</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -125,7 +125,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="pi">pi</h2>
+<h2 id="pi"><a href="#pi">pi</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -140,7 +140,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="t">t</h2>
+<h2 id="t"><a href="#t">t</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -156,7 +156,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="x0">x0</h2>
+<h2 id="x0"><a href="#x0">x0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -172,7 +172,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="x1">x1</h2>
+<h2 id="x1"><a href="#x1">x1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -189,7 +189,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="x2">x2</h2>
+<h2 id="x2"><a href="#x2">x2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/variable/static-data-def-constexpr.html b/test-files/golden-tests/symbols/variable/static-data-def-constexpr.html
index 9e0243e27..c837e2a80 100644
--- a/test-files/golden-tests/symbols/variable/static-data-def-constexpr.html
+++ b/test-files/golden-tests/symbols/variable/static-data-def-constexpr.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -26,7 +26,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="S">S</h2>
+<h2 id="S"><a href="#S">S</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -56,7 +56,7 @@ <h2>Static Data Members</h2>
 </div>
 <div>
 <div>
-<h2 id="S-s"><a href="#S">S</a>::s</h2>
+<h2 id="S-s"><a href="#S-s">S::s</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -72,7 +72,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="T">T</h2>
+<h2 id="T"><a href="#T">T</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -102,7 +102,7 @@ <h2>Static Data Members</h2>
 </div>
 <div>
 <div>
-<h2 id="T-t"><a href="#T">T</a>::t</h2>
+<h2 id="T-t"><a href="#T-t">T::t</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/variable/static-data-def.html b/test-files/golden-tests/symbols/variable/static-data-def.html
index 1fc32010c..57ae879e3 100644
--- a/test-files/golden-tests/symbols/variable/static-data-def.html
+++ b/test-files/golden-tests/symbols/variable/static-data-def.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -39,7 +39,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -77,7 +77,7 @@ <h2>Static Data Members</h2>
 </div>
 <div>
 <div>
-<h2 id="A-v0"><a href="#A">A</a>::v0</h2>
+<h2 id="A-v0"><a href="#A-v0">A::v0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -93,7 +93,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-v1"><a href="#A">A</a>::v1</h2>
+<h2 id="A-v1"><a href="#A-v1">A::v1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -109,7 +109,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-v2"><a href="#A">A</a>::v2</h2>
+<h2 id="A-v2"><a href="#A-v2">A::v2</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -125,7 +125,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-v3"><a href="#A">A</a>::v3</h2>
+<h2 id="A-v3"><a href="#A-v3">A::v3</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -141,7 +141,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-v4"><a href="#A">A</a>::v4</h2>
+<h2 id="A-v4"><a href="#A-v4">A::v4</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -157,7 +157,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-v5"><a href="#A">A</a>::v5</h2>
+<h2 id="A-v5"><a href="#A-v5">A::v5</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -173,7 +173,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-v6"><a href="#A">A</a>::v6</h2>
+<h2 id="A-v6"><a href="#A-v6">A::v6</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -189,7 +189,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-v7"><a href="#A">A</a>::v7</h2>
+<h2 id="A-v7"><a href="#A-v7">A::v7</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -205,7 +205,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="B">B</h2>
+<h2 id="B"><a href="#B">B</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -236,7 +236,7 @@ <h2>Static Data Members</h2>
 </div>
 <div>
 <div>
-<h2 id="B-x0"><a href="#B">B</a>::x0</h2>
+<h2 id="B-x0"><a href="#B-x0">B::x0</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -253,7 +253,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="B-x1"><a href="#B">B</a>::x1</h2>
+<h2 id="B-x1"><a href="#B-x1">B::x1</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -270,7 +270,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f">f</h2>
+<h2 id="f"><a href="#f">f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/variable/static-data-template.html b/test-files/golden-tests/symbols/variable/static-data-template.html
index e49751008..65968a6dc 100644
--- a/test-files/golden-tests/symbols/variable/static-data-template.html
+++ b/test-files/golden-tests/symbols/variable/static-data-template.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,7 +25,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -58,7 +58,7 @@ <h2>Static Data Members</h2>
 </div>
 <div>
 <div>
-<h2 id="A-x-05"><a href="#A">A</a>::x</h2>
+<h2 id="A-x-05"><a href="#A-x-05">A::x</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -77,7 +77,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-x-07"><a href="#A">A</a>::x&lt;T, long&gt;</h2>
+<h2 id="A-x-07"><a href="#A-x-07">A::x&lt;T, long&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -94,7 +94,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-x-0a"><a href="#A">A</a>::x&lt;U*, T&gt;</h2>
+<h2 id="A-x-0a"><a href="#A-x-0a">A::x&lt;U*, T&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/variable/var-inline-constexpr.html b/test-files/golden-tests/symbols/variable/var-inline-constexpr.html
index 18c3fb0d4..a9b524fa5 100644
--- a/test-files/golden-tests/symbols/variable/var-inline-constexpr.html
+++ b/test-files/golden-tests/symbols/variable/var-inline-constexpr.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Variables</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -34,7 +34,7 @@ <h2>Variables</h2>
 </div>
 <div>
 <div>
-<h2 id="var">var</h2>
+<h2 id="var"><a href="#var">var</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -49,7 +49,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="var_const">var_const</h2>
+<h2 id="var_const"><a href="#var_const">var_const</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -64,7 +64,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="var_const_t">var_const_t</h2>
+<h2 id="var_const_t"><a href="#var_const_t">var_const_t</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -80,7 +80,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="var_constexpr">var_constexpr</h2>
+<h2 id="var_constexpr"><a href="#var_constexpr">var_constexpr</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -95,7 +95,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="var_constexpr_t">var_constexpr_t</h2>
+<h2 id="var_constexpr_t"><a href="#var_constexpr_t">var_constexpr_t</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -111,7 +111,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="var_inline_const">var_inline_const</h2>
+<h2 id="var_inline_const"><a href="#var_inline_const">var_inline_const</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -126,7 +126,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="var_inline_const_t">var_inline_const_t</h2>
+<h2 id="var_inline_const_t"><a href="#var_inline_const_t">var_inline_const_t</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -142,7 +142,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="var_inline_constexpr">var_inline_constexpr</h2>
+<h2 id="var_inline_constexpr"><a href="#var_inline_constexpr">var_inline_constexpr</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -157,7 +157,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="var_inline_constexpr_t">var_inline_constexpr_t</h2>
+<h2 id="var_inline_constexpr_t"><a href="#var_inline_constexpr_t">var_inline_constexpr_t</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -173,7 +173,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="var_t">var_t</h2>
+<h2 id="var_t"><a href="#var_t">var_t</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/variable/var-template.html b/test-files/golden-tests/symbols/variable/var-template.html
index 07d219da6..a6df2a433 100644
--- a/test-files/golden-tests/symbols/variable/var-template.html
+++ b/test-files/golden-tests/symbols/variable/var-template.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -40,7 +40,7 @@ <h2>Variables</h2>
 </div>
 <div>
 <div>
-<h2 id="B">B</h2>
+<h2 id="B"><a href="#B">B</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -72,7 +72,7 @@ <h2>Static Data Members</h2>
 </div>
 <div>
 <div>
-<h2 id="B-C-09"><a href="#B">B</a>::C</h2>
+<h2 id="B-C-09"><a href="#B-C-09">B::C</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -89,7 +89,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="B-C-05"><a href="#B">B</a>::C&lt;int&gt;</h2>
+<h2 id="B-C-05"><a href="#B-C-05">B::C&lt;int&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -106,7 +106,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="B-C-0c"><a href="#B">B</a>::C&lt;T*&gt;</h2>
+<h2 id="B-C-0c"><a href="#B-C-0c">B::C&lt;T*&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -123,7 +123,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-0c">A</h2>
+<h2 id="A-0c"><a href="#A-0c">A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -139,7 +139,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-08">A&lt;void&gt;</h2>
+<h2 id="A-08"><a href="#A-08">A&lt;void&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -155,7 +155,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-01">A&lt;T&&gt;</h2>
+<h2 id="A-01"><a href="#A-01">A&lt;T&&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/templates/c_mct_expl_inline.adoc b/test-files/golden-tests/templates/c_mct_expl_inline.adoc
index c017160e0..53b916f87 100644
--- a/test-files/golden-tests/templates/c_mct_expl_inline.adoc
+++ b/test-files/golden-tests/templates/c_mct_expl_inline.adoc
@@ -68,7 +68,7 @@ f();
 ----
 
 [#A-B-01]
-== <<A,A>>::B&lt;int&gt;
+== <<A,A>>::<<A-B-04,B>>&lt;int&gt;
 
 === Synopsis
 
@@ -89,7 +89,7 @@ struct <<A-B-04,B>>&lt;int&gt;;
 |===
 
 [#A-B-01-g]
-== <<A,A>>::<<A-B-01,B>>&lt;int&gt;::g
+== <<A,A>>::<<A-B-01,B&lt;int&gt;>>::g
 
 === Synopsis
 
diff --git a/test-files/golden-tests/templates/c_mct_expl_inline.html b/test-files/golden-tests/templates/c_mct_expl_inline.html
index f559db3f5..3adb8969a 100644
--- a/test-files/golden-tests/templates/c_mct_expl_inline.html
+++ b/test-files/golden-tests/templates/c_mct_expl_inline.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,7 +25,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -56,7 +56,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-B-04"><a href="#A">A</a>::B</h2>
+<h2 id="A-B-04"><a href="#A-B-04">A::B</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -87,7 +87,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-B-04-f"><a href="#A">A</a>::<a href="#A-B-04">B</a>::f</h2>
+<h2 id="A-B-04-f"><a href="#A-B-04-f">A::B::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -103,7 +103,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-B-01"><a href="#A">A</a>::B&lt;int&gt;</h2>
+<h2 id="A-B-01"><a href="#A-B-01">A::B&lt;int&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -134,7 +134,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-B-01-g"><a href="#A">A</a>::<a href="#A-B-01">B</a>&lt;int&gt;::g</h2>
+<h2 id="A-B-01-g"><a href="#A-B-01-g">A::B&lt;int&gt;::g</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/templates/c_mct_expl_outside.adoc b/test-files/golden-tests/templates/c_mct_expl_outside.adoc
index 4f10a6380..304e52681 100644
--- a/test-files/golden-tests/templates/c_mct_expl_outside.adoc
+++ b/test-files/golden-tests/templates/c_mct_expl_outside.adoc
@@ -68,7 +68,7 @@ f();
 ----
 
 [#A-B-01]
-== <<A,A>>::B&lt;int&gt;
+== <<A,A>>::<<A-B-04,B>>&lt;int&gt;
 
 === Synopsis
 
@@ -89,7 +89,7 @@ struct <<A-B-04,B>>&lt;int&gt;;
 |===
 
 [#A-B-01-g]
-== <<A,A>>::<<A-B-01,B>>&lt;int&gt;::g
+== <<A,A>>::<<A-B-01,B&lt;int&gt;>>::g
 
 === Synopsis
 
diff --git a/test-files/golden-tests/templates/c_mct_expl_outside.html b/test-files/golden-tests/templates/c_mct_expl_outside.html
index ca1f15475..8e1bc09e8 100644
--- a/test-files/golden-tests/templates/c_mct_expl_outside.html
+++ b/test-files/golden-tests/templates/c_mct_expl_outside.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,7 +25,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -56,7 +56,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-B-04"><a href="#A">A</a>::B</h2>
+<h2 id="A-B-04"><a href="#A-B-04">A::B</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -87,7 +87,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-B-04-f"><a href="#A">A</a>::<a href="#A-B-04">B</a>::f</h2>
+<h2 id="A-B-04-f"><a href="#A-B-04-f">A::B::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -103,7 +103,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-B-01"><a href="#A">A</a>::B&lt;int&gt;</h2>
+<h2 id="A-B-01"><a href="#A-B-01">A::B&lt;int&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -134,7 +134,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-B-01-g"><a href="#A">A</a>::<a href="#A-B-01">B</a>&lt;int&gt;::g</h2>
+<h2 id="A-B-01-g"><a href="#A-B-01-g">A::B&lt;int&gt;::g</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/templates/c_mft_expl_inline.adoc b/test-files/golden-tests/templates/c_mft_expl_inline.adoc
index 56dc51a8a..86d32e5ee 100644
--- a/test-files/golden-tests/templates/c_mft_expl_inline.adoc
+++ b/test-files/golden-tests/templates/c_mft_expl_inline.adoc
@@ -56,7 +56,7 @@ void
 ----
 template&lt;&gt;
 void
-<<A-f-0b,f>>&lt;int&gt;();
+<<A-f-0b,f&lt;int&gt;>>();
 ----
 
 [.small]#<<A-f-0b,_» more&period;&period;&period;_>>#
@@ -76,7 +76,7 @@ f();
 ----
 
 [#A-f-0b]
-== <<A,A>>::f&lt;int&gt;
+== <<A,A>>::<<A-f-0e,f>>&lt;int&gt;
 
 === Synopsis
 
diff --git a/test-files/golden-tests/templates/c_mft_expl_inline.html b/test-files/golden-tests/templates/c_mft_expl_inline.html
index ae498d891..44c0a0b5f 100644
--- a/test-files/golden-tests/templates/c_mft_expl_inline.html
+++ b/test-files/golden-tests/templates/c_mft_expl_inline.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,7 +25,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -56,7 +56,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-f-07"><a href="#A">A</a>::f</h2>
+<h2 id="A-f-07"><a href="#A-f-07">A::f</a></h2>
 </div>
 <div>
 <h3>Synopses</h3>
@@ -76,7 +76,7 @@ <h3>Synopses</h3>
 <code class="source-code cpp">
 template&lt;&gt;
 void
-<a href="#A-f-0b">f</a>&lt;int&gt;();
+<a href="#A-f-0b">f&lt;int&gt;</a>();
 </code>
 </pre><span class="small"><a href="#A-f-0b"><em>» more...</em></a></span>
 
@@ -85,7 +85,7 @@ <h3>Synopses</h3>
 </div>
 <div>
 <div>
-<h2 id="A-f-0e"><a href="#A">A</a>::f</h2>
+<h2 id="A-f-0e"><a href="#A-f-0e">A::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -102,7 +102,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-f-0b"><a href="#A">A</a>::f&lt;int&gt;</h2>
+<h2 id="A-f-0b"><a href="#A-f-0b">A::f&lt;int&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/templates/c_mft_expl_outside.adoc b/test-files/golden-tests/templates/c_mft_expl_outside.adoc
index 823e60a0b..31dbadaaa 100644
--- a/test-files/golden-tests/templates/c_mft_expl_outside.adoc
+++ b/test-files/golden-tests/templates/c_mft_expl_outside.adoc
@@ -56,7 +56,7 @@ void
 ----
 template&lt;&gt;
 void
-<<A-f-0b,f>>&lt;int&gt;();
+<<A-f-0b,f&lt;int&gt;>>();
 ----
 
 [.small]#<<A-f-0b,_» more&period;&period;&period;_>>#
@@ -76,7 +76,7 @@ f();
 ----
 
 [#A-f-0b]
-== <<A,A>>::f&lt;int&gt;
+== <<A,A>>::<<A-f-0e,f>>&lt;int&gt;
 
 === Synopsis
 
diff --git a/test-files/golden-tests/templates/c_mft_expl_outside.html b/test-files/golden-tests/templates/c_mft_expl_outside.html
index 469b09e08..0657c8760 100644
--- a/test-files/golden-tests/templates/c_mft_expl_outside.html
+++ b/test-files/golden-tests/templates/c_mft_expl_outside.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,7 +25,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -56,7 +56,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-f-07"><a href="#A">A</a>::f</h2>
+<h2 id="A-f-07"><a href="#A-f-07">A::f</a></h2>
 </div>
 <div>
 <h3>Synopses</h3>
@@ -76,7 +76,7 @@ <h3>Synopses</h3>
 <code class="source-code cpp">
 template&lt;&gt;
 void
-<a href="#A-f-0b">f</a>&lt;int&gt;();
+<a href="#A-f-0b">f&lt;int&gt;</a>();
 </code>
 </pre><span class="small"><a href="#A-f-0b"><em>» more...</em></a></span>
 
@@ -85,7 +85,7 @@ <h3>Synopses</h3>
 </div>
 <div>
 <div>
-<h2 id="A-f-0e"><a href="#A">A</a>::f</h2>
+<h2 id="A-f-0e"><a href="#A-f-0e">A::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -102,7 +102,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-f-0b"><a href="#A">A</a>::f&lt;int&gt;</h2>
+<h2 id="A-f-0b"><a href="#A-f-0b">A::f&lt;int&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/templates/ct_expl.adoc b/test-files/golden-tests/templates/ct_expl.adoc
index a9d5e99b2..3011ba153 100644
--- a/test-files/golden-tests/templates/ct_expl.adoc
+++ b/test-files/golden-tests/templates/ct_expl.adoc
@@ -48,7 +48,7 @@ f();
 ----
 
 [#A-00]
-== A&lt;int&gt;
+== <<A-0e,A>>&lt;int&gt;
 
 === Synopsis
 
@@ -69,7 +69,7 @@ struct <<A-0e,A>>&lt;int&gt;;
 |===
 
 [#A-00-g]
-== <<A-00,A>>&lt;int&gt;::g
+== <<A-00,A&lt;int&gt;>>::g
 
 === Synopsis
 
diff --git a/test-files/golden-tests/templates/ct_expl.html b/test-files/golden-tests/templates/ct_expl.html
index 8b398ef80..c2aef2003 100644
--- a/test-files/golden-tests/templates/ct_expl.html
+++ b/test-files/golden-tests/templates/ct_expl.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -26,7 +26,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-0e">A</h2>
+<h2 id="A-0e"><a href="#A-0e">A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -57,7 +57,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-0e-f"><a href="#A-0e">A</a>::f</h2>
+<h2 id="A-0e-f"><a href="#A-0e-f">A::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -73,7 +73,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-00">A&lt;int&gt;</h2>
+<h2 id="A-00"><a href="#A-00">A&lt;int&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -104,7 +104,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-00-g"><a href="#A-00">A</a>&lt;int&gt;::g</h2>
+<h2 id="A-00-g"><a href="#A-00-g">A&lt;int&gt;::g</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/templates/ct_mc.html b/test-files/golden-tests/templates/ct_mc.html
index 79d9f7bf7..1e4911861 100644
--- a/test-files/golden-tests/templates/ct_mc.html
+++ b/test-files/golden-tests/templates/ct_mc.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,7 +25,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -56,7 +56,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-B"><a href="#A">A</a>::B</h2>
+<h2 id="A-B"><a href="#A-B">A::B</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -86,7 +86,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-B-f"><a href="#A">A</a>::<a href="#A-B">B</a>::f</h2>
+<h2 id="A-B-f"><a href="#A-B-f">A::B::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/templates/ct_mc_expl_outside.adoc b/test-files/golden-tests/templates/ct_mc_expl_outside.adoc
index 5a99f2947..545cef067 100644
--- a/test-files/golden-tests/templates/ct_mc_expl_outside.adoc
+++ b/test-files/golden-tests/templates/ct_mc_expl_outside.adoc
@@ -68,7 +68,7 @@ f();
 ----
 
 [#A-00]
-== A&lt;int&gt;
+== <<A-0e,A>>&lt;int&gt;
 
 === Synopsis
 
@@ -89,7 +89,7 @@ struct <<A-0e,A>>&lt;int&gt;;
 |===
 
 [#A-00-B]
-== <<A-00,A>>&lt;int&gt;::B
+== <<A-00,A&lt;int&gt;>>::B
 
 === Synopsis
 
@@ -109,7 +109,7 @@ struct B;
 |===
 
 [#A-00-B-g]
-== <<A-00,A>>&lt;int&gt;::<<A-00-B,B>>::g
+== <<A-00,A&lt;int&gt;>>::<<A-00-B,B>>::g
 
 === Synopsis
 
diff --git a/test-files/golden-tests/templates/ct_mc_expl_outside.html b/test-files/golden-tests/templates/ct_mc_expl_outside.html
index e38dab6c6..a3b59a084 100644
--- a/test-files/golden-tests/templates/ct_mc_expl_outside.html
+++ b/test-files/golden-tests/templates/ct_mc_expl_outside.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -26,7 +26,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-0e">A</h2>
+<h2 id="A-0e"><a href="#A-0e">A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -57,7 +57,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-0e-B"><a href="#A-0e">A</a>::B</h2>
+<h2 id="A-0e-B"><a href="#A-0e-B">A::B</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -87,7 +87,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-0e-B-f"><a href="#A-0e">A</a>::<a href="#A-0e-B">B</a>::f</h2>
+<h2 id="A-0e-B-f"><a href="#A-0e-B-f">A::B::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -103,7 +103,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-00">A&lt;int&gt;</h2>
+<h2 id="A-00"><a href="#A-00">A&lt;int&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -134,7 +134,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-00-B"><a href="#A-00">A</a>&lt;int&gt;::B</h2>
+<h2 id="A-00-B"><a href="#A-00-B">A&lt;int&gt;::B</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -164,7 +164,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-00-B-g"><a href="#A-00">A</a>&lt;int&gt;::<a href="#A-00-B">B</a>::g</h2>
+<h2 id="A-00-B-g"><a href="#A-00-B-g">A&lt;int&gt;::B::g</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/templates/ct_mct.html b/test-files/golden-tests/templates/ct_mct.html
index 7c8ce8c02..40d4e540e 100644
--- a/test-files/golden-tests/templates/ct_mct.html
+++ b/test-files/golden-tests/templates/ct_mct.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,7 +25,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -56,7 +56,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-B"><a href="#A">A</a>::B</h2>
+<h2 id="A-B"><a href="#A-B">A::B</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -87,7 +87,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-B-f"><a href="#A">A</a>::<a href="#A-B">B</a>::f</h2>
+<h2 id="A-B-f"><a href="#A-B-f">A::B::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/templates/ct_mct_expl_inline.adoc b/test-files/golden-tests/templates/ct_mct_expl_inline.adoc
index 009f06915..aeb530263 100644
--- a/test-files/golden-tests/templates/ct_mct_expl_inline.adoc
+++ b/test-files/golden-tests/templates/ct_mct_expl_inline.adoc
@@ -69,7 +69,7 @@ f();
 ----
 
 [#A-B-06]
-== <<A,A>>::B&lt;int&gt;
+== <<A,A>>::<<A-B-07,B>>&lt;int&gt;
 
 === Synopsis
 
@@ -90,7 +90,7 @@ struct <<A-B-07,B>>&lt;int&gt;;
 |===
 
 [#A-B-06-g]
-== <<A,A>>::<<A-B-06,B>>&lt;int&gt;::g
+== <<A,A>>::<<A-B-06,B&lt;int&gt;>>::g
 
 === Synopsis
 
diff --git a/test-files/golden-tests/templates/ct_mct_expl_inline.html b/test-files/golden-tests/templates/ct_mct_expl_inline.html
index 04a5e2b7a..6fa8c06ed 100644
--- a/test-files/golden-tests/templates/ct_mct_expl_inline.html
+++ b/test-files/golden-tests/templates/ct_mct_expl_inline.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,7 +25,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -57,7 +57,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-B-07"><a href="#A">A</a>::B</h2>
+<h2 id="A-B-07"><a href="#A-B-07">A::B</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -88,7 +88,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-B-07-f"><a href="#A">A</a>::<a href="#A-B-07">B</a>::f</h2>
+<h2 id="A-B-07-f"><a href="#A-B-07-f">A::B::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -104,7 +104,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-B-06"><a href="#A">A</a>::B&lt;int&gt;</h2>
+<h2 id="A-B-06"><a href="#A-B-06">A::B&lt;int&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -135,7 +135,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-B-06-g"><a href="#A">A</a>::<a href="#A-B-06">B</a>&lt;int&gt;::g</h2>
+<h2 id="A-B-06-g"><a href="#A-B-06-g">A::B&lt;int&gt;::g</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/templates/ct_mct_expl_outside.adoc b/test-files/golden-tests/templates/ct_mct_expl_outside.adoc
index 094a571ea..28cf132d3 100644
--- a/test-files/golden-tests/templates/ct_mct_expl_outside.adoc
+++ b/test-files/golden-tests/templates/ct_mct_expl_outside.adoc
@@ -69,7 +69,7 @@ f();
 ----
 
 [#A-00]
-== A&lt;int&gt;
+== <<A-0e,A>>&lt;int&gt;
 
 === Synopsis
 
@@ -91,7 +91,7 @@ struct <<A-0e,A>>&lt;int&gt;;
 |===
 
 [#A-00-B-03]
-== <<A-00,A>>&lt;int&gt;::B
+== <<A-00,A&lt;int&gt;>>::B
 
 === Synopsis
 
@@ -104,7 +104,7 @@ struct B;
 ----
 
 [#A-00-B-02]
-== <<A-00,A>>&lt;int&gt;::B&lt;int&gt;
+== <<A-00,A&lt;int&gt;>>::<<A-0e-B,B>>&lt;int&gt;
 
 === Synopsis
 
@@ -125,7 +125,7 @@ struct <<A-0e-B,B>>&lt;int&gt;;
 |===
 
 [#A-00-B-02-g]
-== <<A-00,A>>&lt;int&gt;::<<A-00-B-02,B>>&lt;int&gt;::g
+== <<A-00,A&lt;int&gt;>>::<<A-00-B-02,B&lt;int&gt;>>::g
 
 === Synopsis
 
diff --git a/test-files/golden-tests/templates/ct_mct_expl_outside.html b/test-files/golden-tests/templates/ct_mct_expl_outside.html
index 0d93257a7..d952750a7 100644
--- a/test-files/golden-tests/templates/ct_mct_expl_outside.html
+++ b/test-files/golden-tests/templates/ct_mct_expl_outside.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -26,7 +26,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-0e">A</h2>
+<h2 id="A-0e"><a href="#A-0e">A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -57,7 +57,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-0e-B"><a href="#A-0e">A</a>::B</h2>
+<h2 id="A-0e-B"><a href="#A-0e-B">A::B</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -88,7 +88,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-0e-B-f"><a href="#A-0e">A</a>::<a href="#A-0e-B">B</a>::f</h2>
+<h2 id="A-0e-B-f"><a href="#A-0e-B-f">A::B::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -104,7 +104,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-00">A&lt;int&gt;</h2>
+<h2 id="A-00"><a href="#A-00">A&lt;int&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -136,7 +136,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-00-B-03"><a href="#A-00">A</a>&lt;int&gt;::B</h2>
+<h2 id="A-00-B-03"><a href="#A-00-B-03">A&lt;int&gt;::B</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -154,7 +154,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-00-B-02"><a href="#A-00">A</a>&lt;int&gt;::B&lt;int&gt;</h2>
+<h2 id="A-00-B-02"><a href="#A-00-B-02">A&lt;int&gt;::B&lt;int&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -185,7 +185,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-00-B-02-g"><a href="#A-00">A</a>&lt;int&gt;::<a href="#A-00-B-02">B</a>&lt;int&gt;::g</h2>
+<h2 id="A-00-B-02-g"><a href="#A-00-B-02-g">A&lt;int&gt;::B&lt;int&gt;::g</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/templates/ct_mf.html b/test-files/golden-tests/templates/ct_mf.html
index 80ef4ccae..d6aa2a5cf 100644
--- a/test-files/golden-tests/templates/ct_mf.html
+++ b/test-files/golden-tests/templates/ct_mf.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,7 +25,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -56,7 +56,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-f"><a href="#A">A</a>::f</h2>
+<h2 id="A-f"><a href="#A-f">A::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/templates/ct_mf_expl_outside.adoc b/test-files/golden-tests/templates/ct_mf_expl_outside.adoc
index f1ff3b13e..f46ea9eb0 100644
--- a/test-files/golden-tests/templates/ct_mf_expl_outside.adoc
+++ b/test-files/golden-tests/templates/ct_mf_expl_outside.adoc
@@ -48,7 +48,7 @@ f();
 ----
 
 [#A-00]
-== A&lt;int&gt;
+== <<A-0e,A>>&lt;int&gt;
 
 === Synopsis
 
@@ -69,7 +69,7 @@ struct <<A-0e,A>>&lt;int&gt;;
 |===
 
 [#A-00-f]
-== <<A-00,A>>&lt;int&gt;::f
+== <<A-00,A&lt;int&gt;>>::f
 
 === Synopsis
 
diff --git a/test-files/golden-tests/templates/ct_mf_expl_outside.html b/test-files/golden-tests/templates/ct_mf_expl_outside.html
index 746f8f287..f7c7c3832 100644
--- a/test-files/golden-tests/templates/ct_mf_expl_outside.html
+++ b/test-files/golden-tests/templates/ct_mf_expl_outside.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -26,7 +26,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-0e">A</h2>
+<h2 id="A-0e"><a href="#A-0e">A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -57,7 +57,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-0e-f"><a href="#A-0e">A</a>::f</h2>
+<h2 id="A-0e-f"><a href="#A-0e-f">A::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -73,7 +73,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-00">A&lt;int&gt;</h2>
+<h2 id="A-00"><a href="#A-00">A&lt;int&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -104,7 +104,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-00-f"><a href="#A-00">A</a>&lt;int&gt;::f</h2>
+<h2 id="A-00-f"><a href="#A-00-f">A&lt;int&gt;::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/templates/ct_mft.html b/test-files/golden-tests/templates/ct_mft.html
index ca0b760d0..1ea097815 100644
--- a/test-files/golden-tests/templates/ct_mft.html
+++ b/test-files/golden-tests/templates/ct_mft.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,7 +25,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -56,7 +56,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-f"><a href="#A">A</a>::f</h2>
+<h2 id="A-f"><a href="#A-f">A::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/templates/ct_mft_expl_inline.adoc b/test-files/golden-tests/templates/ct_mft_expl_inline.adoc
index 1bb577da2..854e9af45 100644
--- a/test-files/golden-tests/templates/ct_mft_expl_inline.adoc
+++ b/test-files/golden-tests/templates/ct_mft_expl_inline.adoc
@@ -57,7 +57,7 @@ void
 ----
 template&lt;&gt;
 void
-<<A-f-04,f>>&lt;int&gt;();
+<<A-f-04,f&lt;int&gt;>>();
 ----
 
 [.small]#<<A-f-04,_» more&period;&period;&period;_>>#
@@ -77,7 +77,7 @@ f();
 ----
 
 [#A-f-04]
-== <<A,A>>::f&lt;int&gt;
+== <<A,A>>::<<A-f-07,f>>&lt;int&gt;
 
 === Synopsis
 
diff --git a/test-files/golden-tests/templates/ct_mft_expl_inline.html b/test-files/golden-tests/templates/ct_mft_expl_inline.html
index 882cddaeb..eb73baccf 100644
--- a/test-files/golden-tests/templates/ct_mft_expl_inline.html
+++ b/test-files/golden-tests/templates/ct_mft_expl_inline.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,7 +25,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A">A</h2>
+<h2 id="A"><a href="#A">A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -57,7 +57,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-f-00"><a href="#A">A</a>::f</h2>
+<h2 id="A-f-00"><a href="#A-f-00">A::f</a></h2>
 </div>
 <div>
 <h3>Synopses</h3>
@@ -77,7 +77,7 @@ <h3>Synopses</h3>
 <code class="source-code cpp">
 template&lt;&gt;
 void
-<a href="#A-f-04">f</a>&lt;int&gt;();
+<a href="#A-f-04">f&lt;int&gt;</a>();
 </code>
 </pre><span class="small"><a href="#A-f-04"><em>» more...</em></a></span>
 
@@ -86,7 +86,7 @@ <h3>Synopses</h3>
 </div>
 <div>
 <div>
-<h2 id="A-f-07"><a href="#A">A</a>::f</h2>
+<h2 id="A-f-07"><a href="#A-f-07">A::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -103,7 +103,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-f-04"><a href="#A">A</a>::f&lt;int&gt;</h2>
+<h2 id="A-f-04"><a href="#A-f-04">A::f&lt;int&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/templates/ct_mft_expl_outside.adoc b/test-files/golden-tests/templates/ct_mft_expl_outside.adoc
index 04370be72..77f1c32de 100644
--- a/test-files/golden-tests/templates/ct_mft_expl_outside.adoc
+++ b/test-files/golden-tests/templates/ct_mft_expl_outside.adoc
@@ -49,7 +49,7 @@ f();
 ----
 
 [#A-00]
-== A&lt;int&gt;
+== <<A-0e,A>>&lt;int&gt;
 
 === Synopsis
 
@@ -72,7 +72,7 @@ struct <<A-0e,A>>&lt;int&gt;;
 |===
 
 [#A-00-f-0a]
-== <<A-00,A>>&lt;int&gt;::f
+== <<A-00,A&lt;int&gt;>>::f
 
 === Synopses
 
@@ -93,13 +93,13 @@ void
 ----
 template&lt;&gt;
 void
-<<A-00-f-07,f>>&lt;int&gt;();
+<<A-00-f-07,f&lt;int&gt;>>();
 ----
 
 [.small]#<<A-00-f-07,_» more&period;&period;&period;_>>#
 
 [#A-00-f-03]
-== <<A-00,A>>&lt;int&gt;::f
+== <<A-00,A&lt;int&gt;>>::f
 
 === Synopsis
 
@@ -113,7 +113,7 @@ f();
 ----
 
 [#A-00-f-07]
-== <<A-00,A>>&lt;int&gt;::f&lt;int&gt;
+== <<A-00,A&lt;int&gt;>>::<<A-0e-f,f>>&lt;int&gt;
 
 === Synopsis
 
diff --git a/test-files/golden-tests/templates/ct_mft_expl_outside.html b/test-files/golden-tests/templates/ct_mft_expl_outside.html
index 160f9265f..32b427722 100644
--- a/test-files/golden-tests/templates/ct_mft_expl_outside.html
+++ b/test-files/golden-tests/templates/ct_mft_expl_outside.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -26,7 +26,7 @@ <h2>Types</h2>
 </div>
 <div>
 <div>
-<h2 id="A-0e">A</h2>
+<h2 id="A-0e"><a href="#A-0e">A</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -57,7 +57,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-0e-f"><a href="#A-0e">A</a>::f</h2>
+<h2 id="A-0e-f"><a href="#A-0e-f">A::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -74,7 +74,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-00">A&lt;int&gt;</h2>
+<h2 id="A-00"><a href="#A-00">A&lt;int&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -106,7 +106,7 @@ <h2>Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-00-f-0a"><a href="#A-00">A</a>&lt;int&gt;::f</h2>
+<h2 id="A-00-f-0a"><a href="#A-00-f-0a">A&lt;int&gt;::f</a></h2>
 </div>
 <div>
 <h3>Synopses</h3>
@@ -126,7 +126,7 @@ <h3>Synopses</h3>
 <code class="source-code cpp">
 template&lt;&gt;
 void
-<a href="#A-00-f-07">f</a>&lt;int&gt;();
+<a href="#A-00-f-07">f&lt;int&gt;</a>();
 </code>
 </pre><span class="small"><a href="#A-00-f-07"><em>» more...</em></a></span>
 
@@ -135,7 +135,7 @@ <h3>Synopses</h3>
 </div>
 <div>
 <div>
-<h2 id="A-00-f-03"><a href="#A-00">A</a>&lt;int&gt;::f</h2>
+<h2 id="A-00-f-03"><a href="#A-00-f-03">A&lt;int&gt;::f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -152,7 +152,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-00-f-07"><a href="#A-00">A</a>&lt;int&gt;::f&lt;int&gt;</h2>
+<h2 id="A-00-f-07"><a href="#A-00-f-07">A&lt;int&gt;::f&lt;int&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/templates/ft_expl.adoc b/test-files/golden-tests/templates/ft_expl.adoc
index 1af1db9ad..8c041d985 100644
--- a/test-files/golden-tests/templates/ft_expl.adoc
+++ b/test-files/golden-tests/templates/ft_expl.adoc
@@ -36,7 +36,7 @@ void
 ----
 template&lt;&gt;
 void
-<<f-0ca,f>>&lt;int&gt;();
+<<f-0ca,f&lt;int&gt;>>();
 ----
 
 [.small]#<<f-0ca,_» more&period;&period;&period;_>>#
@@ -56,7 +56,7 @@ f();
 ----
 
 [#f-0ca]
-== f&lt;int&gt;
+== <<f-03,f>>&lt;int&gt;
 
 === Synopsis
 
diff --git a/test-files/golden-tests/templates/ft_expl.html b/test-files/golden-tests/templates/ft_expl.html
index f5aea1383..d80e062e9 100644
--- a/test-files/golden-tests/templates/ft_expl.html
+++ b/test-files/golden-tests/templates/ft_expl.html
@@ -7,7 +7,7 @@
 <h1>Reference</h1>
 <div>
 <div>
-<h2 id="index">Global namespace</h2>
+<h2 id="index"><a href="#index"></a></h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -26,7 +26,7 @@ <h2>Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="f-0c7">f</h2>
+<h2 id="f-0c7"><a href="#f-0c7">f</a></h2>
 </div>
 <div>
 <h3>Synopses</h3>
@@ -46,7 +46,7 @@ <h3>Synopses</h3>
 <code class="source-code cpp">
 template&lt;&gt;
 void
-<a href="#f-0ca">f</a>&lt;int&gt;();
+<a href="#f-0ca">f&lt;int&gt;</a>();
 </code>
 </pre><span class="small"><a href="#f-0ca"><em>» more...</em></a></span>
 
@@ -55,7 +55,7 @@ <h3>Synopses</h3>
 </div>
 <div>
 <div>
-<h2 id="f-03">f</h2>
+<h2 id="f-03"><a href="#f-03">f</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -72,7 +72,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="f-0ca">f&lt;int&gt;</h2>
+<h2 id="f-0ca"><a href="#f-0ca">f&lt;int&gt;</a></h2>
 </div>
 <div>
 <h3>Synopsis</h3>