diff --git a/docs/modules/ROOT/pages/generators.adoc b/docs/modules/ROOT/pages/generators.adoc
index 355c750fff..1198edc9f2 100644
--- a/docs/modules/ROOT/pages/generators.adoc
+++ b/docs/modules/ROOT/pages/generators.adoc
@@ -107,7 +107,7 @@ The multipage generator renders the layout multiple times as separate pages for
 The single-page generator renders the layout multiple times and concatenates the results in a single page.
 
 Each time the generator encounters a symbol, it renders the layout template with the symbol data as the Handlebars context.
-The layout template can include other partial templates to render the symbol data.These partials are available in the `<addons>/generator/<generator>/partials` directory.
+The layout template can include other partial templates to render the symbol data. These partials are available in the `<addons>/generator/<generator>/partials` directory.
 
 The Document Object Model (DOM) for each symbol includes all information about the symbol.One advantage of custom templates over post-processing XML files is the ability to access symbols as a graph.If symbol `A` refers to symbol `B`, some properties of symbol `B` are likely to be required in the documentation of `A`.All templates and generators can access a reference to `B` by searching the symbol tree or simply by accessing the elements `A` refers to.All references to other symbols are resolved in the templates.
 
diff --git a/include/mrdocs/Support/Handlebars.hpp b/include/mrdocs/Support/Handlebars.hpp
index 2acd37c867..04bda644a3 100644
--- a/include/mrdocs/Support/Handlebars.hpp
+++ b/include/mrdocs/Support/Handlebars.hpp
@@ -1164,6 +1164,17 @@ MRDOCS_DECL
 void
 registerLogicalHelpers(Handlebars& hbs);
 
+/** Register math helpers into a Handlebars instance
+
+    This function registers a number of common helpers that perform
+    mathemathical operations.
+
+    @param hbs The Handlebars instance to register the helpers into
+ */
+MRDOCS_DECL
+void
+registerMathHelpers(Handlebars& hbs);
+
 /** Register string helpers into a Handlebars instance
 
     This function registers a number of common helpers that operate on
diff --git a/share/mrdocs/addons/generator/adoc/partials/markup/h.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/markup/h.adoc.hbs
index 2f509771f9..6134b881e0 100644
--- a/share/mrdocs/addons/generator/adoc/partials/markup/h.adoc.hbs
+++ b/share/mrdocs/addons/generator/adoc/partials/markup/h.adoc.hbs
@@ -1 +1,3 @@
+{{#if id}}[#{{{id}}}]
+{{/if}}
 ={{select level (repeat "=" level) (select @root.config.multipage "==" "=")}} {{> @partial-block }}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/adoc/partials/symbol.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/symbol.adoc.hbs
index 1d3e475159..7678217266 100644
--- a/share/mrdocs/addons/generator/adoc/partials/symbol.adoc.hbs
+++ b/share/mrdocs/addons/generator/adoc/partials/symbol.adoc.hbs
@@ -1,8 +1,20 @@
+{{!--
+    Renders the documentation for a symbol in a format that is coherent for all symbol kinds.
+
+    This partial conditionally checks if each documentation section exists and if a symbol kind
+    does not provide a specific kind of documentation section, that section is not rendered.
+
+    Expected Context: {Root Context Object}
+
+    Example:
+        {{> symbol }}
+
+    See: https://mrdocs.com/docs/mrdocs/develop/generators.html#dom_reference
+--}}
 {{#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 }}
-[#{{{symbol.anchor}}}]
-== {{> symbol/qualified-name symbol }}
+{{#> markup/h level=1 id=symbol.anchor }}{{> symbol/qualified-name symbol }}{{/markup/h}}
 {{/unless}}
 
 {{! Brief }}
@@ -12,7 +24,7 @@
 {{/if}}
 {{! Synopsis }}
 {{#unless (contains (arr "namespace") symbol.kind)}}
-=={{#unless @root.config.multipage}}={{/unless}} Synopsis
+{{#> markup/dynamic-level-h }}Synopsis{{/markup/dynamic-level-h}}
 
 {{>location/source dcl=(primary_location symbol)}}
 
@@ -52,7 +64,7 @@
 {{else if symbol.members}}
 {{! Members }}
 {{#if (and symbol.members (ne symbol.kind "overloads"))}}
-=={{#unless @root.config.multipage}}={{/unless}} Members
+{{#> markup/dynamic-level-h }}Members{{/markup/dynamic-level-h}}
 
 [,cols=2]
 |===
@@ -71,14 +83,14 @@
 {{/if}}
 {{! Description }}
 {{#if symbol.doc.description}}
-=={{#unless @root.config.multipage}}={{/unless}} Description
+{{#> markup/dynamic-level-h }}Description{{/markup/dynamic-level-h}}
 
 {{symbol.doc.description}}
 
 {{/if}}
 {{! Using symbols }}
 {{#if symbol.shadows}}
-=={{#unless @root.config.multipage}}={{/unless}} Introduced Symbols
+{{#> markup/dynamic-level-h }}Introduced Symbols{{/markup/dynamic-level-h}}
 
 |===
 | Name
@@ -91,7 +103,7 @@
 {{! Exceptions }}
 {{#if (ne symbol.kind "overloads")}}
 {{#if symbol.doc.exceptions}}
-=={{#unless @root.config.multipage}}={{/unless}} Exceptions
+{{#> markup/dynamic-level-h }}Exceptions{{/markup/dynamic-level-h}}
 
 |===
 | Name | Thrown on
@@ -106,7 +118,7 @@
 {{else}}
 {{#with (flattenUnique symbol.members "doc.exceptions" "exception") as |allExceptions|}}
 {{#if (ne (len allExceptions) 0)}}
-=={{#unless @root.config.multipage}}={{/unless}} Exceptions
+{{#> markup/dynamic-level-h }}Exceptions{{/markup/dynamic-level-h}}
 
 |===
 | Name | Thrown on
@@ -122,7 +134,7 @@
 {{/if}}
 {{! Return value }}
 {{#if symbol.doc.returns}}
-=={{#unless @root.config.multipage}}={{/unless}} Return Value
+{{#> markup/dynamic-level-h }}Return Value{{/markup/dynamic-level-h}}
 
 {{{symbol.doc.returns}}}
 
@@ -130,7 +142,7 @@
 {{! Template Parameters }}
 {{#if (ne symbol.kind "overloads")}}
 {{#if symbol.doc.tparams}}
-=={{#unless @root.config.multipage}}={{/unless}} Template Parameters
+{{#> markup/dynamic-level-h }}Template Parameters{{/markup/dynamic-level-h}}
 
 |===
 | Name | Description
@@ -145,7 +157,7 @@
 {{else}}
 {{#with (flattenUnique symbol.members "doc.tparams" "name") as |allTParams|}}
 {{#if (ne (len allTParams) 0)}}
-=={{#unless @root.config.multipage}}={{/unless}} Parameters
+{{#> markup/dynamic-level-h }}Parameters{{/markup/dynamic-level-h}}
 
 |===
 | Name | Description
@@ -162,7 +174,7 @@
 {{! Parameters }}
 {{#if (ne symbol.kind "overloads")}}
 {{#if symbol.doc.params}}
-=={{#unless @root.config.multipage}}={{/unless}} Parameters
+{{#> markup/dynamic-level-h }}Parameters{{/markup/dynamic-level-h}}
 
 |===
 | Name | Description
@@ -177,7 +189,7 @@
 {{else}}
 {{#with (flattenUnique symbol.members "doc.params" "name") as |allParams|}}
 {{#if (ne (len allParams) 0)}}
-=={{#unless @root.config.multipage}}={{/unless}} Parameters
+{{#> markup/dynamic-level-h }}Parameters{{/markup/dynamic-level-h}}
 
 |===
 | Name | Description
@@ -193,7 +205,7 @@
 {{/if}}
 {{! Preconditions }}
 {{#if symbol.doc.preconditions}}
-=={{#unless @root.config.multipage}}={{/unless}} Preconditions
+{{#> markup/dynamic-level-h }}Preconditions{{/markup/dynamic-level-h}}
 
 {{#each symbol.doc.preconditions}}
 {{{.}}}
@@ -202,7 +214,7 @@
 {{/if}}
 {{! Postconditions }}
 {{#if symbol.doc.postconditions}}
-=={{#unless @root.config.multipage}}={{/unless}} Postconditions
+{{#> markup/dynamic-level-h }}Postconditions{{/markup/dynamic-level-h}}
 
 {{#each symbol.doc.postconditions}}
 {{{.}}}
@@ -211,7 +223,7 @@
 {{/if}}
 {{! See Also }}
 {{#if symbol.doc.see}}
-=={{#unless @root.config.multipage}}={{/unless}} See Also
+{{#> markup/dynamic-level-h }}See Also{{/markup/dynamic-level-h}}
 
 {{#each symbol.doc.see}}
 {{{.}}}
diff --git a/share/mrdocs/addons/generator/common/partials/markup/dynamic-level-h.hbs b/share/mrdocs/addons/generator/common/partials/markup/dynamic-level-h.hbs
new file mode 100644
index 0000000000..ce78bcd780
--- /dev/null
+++ b/share/mrdocs/addons/generator/common/partials/markup/dynamic-level-h.hbs
@@ -0,0 +1,6 @@
+{{#> markup/h
+    level=(select @root.config.multipage (or level 1) (add (or level 1) 1))
+    id=id
+}}
+{{> @partial-block }}
+{{/markup/h}}
diff --git a/share/mrdocs/addons/generator/html/partials/markup/h.html.hbs b/share/mrdocs/addons/generator/html/partials/markup/h.html.hbs
index 663e013cb4..41f84c9710 100644
--- a/share/mrdocs/addons/generator/html/partials/markup/h.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/markup/h.html.hbs
@@ -1 +1 @@
-<h{{or level 3}}{{#if class}} class="{{class}}"{{/if}}>{{> @partial-block }}</h{{or level 3}}>
\ No newline at end of file
+<h{{or level 3}}{{#if class}} class="{{{class}}}"{{/if}}{{#if id}} id="{{{id}}}"{{/if}}>{{> @partial-block }}</h{{or level 3}}>
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/html/partials/symbol.html.hbs b/share/mrdocs/addons/generator/html/partials/symbol.html.hbs
index 1495699eda..928c4d1ab5 100644
--- a/share/mrdocs/addons/generator/html/partials/symbol.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/symbol.html.hbs
@@ -1,9 +1,22 @@
+{{!--
+    Renders the documentation for a symbol in a format that is coherent for all symbol kinds.
+
+    This partial conditionally checks if each documentation section exists and if a symbol kind
+    does not provide a specific kind of documentation section, that section is not rendered.
+
+    Expected Context: {Root Context Object}
+
+    Example:
+        {{> symbol }}
+
+    See: https://mrdocs.com/docs/mrdocs/develop/generators.html#dom_reference
+--}}
 {{#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 }}
-<div id="{{{symbol.anchor}}}">
 <div>
-<h2>{{> symbol/qualified-name symbol }}</h2>
+<div>
+{{#> markup/h level=2 id=symbol.anchor }}{{> symbol/qualified-name symbol }}{{/markup/h}}
 {{/unless}}
 {{! Brief }}
 {{#if symbol.doc.brief}}
@@ -18,7 +31,7 @@
 {{! Synopsis }}
 {{#unless (contains (arr "namespace") symbol.kind)}}
 <div>
-<h3>Synopsis</h3>
+{{#> markup/dynamic-level-h level=2 }}Synopsis{{/markup/dynamic-level-h}}
 <div>
 {{>location/source dcl=(primary_location symbol)}}
 </div>
@@ -59,7 +72,7 @@
 {{! Members }}
 {{#if (and symbol.members (ne symbol.kind "overloads"))}}
 <div>
-<h3>Members</h3>
+{{#> markup/dynamic-level-h level=2 }}Members{{/markup/dynamic-level-h}}
 <table>
 <thead>
 <tr>
@@ -90,7 +103,7 @@
 {{! Description }}
 {{#if symbol.doc.description}}
 <div>
-<h3>Description</h3>
+{{#> markup/dynamic-level-h level=2 }}Description{{/markup/dynamic-level-h}}
 {{{symbol.doc.description}}}
 
 </div>
@@ -98,7 +111,7 @@
 {{! Using symbols }}
 {{#if symbol.shadows}}
 <div>
-<h3>Introduced Symbols</h3>
+{{#> markup/dynamic-level-h level=2 }}Introduced Symbols{{/markup/dynamic-level-h}}
 <table>
 <thead>
 <tr>
@@ -120,7 +133,7 @@
 {{#if (ne symbol.kind "overloads")}}
 {{#if symbol.doc.exceptions}}
 <div>
-<h3>Exceptions</h3>
+{{#> markup/dynamic-level-h level=2 }}Exceptions{{/markup/dynamic-level-h}}
 <table>
 <thead>
 <tr>
@@ -143,7 +156,7 @@
 {{#with (flattenUnique symbol.members "doc.exceptions" "exception") as |allExceptions|}}
 {{#if (ne (len allExceptions) 0)}}
 <div>
-<h3>Exceptions</h3>
+{{#> markup/dynamic-level-h level=2 }}Exceptions{{/markup/dynamic-level-h}}
 <table>
 <thead>
 <tr>
@@ -167,7 +180,7 @@
 {{! Return value }}
 {{#if symbol.doc.returns}}
 <div>
-<h3>Return Value</h3>
+{{#> markup/dynamic-level-h level=2 }}Return Value{{/markup/dynamic-level-h}}
 {{{symbol.doc.returns}}}
 </div>
 {{/if}}
@@ -175,7 +188,7 @@
 {{#if (ne symbol.kind "overloads")}}
 {{#if symbol.doc.tparams}}
 <div>
-<h3>Template Parameters</h3>
+{{#> markup/dynamic-level-h level=2 }}Template Parameters{{/markup/dynamic-level-h}}
 <table>
 <thead>
 <tr>
@@ -198,7 +211,7 @@
 {{#with (flattenUnique symbol.members "doc.tparams" "name") as |allTParams|}}
 {{#if (ne (len allTParams) 0)}}
 <div>
-<h3>Template Parameters</h3>
+{{#> markup/dynamic-level-h level=2 }}Template Parameters{{/markup/dynamic-level-h}}
 <table>
 <thead>
 <tr>
@@ -223,7 +236,7 @@
 {{#if (ne symbol.kind "overloads")}}
 {{#if symbol.doc.params}}
 <div>
-<h3>Parameters</h3>
+{{#> markup/dynamic-level-h level=2 }}Parameters{{/markup/dynamic-level-h}}
 <table>
 <thead>
 <tr>
@@ -246,7 +259,7 @@
 {{#with (flattenUnique symbol.members "doc.params" "name") as |allParams|}}
 {{#if (ne (len allParams) 0)}}
 <div>
-<h3>Parameters</h3>
+{{#> markup/dynamic-level-h level=2 }}Parameters{{/markup/dynamic-level-h}}
 <table>
 <thead>
 <tr>
@@ -270,7 +283,7 @@
 {{! Preconditions }}
 {{#if symbol.doc.preconditions}}
 <div>
-<h3>Preconditions</h3>
+{{#> markup/dynamic-level-h level=2 }}Preconditions{{/markup/dynamic-level-h}}
 {{#each symbol.doc.preconditions}}
 <p>{{.}}</p>
 {{/each}}
@@ -279,7 +292,7 @@
 {{! Postconditions }}
 {{#if symbol.doc.postconditions}}
 <div>
-<h3>Postconditions</h3>
+{{#> markup/dynamic-level-h level=2 }}Postconditions{{/markup/dynamic-level-h}}
 {{#each symbol.doc.postconditions}}
 <p>{{.}}</p>
 {{/each}}
@@ -288,7 +301,7 @@
 {{! See Also }}
 {{#if symbol.doc.see}}
 <div>
-<h3>See Also</h3>
+{{#> markup/dynamic-level-h level=2 }}See Also{{/markup/dynamic-level-h}}
 {{#each symbol.doc.see}}
 <p>{{.}}</p>
 {{/each}}
diff --git a/src/lib/Gen/hbs/Builder.cpp b/src/lib/Gen/hbs/Builder.cpp
index d3d50abdf4..37a2199547 100644
--- a/src/lib/Gen/hbs/Builder.cpp
+++ b/src/lib/Gen/hbs/Builder.cpp
@@ -233,6 +233,7 @@ Builder(
     helpers::registerStringHelpers(hbs_);
     helpers::registerAntoraHelpers(hbs_);
     helpers::registerLogicalHelpers(hbs_);
+    helpers::registerMathHelpers(hbs_);
     helpers::registerContainerHelpers(hbs_);
     hbs_.registerHelper("relativize", dom::makeInvocable(relativize_fn));
 
diff --git a/src/lib/Support/Handlebars.cpp b/src/lib/Support/Handlebars.cpp
index 97a697c92b..57df69f61d 100644
--- a/src/lib/Support/Handlebars.cpp
+++ b/src/lib/Support/Handlebars.cpp
@@ -6689,6 +6689,103 @@ registerContainerHelpers(Handlebars& hbs)
     hbs.registerHelper("flattenUnique", flattenUnique_fn);      
 }
 
+void
+registerMathHelpers(Handlebars& hbs)
+{
+    hbs.registerHelper("add", dom::makeVariadicInvocable([](
+        dom::Array const& arguments) -> Expected<dom::Value>
+    {
+        if (arguments.size() < 2)
+        {
+            return Unexpected(Error("add requires at least two arguments"));
+        }
+        if (!arguments.at(0).isInteger())
+        {
+            return Unexpected(Error("add requires integer arguments"));
+        }
+        std::int64_t res = arguments.at(0).getInteger();
+        for (std::size_t i = 1; i < arguments.size() - 1; ++i)
+        {
+            if (!arguments.at(i).isInteger())
+            {
+                return Unexpected(Error("add requires integer arguments"));
+            }
+            res += arguments.at(i).getInteger();
+        }
+        return res;
+    }));
+
+    hbs.registerHelper("sub", dom::makeVariadicInvocable([](
+        dom::Array const& arguments) -> Expected<dom::Value>
+    {
+        if (arguments.size() < 2)
+        {
+            return Unexpected(Error("sub requires at least two arguments"));
+        }
+        if (!arguments.at(0).isInteger())
+        {
+            return Unexpected(Error("sub requires integer arguments"));
+        }
+        std::int64_t res = arguments.at(0).getInteger();
+        for (std::size_t i = 1; i < arguments.size() - 1; ++i)
+        {
+            if (!arguments.at(i).isInteger())
+            {
+                return Unexpected(Error("sub requires integer arguments"));
+            }
+            res -= arguments.at(i).getInteger();
+        }
+        return res;
+    }));
+
+    hbs.registerHelper("mul", dom::makeVariadicInvocable([](
+        dom::Array const& arguments) -> Expected<dom::Value>
+    {
+        if (arguments.size() < 2)
+        {
+            return Unexpected(Error("mul requires at least two arguments"));
+        }
+        if (!arguments.at(0).isInteger())
+        {
+            return Unexpected(Error("mul requires integer arguments"));
+        }
+        std::int64_t res = arguments.at(0).getInteger();
+        for (std::size_t i = 1; i < arguments.size() - 1; ++i)
+        {
+            if (!arguments.at(i).isInteger())
+            {
+                return Unexpected(Error("mul requires integer arguments"));
+            }
+            res *= arguments.at(i).getInteger();
+        }
+        return res;
+    }));
+
+    hbs.registerHelper("div", dom::makeVariadicInvocable([](
+            dom::Array const& arguments) -> Expected<dom::Value>
+    {
+        if (arguments.size() < 2)
+        {
+            return Unexpected(Error("div requires at least two arguments"));
+        }
+        if (!arguments.at(0).isInteger())
+        {
+            return Unexpected(Error("div requires integer arguments"));
+        }
+        std::int64_t res = arguments.at(0).getInteger();
+        for (std::size_t i = 1; i < arguments.size() - 1; ++i)
+        {
+            if (!arguments.at(i).isInteger())
+            {
+                return Unexpected(Error("div requires integer arguments"));
+            }
+            res /= arguments.at(i).getInteger();
+        }
+        return res;
+    }));
+}
+
+
 } // helpers
 
 void
diff --git a/test-files/golden-tests/alias-template.html b/test-files/golden-tests/alias-template.html
index f903b388da..b63dd158cc 100644
--- a/test-files/golden-tests/alias-template.html
+++ b/test-files/golden-tests/alias-template.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -29,9 +29,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="A">
 <div>
-<h2>A</h2>
+<div>
+<h2 id="A">A</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -47,9 +47,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="B">
 <div>
-<h2>B</h2>
+<div>
+<h2 id="B">B</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -67,9 +67,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="C">
 <div>
-<h2>C</h2>
+<div>
+<h2 id="C">C</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -83,9 +83,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="D">
 <div>
-<h2>D</h2>
+<div>
+<h2 id="D">D</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -114,9 +114,9 @@ <h2>Types</h2>
 
 
 </div>
-<div id="D-E">
 <div>
-<h2><a href="#D">D</a>::E</h2>
+<div>
+<h2 id="D-E"><a href="#D">D</a>::E</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/attributes_1.html b/test-files/golden-tests/attributes_1.html
index 8d173e92d5..1c2276f171 100644
--- a/test-files/golden-tests/attributes_1.html
+++ b/test-files/golden-tests/attributes_1.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -23,9 +23,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="f">
 <div>
-<h2>f</h2>
+<div>
+<h2 id="f">f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/brief-1.html b/test-files/golden-tests/brief-1.html
index 12351bbd2e..3b85f9c108 100644
--- a/test-files/golden-tests/brief-1.html
+++ b/test-files/golden-tests/brief-1.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -29,9 +29,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="f5">
 <div>
-<h2>f5</h2>
+<div>
+<h2 id="f5">f5</h2>
 <div>
 <p><span>brief</span> <b>bold</b> <span>it</span> <span>continues to the line.</span></p>
 
@@ -51,9 +51,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="f6">
 <div>
-<h2>f6</h2>
+<div>
+<h2 id="f6">f6</h2>
 <div>
 <p><span>brief</span></p>
 
diff --git a/test-files/golden-tests/brief-2.html b/test-files/golden-tests/brief-2.html
index e3880e31a6..2a10f9b6f8 100644
--- a/test-files/golden-tests/brief-2.html
+++ b/test-files/golden-tests/brief-2.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -45,9 +45,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="f1">
 <div>
-<h2>f1</h2>
+<div>
+<h2 id="f1">f1</h2>
 <div>
 <p><span>brief</span></p>
 
@@ -67,9 +67,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="f2">
 <div>
-<h2>f2</h2>
+<div>
+<h2 id="f2">f2</h2>
 <div>
 <p><span>brief</span></p>
 
@@ -89,9 +89,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="f3">
 <div>
-<h2>f3</h2>
+<div>
+<h2 id="f3">f3</h2>
 <div>
 <p><span>brief</span></p>
 
@@ -111,9 +111,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="f4">
 <div>
-<h2>f4</h2>
+<div>
+<h2 id="f4">f4</h2>
 <div>
 <p><span>brief                    x</span></p>
 
@@ -140,9 +140,9 @@ <h3>Description</h3>
 
 </div>
 </div>
-<div id="f5">
 <div>
-<h2>f5</h2>
+<div>
+<h2 id="f5">f5</h2>
 <div>
 <p><span>br</span> <span>ief</span></p>
 
@@ -162,9 +162,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="f6">
 <div>
-<h2>f6</h2>
+<div>
+<h2 id="f6">f6</h2>
 <div>
 <p><span>br</span> <span>ief</span></p>
 
diff --git a/test-files/golden-tests/canonical_1.html b/test-files/golden-tests/canonical_1.html
index 97762f8002..52400374d0 100644
--- a/test-files/golden-tests/canonical_1.html
+++ b/test-files/golden-tests/canonical_1.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -37,9 +37,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="B">
 <div>
-<h2>B</h2>
+<div>
+<h2 id="B">B</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -54,9 +54,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="b">
 <div>
-<h2>b</h2>
+<div>
+<h2 id="b">b</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -71,9 +71,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="A">
 <div>
-<h2>A</h2>
+<div>
+<h2 id="A">A</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -88,9 +88,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="a">
 <div>
-<h2>a</h2>
+<div>
+<h2 id="a">a</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -105,9 +105,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="Ba">
 <div>
-<h2>Ba</h2>
+<div>
+<h2 id="Ba">Ba</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -122,9 +122,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="bA">
 <div>
-<h2>bA</h2>
+<div>
+<h2 id="bA">bA</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -139,9 +139,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="Bx">
 <div>
-<h2>Bx</h2>
+<div>
+<h2 id="Bx">Bx</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -156,9 +156,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="ba">
 <div>
-<h2>ba</h2>
+<div>
+<h2 id="ba">ba</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/class-template-partial-spec.html b/test-files/golden-tests/class-template-partial-spec.html
index 2300910b90..03c202cb73 100644
--- a/test-files/golden-tests/class-template-partial-spec.html
+++ b/test-files/golden-tests/class-template-partial-spec.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -23,9 +23,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="A">
 <div>
-<h2>A</h2>
+<div>
+<h2 id="A">A</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -58,9 +58,9 @@ <h2>Types</h2>
 
 
 </div>
-<div id="A-B-0a">
 <div>
-<h2><a href="#A">A</a>::B</h2>
+<div>
+<h2 id="A-B-0a"><a href="#A">A</a>::B</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -78,9 +78,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="A-B-06">
 <div>
-<h2><a href="#A">A</a>::B&lt;U*, T&gt;</h2>
+<div>
+<h2 id="A-B-06"><a href="#A">A</a>::B&lt;U*, T&gt;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -96,9 +96,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="A-B-04">
 <div>
-<h2><a href="#A">A</a>::B&lt;T, long&gt;</h2>
+<div>
+<h2 id="A-B-04"><a href="#A">A</a>::B&lt;T, long&gt;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/class-template-spec.html b/test-files/golden-tests/class-template-spec.html
index d51e1acdcc..a1e6edd659 100644
--- a/test-files/golden-tests/class-template-spec.html
+++ b/test-files/golden-tests/class-template-spec.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -39,9 +39,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="A-0e">
 <div>
-<h2>A</h2>
+<div>
+<h2 id="A-0e">A</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -70,9 +70,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="A-0e-f">
 <div>
-<h2><a href="#A-0e">A</a>::f</h2>
+<div>
+<h2 id="A-0e-f"><a href="#A-0e">A</a>::f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -86,9 +86,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A-00">
 <div>
-<h2>A&lt;int&gt;</h2>
+<div>
+<h2 id="A-00">A&lt;int&gt;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -117,9 +117,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="A-00-g">
 <div>
-<h2><a href="#A-00">A</a>&lt;int&gt;::g</h2>
+<div>
+<h2 id="A-00-g"><a href="#A-00">A</a>&lt;int&gt;::g</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -133,9 +133,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A-0c">
 <div>
-<h2>A&lt;long&gt;</h2>
+<div>
+<h2 id="A-0c">A&lt;long&gt;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -164,9 +164,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="A-0c-h">
 <div>
-<h2><a href="#A-0c">A</a>&lt;long&gt;::h</h2>
+<div>
+<h2 id="A-0c-h"><a href="#A-0c">A</a>&lt;long&gt;::h</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -180,9 +180,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="B-00">
 <div>
-<h2>B</h2>
+<div>
+<h2 id="B-00">B</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -211,9 +211,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="B-00-f">
 <div>
-<h2><a href="#B-00">B</a>::f</h2>
+<div>
+<h2 id="B-00-f"><a href="#B-00">B</a>::f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -227,9 +227,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="B-07">
 <div>
-<h2>B&lt;T*&gt;</h2>
+<div>
+<h2 id="B-07">B&lt;T*&gt;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -258,9 +258,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="B-07-g">
 <div>
-<h2><a href="#B-07">B</a>&lt;T*&gt;::g</h2>
+<div>
+<h2 id="B-07-g"><a href="#B-07">B</a>&lt;T*&gt;::g</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -274,9 +274,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="B-06">
 <div>
-<h2>B&lt;T&&gt;</h2>
+<div>
+<h2 id="B-06">B&lt;T&&gt;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -305,9 +305,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="B-06-h">
 <div>
-<h2><a href="#B-06">B</a>&lt;T&&gt;::h</h2>
+<div>
+<h2 id="B-06-h"><a href="#B-06">B</a>&lt;T&&gt;::h</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -321,9 +321,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="C-0f">
 <div>
-<h2>C</h2>
+<div>
+<h2 id="C-0f">C</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -354,9 +354,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="C-0f-f">
 <div>
-<h2><a href="#C-0f">C</a>::f</h2>
+<div>
+<h2 id="C-0f-f"><a href="#C-0f">C</a>::f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -370,9 +370,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="C-0a">
 <div>
-<h2>C&lt;int, int&gt;</h2>
+<div>
+<h2 id="C-0a">C&lt;int, int&gt;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -401,9 +401,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="C-0a-g">
 <div>
-<h2><a href="#C-0a">C</a>&lt;int, int&gt;::g</h2>
+<div>
+<h2 id="C-0a-g"><a href="#C-0a">C</a>&lt;int, int&gt;::g</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -417,9 +417,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="C-0e">
 <div>
-<h2>C&lt;T*, int&gt;</h2>
+<div>
+<h2 id="C-0e">C&lt;T*, int&gt;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -448,9 +448,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="C-0e-h">
 <div>
-<h2><a href="#C-0e">C</a>&lt;T*, int&gt;::h</h2>
+<div>
+<h2 id="C-0e-h"><a href="#C-0e">C</a>&lt;T*, int&gt;::h</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/class-template-specializations-1.html b/test-files/golden-tests/class-template-specializations-1.html
index 0ac6efc1ed..925c1c7eac 100644
--- a/test-files/golden-tests/class-template-specializations-1.html
+++ b/test-files/golden-tests/class-template-specializations-1.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -127,9 +127,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="S0-0cf">
 <div>
-<h2>S0</h2>
+<div>
+<h2 id="S0-0cf">S0</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -175,9 +175,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="S0-0cf-f0">
 <div>
-<h2><a href="#S0-0cf">S0</a>::f0</h2>
+<div>
+<h2 id="S0-0cf-f0"><a href="#S0-0cf">S0</a>::f0</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -191,9 +191,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="S0-0cf-S1">
 <div>
-<h2><a href="#S0-0cf">S0</a>::S1</h2>
+<div>
+<h2 id="S0-0cf-S1"><a href="#S0-0cf">S0</a>::S1</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -234,9 +234,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="S0-0cf-S1-f1">
 <div>
-<h2><a href="#S0-0cf">S0</a>::<a href="#S0-0cf-S1">S1</a>::f1</h2>
+<div>
+<h2 id="S0-0cf-S1-f1"><a href="#S0-0cf">S0</a>::<a href="#S0-0cf-S1">S1</a>::f1</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -250,9 +250,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="S0-0cf-S1-S2">
 <div>
-<h2><a href="#S0-0cf">S0</a>::<a href="#S0-0cf-S1">S1</a>::S2</h2>
+<div>
+<h2 id="S0-0cf-S1-S2"><a href="#S0-0cf">S0</a>::<a href="#S0-0cf-S1">S1</a>::S2</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -298,9 +298,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="S0-0cf-S1-S2-f2">
 <div>
-<h2><a href="#S0-0cf">S0</a>::<a href="#S0-0cf-S1">S1</a>::<a href="#S0-0cf-S1-S2">S2</a>::f2</h2>
+<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>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -314,9 +314,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="S0-0cf-S1-S2-S3">
 <div>
-<h2><a href="#S0-0cf">S0</a>::<a href="#S0-0cf-S1">S1</a>::<a href="#S0-0cf-S1-S2">S2</a>::S3</h2>
+<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>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -344,9 +344,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="S0-0cf-S1-S2-S3-f3">
 <div>
-<h2><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>
+<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>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -360,9 +360,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="S0-0cf-S1-S2-S4">
 <div>
-<h2><a href="#S0-0cf">S0</a>::<a href="#S0-0cf-S1">S1</a>::<a href="#S0-0cf-S1-S2">S2</a>::S4</h2>
+<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>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -393,9 +393,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="S0-0cf-S1-S2-S4-f4">
 <div>
-<h2><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>
+<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>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -409,9 +409,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="S0-0cf-S5">
 <div>
-<h2><a href="#S0-0cf">S0</a>::S5</h2>
+<div>
+<h2 id="S0-0cf-S5"><a href="#S0-0cf">S0</a>::S5</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -455,9 +455,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="S0-0cf-S5-f5">
 <div>
-<h2><a href="#S0-0cf">S0</a>::<a href="#S0-0cf-S5">S5</a>::f5</h2>
+<div>
+<h2 id="S0-0cf-S5-f5"><a href="#S0-0cf">S0</a>::<a href="#S0-0cf-S5">S5</a>::f5</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -471,9 +471,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="S0-0cf-S5-S6">
 <div>
-<h2><a href="#S0-0cf">S0</a>::<a href="#S0-0cf-S5">S5</a>::S6</h2>
+<div>
+<h2 id="S0-0cf-S5-S6"><a href="#S0-0cf">S0</a>::<a href="#S0-0cf-S5">S5</a>::S6</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -514,9 +514,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="S0-0cf-S5-S6-f6">
 <div>
-<h2><a href="#S0-0cf">S0</a>::<a href="#S0-0cf-S5">S5</a>::<a href="#S0-0cf-S5-S6">S6</a>::f6</h2>
+<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>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -530,9 +530,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="S0-0cf-S5-S6-S7">
 <div>
-<h2><a href="#S0-0cf">S0</a>::<a href="#S0-0cf-S5">S5</a>::<a href="#S0-0cf-S5-S6">S6</a>::S7</h2>
+<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>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -578,9 +578,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="S0-0cf-S5-S6-S7-f7">
 <div>
-<h2><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>
+<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>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -594,9 +594,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="S0-0cf-S5-S6-S7-S8">
 <div>
-<h2><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>
+<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>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -624,9 +624,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="S0-0cf-S5-S6-S7-S8-f8">
 <div>
-<h2><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>
+<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>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -640,9 +640,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="S0-0cf-S5-S6-S7-S9">
 <div>
-<h2><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>
+<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>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -673,9 +673,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="S0-0cf-S5-S6-S7-S9-f9">
 <div>
-<h2><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>
+<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>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -689,9 +689,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="S0-0be">
 <div>
-<h2>S0&lt;0&gt;</h2>
+<div>
+<h2 id="S0-0be">S0&lt;0&gt;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -707,9 +707,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="S0-0c4">
 <div>
-<h2>S0&lt;1, T*&gt;</h2>
+<div>
+<h2 id="S0-0c4">S0&lt;1, T*&gt;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -725,9 +725,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="S0-02">
 <div>
-<h2>S0&lt;1, int*&gt;</h2>
+<div>
+<h2 id="S0-02">S0&lt;1, int*&gt;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -743,9 +743,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="R0">
 <div>
-<h2>R0</h2>
+<div>
+<h2 id="R0">R0</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -789,9 +789,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="R1">
 <div>
-<h2>R1</h2>
+<div>
+<h2 id="R1">R1</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -807,9 +807,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="R2">
 <div>
-<h2>R2</h2>
+<div>
+<h2 id="R2">R2</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -825,9 +825,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="R3">
 <div>
-<h2>R3</h2>
+<div>
+<h2 id="R3">R3</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -843,9 +843,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="R4">
 <div>
-<h2>R4</h2>
+<div>
+<h2 id="R4">R4</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -861,9 +861,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="R5">
 <div>
-<h2>R5</h2>
+<div>
+<h2 id="R5">R5</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -879,9 +879,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="R6">
 <div>
-<h2>R6</h2>
+<div>
+<h2 id="R6">R6</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -897,9 +897,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="R7">
 <div>
-<h2>R7</h2>
+<div>
+<h2 id="R7">R7</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -915,9 +915,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="R8">
 <div>
-<h2>R8</h2>
+<div>
+<h2 id="R8">R8</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -933,9 +933,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="R9">
 <div>
-<h2>R9</h2>
+<div>
+<h2 id="R9">R9</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -951,9 +951,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="R10">
 <div>
-<h2>R10</h2>
+<div>
+<h2 id="R10">R10</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -969,9 +969,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="R11">
 <div>
-<h2>R11</h2>
+<div>
+<h2 id="R11">R11</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -987,9 +987,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="R12">
 <div>
-<h2>R12</h2>
+<div>
+<h2 id="R12">R12</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1005,9 +1005,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="R13">
 <div>
-<h2>R13</h2>
+<div>
+<h2 id="R13">R13</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1023,9 +1023,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="R14">
 <div>
-<h2>R14</h2>
+<div>
+<h2 id="R14">R14</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1041,9 +1041,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="R15">
 <div>
-<h2>R15</h2>
+<div>
+<h2 id="R15">R15</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1059,9 +1059,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="R16">
 <div>
-<h2>R16</h2>
+<div>
+<h2 id="R16">R16</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1077,9 +1077,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="R17">
 <div>
-<h2>R17</h2>
+<div>
+<h2 id="R17">R17</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1095,9 +1095,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="R18">
 <div>
-<h2>R18</h2>
+<div>
+<h2 id="R18">R18</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1113,9 +1113,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="R19">
 <div>
-<h2>R19</h2>
+<div>
+<h2 id="R19">R19</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1131,9 +1131,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="R20">
 <div>
-<h2>R20</h2>
+<div>
+<h2 id="R20">R20</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1149,9 +1149,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="R21">
 <div>
-<h2>R21</h2>
+<div>
+<h2 id="R21">R21</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1167,9 +1167,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="R22">
 <div>
-<h2>R22</h2>
+<div>
+<h2 id="R22">R22</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1185,9 +1185,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="R23">
 <div>
-<h2>R23</h2>
+<div>
+<h2 id="R23">R23</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1203,9 +1203,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="R24">
 <div>
-<h2>R24</h2>
+<div>
+<h2 id="R24">R24</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1221,9 +1221,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="R25">
 <div>
-<h2>R25</h2>
+<div>
+<h2 id="R25">R25</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1239,9 +1239,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="R26">
 <div>
-<h2>R26</h2>
+<div>
+<h2 id="R26">R26</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1257,9 +1257,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="R27">
 <div>
-<h2>R27</h2>
+<div>
+<h2 id="R27">R27</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1275,9 +1275,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="R28">
 <div>
-<h2>R28</h2>
+<div>
+<h2 id="R28">R28</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1321,9 +1321,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="R29">
 <div>
-<h2>R29</h2>
+<div>
+<h2 id="R29">R29</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1367,9 +1367,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="R30">
 <div>
-<h2>R30</h2>
+<div>
+<h2 id="R30">R30</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1411,9 +1411,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="R31">
 <div>
-<h2>R31</h2>
+<div>
+<h2 id="R31">R31</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1460,9 +1460,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="R32">
 <div>
-<h2>R32</h2>
+<div>
+<h2 id="R32">R32</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1506,9 +1506,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="R33">
 <div>
-<h2>R33</h2>
+<div>
+<h2 id="R33">R33</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1552,9 +1552,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="R34">
 <div>
-<h2>R34</h2>
+<div>
+<h2 id="R34">R34</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1583,9 +1583,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="R35">
 <div>
-<h2>R35</h2>
+<div>
+<h2 id="R35">R35</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1617,9 +1617,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="R36">
 <div>
-<h2>R36</h2>
+<div>
+<h2 id="R36">R36</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1648,9 +1648,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="R37">
 <div>
-<h2>R37</h2>
+<div>
+<h2 id="R37">R37</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1679,9 +1679,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="R38">
 <div>
-<h2>R38</h2>
+<div>
+<h2 id="R38">R38</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1726,9 +1726,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="R39">
 <div>
-<h2>R39</h2>
+<div>
+<h2 id="R39">R39</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1770,9 +1770,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="R40">
 <div>
-<h2>R40</h2>
+<div>
+<h2 id="R40">R40</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1814,9 +1814,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="R41">
 <div>
-<h2>R41</h2>
+<div>
+<h2 id="R41">R41</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1858,9 +1858,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="R42">
 <div>
-<h2>R42</h2>
+<div>
+<h2 id="R42">R42</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1907,9 +1907,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="R43">
 <div>
-<h2>R43</h2>
+<div>
+<h2 id="R43">R43</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1953,9 +1953,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="R44">
 <div>
-<h2>R44</h2>
+<div>
+<h2 id="R44">R44</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1999,9 +1999,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="R45">
 <div>
-<h2>R45</h2>
+<div>
+<h2 id="R45">R45</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -2030,9 +2030,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="R46">
 <div>
-<h2>R46</h2>
+<div>
+<h2 id="R46">R46</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -2064,9 +2064,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="R47">
 <div>
-<h2>R47</h2>
+<div>
+<h2 id="R47">R47</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -2095,9 +2095,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="R48">
 <div>
-<h2>R48</h2>
+<div>
+<h2 id="R48">R48</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/class-template-specializations-2.html b/test-files/golden-tests/class-template-specializations-2.html
index 612fafc630..16fddbd747 100644
--- a/test-files/golden-tests/class-template-specializations-2.html
+++ b/test-files/golden-tests/class-template-specializations-2.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -27,9 +27,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="A-0e">
 <div>
-<h2>A</h2>
+<div>
+<h2 id="A-0e">A</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -45,9 +45,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="A-03">
 <div>
-<h2>A&lt;T*&gt;</h2>
+<div>
+<h2 id="A-03">A&lt;T*&gt;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -80,9 +80,9 @@ <h2>Types</h2>
 
 
 </div>
-<div id="A-03-B-05">
 <div>
-<h2><a href="#A-03">A</a>&lt;T*&gt;::B</h2>
+<div>
+<h2 id="A-03-B-05"><a href="#A-03">A</a>&lt;T*&gt;::B</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -98,9 +98,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="A-03-B-01">
 <div>
-<h2><a href="#A-03">A</a>&lt;T*&gt;::B&lt;U*&gt;</h2>
+<div>
+<h2 id="A-03-B-01"><a href="#A-03">A</a>&lt;T*&gt;::B&lt;U*&gt;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -129,9 +129,9 @@ <h2>Types</h2>
 
 
 </div>
-<div id="A-03-B-01-C">
 <div>
-<h2><a href="#A-03">A</a>&lt;T*&gt;::<a href="#A-03-B-01">B</a>&lt;U*&gt;::C</h2>
+<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>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -146,9 +146,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="A-03-B-0b">
 <div>
-<h2><a href="#A-03">A</a>&lt;T*&gt;::B&lt;int&gt;</h2>
+<div>
+<h2 id="A-03-B-0b"><a href="#A-03">A</a>&lt;T*&gt;::B&lt;int&gt;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -164,9 +164,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="A-06">
 <div>
-<h2>A&lt;double&gt;</h2>
+<div>
+<h2 id="A-06">A&lt;double&gt;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -197,9 +197,9 @@ <h2>Types</h2>
 
 
 </div>
-<div id="A-06-D-0b">
 <div>
-<h2><a href="#A-06">A</a>&lt;double&gt;::D</h2>
+<div>
+<h2 id="A-06-D-0b"><a href="#A-06">A</a>&lt;double&gt;::D</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -230,9 +230,9 @@ <h2>Types</h2>
 
 
 </div>
-<div id="A-06-D-0b-E-01">
 <div>
-<h2><a href="#A-06">A</a>&lt;double&gt;::<a href="#A-06-D-0b">D</a>::E</h2>
+<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>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -248,9 +248,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="A-06-D-0b-E-04">
 <div>
-<h2><a href="#A-06">A</a>&lt;double&gt;::<a href="#A-06-D-0b">D</a>::E&lt;T*&gt;</h2>
+<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>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -279,9 +279,9 @@ <h2>Types</h2>
 
 
 </div>
-<div id="A-06-D-0b-E-04-F">
 <div>
-<h2><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>
+<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>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -296,9 +296,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="A-06-D-04">
 <div>
-<h2><a href="#A-06">A</a>&lt;double&gt;::D&lt;float&gt;</h2>
+<div>
+<h2 id="A-06-D-04"><a href="#A-06">A</a>&lt;double&gt;::D&lt;float&gt;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -329,9 +329,9 @@ <h2>Types</h2>
 
 
 </div>
-<div id="A-06-D-04-G-06">
 <div>
-<h2><a href="#A-06">A</a>&lt;double&gt;::<a href="#A-06-D-04">D</a>&lt;float&gt;::G</h2>
+<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>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -347,9 +347,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="A-06-D-04-G-0c">
 <div>
-<h2><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>
+<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>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/class-template-specializations-3.html b/test-files/golden-tests/class-template-specializations-3.html
index 25b4ca4ae7..217bdf3441 100644
--- a/test-files/golden-tests/class-template-specializations-3.html
+++ b/test-files/golden-tests/class-template-specializations-3.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,9 +25,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="A-0e">
 <div>
-<h2>A</h2>
+<div>
+<h2 id="A-0e">A</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -58,9 +58,9 @@ <h2>Types</h2>
 
 
 </div>
-<div id="A-0e-B-07">
 <div>
-<h2><a href="#A-0e">A</a>::B</h2>
+<div>
+<h2 id="A-0e-B-07"><a href="#A-0e">A</a>::B</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -93,9 +93,9 @@ <h2>Types</h2>
 
 
 </div>
-<div id="A-0e-B-07-C">
 <div>
-<h2><a href="#A-0e">A</a>::<a href="#A-0e-B-07">B</a>::C</h2>
+<div>
+<h2 id="A-0e-B-07-C"><a href="#A-0e">A</a>::<a href="#A-0e-B-07">B</a>::C</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -110,9 +110,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="A-0e-B-07-D-09">
 <div>
-<h2><a href="#A-0e">A</a>::<a href="#A-0e-B-07">B</a>::D</h2>
+<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>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -128,9 +128,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="A-0e-B-07-D-0f">
 <div>
-<h2><a href="#A-0e">A</a>::<a href="#A-0e-B-07">B</a>::D&lt;bool&gt;</h2>
+<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>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -146,9 +146,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="A-0e-B-00">
 <div>
-<h2><a href="#A-0e">A</a>::B&lt;double&gt;</h2>
+<div>
+<h2 id="A-0e-B-00"><a href="#A-0e">A</a>::B&lt;double&gt;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -181,9 +181,9 @@ <h2>Types</h2>
 
 
 </div>
-<div id="A-0e-B-00-C">
 <div>
-<h2><a href="#A-0e">A</a>::<a href="#A-0e-B-00">B</a>&lt;double&gt;::C</h2>
+<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>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -198,9 +198,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="A-0e-B-00-D-09">
 <div>
-<h2><a href="#A-0e">A</a>::<a href="#A-0e-B-00">B</a>&lt;double&gt;::D</h2>
+<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>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -216,9 +216,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="A-0e-B-00-D-0d">
 <div>
-<h2><a href="#A-0e">A</a>::<a href="#A-0e-B-00">B</a>&lt;double&gt;::D&lt;bool&gt;</h2>
+<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>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -234,9 +234,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="E">
 <div>
-<h2>E</h2>
+<div>
+<h2 id="E">E</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -292,9 +292,9 @@ <h2>Data Members</h2>
 
 
 </div>
-<div id="E-m0">
 <div>
-<h2><a href="#E">E</a>::m0</h2>
+<div>
+<h2 id="E-m0"><a href="#E">E</a>::m0</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -307,9 +307,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="E-m1">
 <div>
-<h2><a href="#E">E</a>::m1</h2>
+<div>
+<h2 id="E-m1"><a href="#E">E</a>::m1</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -322,9 +322,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="E-m2">
 <div>
-<h2><a href="#E">E</a>::m2</h2>
+<div>
+<h2 id="E-m2"><a href="#E">E</a>::m2</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -337,9 +337,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="E-m3">
 <div>
-<h2><a href="#E">E</a>::m3</h2>
+<div>
+<h2 id="E-m3"><a href="#E">E</a>::m3</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -352,9 +352,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="E-m4">
 <div>
-<h2><a href="#E">E</a>::m4</h2>
+<div>
+<h2 id="E-m4"><a href="#E">E</a>::m4</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -367,9 +367,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="E-m5">
 <div>
-<h2><a href="#E">E</a>::m5</h2>
+<div>
+<h2 id="E-m5"><a href="#E">E</a>::m5</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -382,9 +382,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="E-m6">
 <div>
-<h2><a href="#E">E</a>::m6</h2>
+<div>
+<h2 id="E-m6"><a href="#E">E</a>::m6</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -397,9 +397,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="E-m7">
 <div>
-<h2><a href="#E">E</a>::m7</h2>
+<div>
+<h2 id="E-m7"><a href="#E">E</a>::m7</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -412,9 +412,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="E-m8">
 <div>
-<h2><a href="#E">E</a>::m8</h2>
+<div>
+<h2 id="E-m8"><a href="#E">E</a>::m8</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -427,9 +427,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="E-m9">
 <div>
-<h2><a href="#E">E</a>::m9</h2>
+<div>
+<h2 id="E-m9"><a href="#E">E</a>::m9</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -442,9 +442,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="E-m10">
 <div>
-<h2><a href="#E">E</a>::m10</h2>
+<div>
+<h2 id="E-m10"><a href="#E">E</a>::m10</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -457,9 +457,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="E-m11">
 <div>
-<h2><a href="#E">E</a>::m11</h2>
+<div>
+<h2 id="E-m11"><a href="#E">E</a>::m11</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -472,9 +472,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="E-m12">
 <div>
-<h2><a href="#E">E</a>::m12</h2>
+<div>
+<h2 id="E-m12"><a href="#E">E</a>::m12</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -487,9 +487,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="E-m13">
 <div>
-<h2><a href="#E">E</a>::m13</h2>
+<div>
+<h2 id="E-m13"><a href="#E">E</a>::m13</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -502,9 +502,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="E-m14">
 <div>
-<h2><a href="#E">E</a>::m14</h2>
+<div>
+<h2 id="E-m14"><a href="#E">E</a>::m14</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/class-template.html b/test-files/golden-tests/class-template.html
index 0b5c32c7b4..2ab66bff4f 100644
--- a/test-files/golden-tests/class-template.html
+++ b/test-files/golden-tests/class-template.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -31,9 +31,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="S">
 <div>
-<h2>S</h2>
+<div>
+<h2 id="S">S</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -48,9 +48,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="C0">
 <div>
-<h2>C0</h2>
+<div>
+<h2 id="C0">C0</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -96,9 +96,9 @@ <h2>Data Members</h2>
 
 
 </div>
-<div id="C0-w">
 <div>
-<h2><a href="#C0">C0</a>::w</h2>
+<div>
+<h2 id="C0-w"><a href="#C0">C0</a>::w</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -111,9 +111,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="C0-x">
 <div>
-<h2><a href="#C0">C0</a>::x</h2>
+<div>
+<h2 id="C0-x"><a href="#C0">C0</a>::x</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -126,9 +126,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="C0-y">
 <div>
-<h2><a href="#C0">C0</a>::y</h2>
+<div>
+<h2 id="C0-y"><a href="#C0">C0</a>::y</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -141,9 +141,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="C0-N0">
 <div>
-<h2><a href="#C0">C0</a>::N0</h2>
+<div>
+<h2 id="C0-N0"><a href="#C0">C0</a>::N0</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -171,9 +171,9 @@ <h2>Data Members</h2>
 
 
 </div>
-<div id="C0-N0-z">
 <div>
-<h2><a href="#C0">C0</a>::<a href="#C0-N0">N0</a>::z</h2>
+<div>
+<h2 id="C0-N0-z"><a href="#C0">C0</a>::<a href="#C0-N0">N0</a>::z</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -186,9 +186,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="C1">
 <div>
-<h2>C1</h2>
+<div>
+<h2 id="C1">C1</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -229,9 +229,9 @@ <h2>Data Members</h2>
 
 
 </div>
-<div id="C1-w">
 <div>
-<h2><a href="#C1">C1</a>::w</h2>
+<div>
+<h2 id="C1-w"><a href="#C1">C1</a>::w</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -244,9 +244,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="C1-N1">
 <div>
-<h2><a href="#C1">C1</a>::N1</h2>
+<div>
+<h2 id="C1-N1"><a href="#C1">C1</a>::N1</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -279,9 +279,9 @@ <h2>Data Members</h2>
 
 
 </div>
-<div id="C1-N1-x">
 <div>
-<h2><a href="#C1">C1</a>::<a href="#C1-N1">N1</a>::x</h2>
+<div>
+<h2 id="C1-N1-x"><a href="#C1">C1</a>::<a href="#C1-N1">N1</a>::x</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -294,9 +294,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="C1-N1-y">
 <div>
-<h2><a href="#C1">C1</a>::<a href="#C1-N1">N1</a>::y</h2>
+<div>
+<h2 id="C1-N1-y"><a href="#C1">C1</a>::<a href="#C1-N1">N1</a>::y</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -309,9 +309,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="C1-N1-z">
 <div>
-<h2><a href="#C1">C1</a>::<a href="#C1-N1">N1</a>::z</h2>
+<div>
+<h2 id="C1-N1-z"><a href="#C1">C1</a>::<a href="#C1-N1">N1</a>::z</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -324,9 +324,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="C2">
 <div>
-<h2>C2</h2>
+<div>
+<h2 id="C2">C2</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -368,9 +368,9 @@ <h2>Data Members</h2>
 
 
 </div>
-<div id="C2-v">
 <div>
-<h2><a href="#C2">C2</a>::v</h2>
+<div>
+<h2 id="C2-v"><a href="#C2">C2</a>::v</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -383,9 +383,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="C2-N2">
 <div>
-<h2><a href="#C2">C2</a>::N2</h2>
+<div>
+<h2 id="C2-N2"><a href="#C2">C2</a>::N2</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -420,9 +420,9 @@ <h2>Data Members</h2>
 
 
 </div>
-<div id="C2-N2-w">
 <div>
-<h2><a href="#C2">C2</a>::<a href="#C2-N2">N2</a>::w</h2>
+<div>
+<h2 id="C2-N2-w"><a href="#C2">C2</a>::<a href="#C2-N2">N2</a>::w</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -435,9 +435,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="C2-N2-x">
 <div>
-<h2><a href="#C2">C2</a>::<a href="#C2-N2">N2</a>::x</h2>
+<div>
+<h2 id="C2-N2-x"><a href="#C2">C2</a>::<a href="#C2-N2">N2</a>::x</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -450,9 +450,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="C2-N2-y">
 <div>
-<h2><a href="#C2">C2</a>::<a href="#C2-N2">N2</a>::y</h2>
+<div>
+<h2 id="C2-N2-y"><a href="#C2">C2</a>::<a href="#C2-N2">N2</a>::y</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -465,9 +465,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="C2-N2-z">
 <div>
-<h2><a href="#C2">C2</a>::<a href="#C2-N2">N2</a>::z</h2>
+<div>
+<h2 id="C2-N2-z"><a href="#C2">C2</a>::<a href="#C2-N2">N2</a>::z</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -480,9 +480,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="C3">
 <div>
-<h2>C3</h2>
+<div>
+<h2 id="C3">C3</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -511,9 +511,9 @@ <h2>Data Members</h2>
 
 
 </div>
-<div id="C3-v">
 <div>
-<h2><a href="#C3">C3</a>::v</h2>
+<div>
+<h2 id="C3-v"><a href="#C3">C3</a>::v</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/commands.html b/test-files/golden-tests/commands.html
index 8fe83a1238..4f1ee46c00 100644
--- a/test-files/golden-tests/commands.html
+++ b/test-files/golden-tests/commands.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,9 +25,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="f1">
 <div>
-<h2>f1</h2>
+<div>
+<h2 id="f1">f1</h2>
 <div>
 <p><span>brief</span></p>
 
diff --git a/test-files/golden-tests/concept.html b/test-files/golden-tests/concept.html
index 86e61af999..9bce903fed 100644
--- a/test-files/golden-tests/concept.html
+++ b/test-files/golden-tests/concept.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -49,9 +49,9 @@ <h2>Concepts</h2>
 </tbody>
 </table>
 </div>
-<div id="C">
 <div>
-<h2>C</h2>
+<div>
+<h2 id="C">C</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -65,9 +65,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="f">
 <div>
-<h2>f</h2>
+<div>
+<h2 id="f">f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -82,9 +82,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="x">
 <div>
-<h2>x</h2>
+<div>
+<h2 id="x">x</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/dependency-propagation.html b/test-files/golden-tests/dependency-propagation.html
index 27c75f5833..2e529985cc 100644
--- a/test-files/golden-tests/dependency-propagation.html
+++ b/test-files/golden-tests/dependency-propagation.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -36,9 +36,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="E">
 <div>
-<h2>E</h2>
+<div>
+<h2 id="E">E</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -54,9 +54,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="N">
 <div>
-<h2>N</h2>
+<div>
+<h2 id="N">N</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -76,9 +76,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="N-C">
 <div>
-<h2><a href="#N">N</a>::C</h2>
+<div>
+<h2 id="N-C"><a href="#N">N</a>::C</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -92,9 +92,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="N-B">
 <div>
-<h2><a href="#N">N</a>::B</h2>
+<div>
+<h2 id="N-B"><a href="#N">N</a>::B</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -108,9 +108,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="N-A">
 <div>
-<h2><a href="#N">N</a>::A</h2>
+<div>
+<h2 id="N-A"><a href="#N">N</a>::A</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/duplicate-jdoc.html b/test-files/golden-tests/duplicate-jdoc.html
index 93cd424b5c..83d771ffbd 100644
--- a/test-files/golden-tests/duplicate-jdoc.html
+++ b/test-files/golden-tests/duplicate-jdoc.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -45,9 +45,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="f0">
 <div>
-<h2>f0</h2>
+<div>
+<h2 id="f0">f0</h2>
 <div>
 <p><span>f0 brief</span></p>
 
@@ -67,9 +67,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="f1">
 <div>
-<h2>f1</h2>
+<div>
+<h2 id="f1">f1</h2>
 <div>
 <p><span>f1 brief</span></p>
 
@@ -89,9 +89,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="g0">
 <div>
-<h2>g0</h2>
+<div>
+<h2 id="g0">g0</h2>
 <div>
 <p><span>g0 brief</span></p>
 
@@ -132,9 +132,9 @@ <h3>Parameters</h3>
 </table>
 </div>
 </div>
-<div id="g1">
 <div>
-<h2>g1</h2>
+<div>
+<h2 id="g1">g1</h2>
 <div>
 <p><span>g1 brief</span></p>
 
@@ -175,9 +175,9 @@ <h3>Parameters</h3>
 </table>
 </div>
 </div>
-<div id="h0">
 <div>
-<h2>h0</h2>
+<div>
+<h2 id="h0">h0</h2>
 <div>
 <p><span>h0 brief</span></p>
 
@@ -219,9 +219,9 @@ <h3>Template Parameters</h3>
 </table>
 </div>
 </div>
-<div id="h1">
 <div>
-<h2>h1</h2>
+<div>
+<h2 id="h1">h1</h2>
 <div>
 <p><span>h1 brief</span></p>
 
diff --git a/test-files/golden-tests/empty.html b/test-files/golden-tests/empty.html
index f55291011c..2f92faa1ef 100644
--- a/test-files/golden-tests/empty.html
+++ b/test-files/golden-tests/empty.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 </div>
 
diff --git a/test-files/golden-tests/enum.html b/test-files/golden-tests/enum.html
index fd2225dc08..8cd452873f 100644
--- a/test-files/golden-tests/enum.html
+++ b/test-files/golden-tests/enum.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Enums</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -33,9 +33,9 @@ <h2>Enums</h2>
 </tbody>
 </table>
 </div>
-<div id="E0">
 <div>
-<h2>E0</h2>
+<div>
+<h2 id="E0">E0</h2>
 <div>
 <p><span>E0 brief.</span></p>
 
@@ -86,9 +86,9 @@ <h3>Description</h3>
 
 </div>
 </div>
-<div id="E0-e0">
 <div>
-<h2><a href="#E0">E0</a>::e0</h2>
+<div>
+<h2 id="E0-e0"><a href="#E0">E0</a>::e0</h2>
 <div>
 <p><span>e0 brief.</span></p>
 
@@ -114,9 +114,9 @@ <h3>Description</h3>
 
 </div>
 </div>
-<div id="E0-e1">
 <div>
-<h2><a href="#E0">E0</a>::e1</h2>
+<div>
+<h2 id="E0-e1"><a href="#E0">E0</a>::e1</h2>
 <div>
 <p><span>e1 brief.</span></p>
 
@@ -142,9 +142,9 @@ <h3>Description</h3>
 
 </div>
 </div>
-<div id="E1">
 <div>
-<h2>E1</h2>
+<div>
+<h2 id="E1">E1</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -178,9 +178,9 @@ <h3>Members</h3>
 </table>
 </div>
 </div>
-<div id="E1-e2">
 <div>
-<h2><a href="#E1">E1</a>::e2</h2>
+<div>
+<h2 id="E1-e2"><a href="#E1">E1</a>::e2</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -193,9 +193,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="E1-e3">
 <div>
-<h2><a href="#E1">E1</a>::e3</h2>
+<div>
+<h2 id="E1-e3"><a href="#E1">E1</a>::e3</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -208,9 +208,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="E2">
 <div>
-<h2>E2</h2>
+<div>
+<h2 id="E2">E2</h2>
 <div>
 <p><span>E2 brief.</span></p>
 
@@ -261,9 +261,9 @@ <h3>Description</h3>
 
 </div>
 </div>
-<div id="E2-e4">
 <div>
-<h2><a href="#E2">E2</a>::e4</h2>
+<div>
+<h2 id="E2-e4"><a href="#E2">E2</a>::e4</h2>
 <div>
 <p><span>e4 brief.</span></p>
 
@@ -289,9 +289,9 @@ <h3>Description</h3>
 
 </div>
 </div>
-<div id="E2-e5">
 <div>
-<h2><a href="#E2">E2</a>::e5</h2>
+<div>
+<h2 id="E2-e5"><a href="#E2">E2</a>::e5</h2>
 <div>
 <p><span>e5 brief.</span></p>
 
@@ -317,9 +317,9 @@ <h3>Description</h3>
 
 </div>
 </div>
-<div id="E3">
 <div>
-<h2>E3</h2>
+<div>
+<h2 id="E3">E3</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -353,9 +353,9 @@ <h3>Members</h3>
 </table>
 </div>
 </div>
-<div id="E3-e6">
 <div>
-<h2><a href="#E3">E3</a>::e6</h2>
+<div>
+<h2 id="E3-e6"><a href="#E3">E3</a>::e6</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -368,9 +368,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="E3-e7">
 <div>
-<h2><a href="#E3">E3</a>::e7</h2>
+<div>
+<h2 id="E3-e7"><a href="#E3">E3</a>::e7</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/explicit-conv-operator.html b/test-files/golden-tests/explicit-conv-operator.html
index 2729d342bf..447dcc51f4 100644
--- a/test-files/golden-tests/explicit-conv-operator.html
+++ b/test-files/golden-tests/explicit-conv-operator.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -29,9 +29,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="Explicit">
 <div>
-<h2>Explicit</h2>
+<div>
+<h2 id="Explicit">Explicit</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -59,9 +59,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="Explicit-2conversion">
 <div>
-<h2><a href="#Explicit">Explicit</a>::operator bool</h2>
+<div>
+<h2 id="Explicit-2conversion"><a href="#Explicit">Explicit</a>::operator bool</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -75,9 +75,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="ExplicitFalse">
 <div>
-<h2>ExplicitFalse</h2>
+<div>
+<h2 id="ExplicitFalse">ExplicitFalse</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -105,9 +105,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="ExplicitFalse-2conversion">
 <div>
-<h2><a href="#ExplicitFalse">ExplicitFalse</a>::operator bool</h2>
+<div>
+<h2 id="ExplicitFalse-2conversion"><a href="#ExplicitFalse">ExplicitFalse</a>::operator bool</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -121,9 +121,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="ExplicitTrue">
 <div>
-<h2>ExplicitTrue</h2>
+<div>
+<h2 id="ExplicitTrue">ExplicitTrue</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -151,9 +151,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="ExplicitTrue-2conversion">
 <div>
-<h2><a href="#ExplicitTrue">ExplicitTrue</a>::operator bool</h2>
+<div>
+<h2 id="ExplicitTrue-2conversion"><a href="#ExplicitTrue">ExplicitTrue</a>::operator bool</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -167,9 +167,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="ExplicitExpression">
 <div>
-<h2>ExplicitExpression</h2>
+<div>
+<h2 id="ExplicitExpression">ExplicitExpression</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -198,9 +198,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="ExplicitExpression-2conversion">
 <div>
-<h2><a href="#ExplicitExpression">ExplicitExpression</a>::operator bool</h2>
+<div>
+<h2 id="ExplicitExpression-2conversion"><a href="#ExplicitExpression">ExplicitExpression</a>::operator bool</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/explicit-ctor.html b/test-files/golden-tests/explicit-ctor.html
index 3cdee0ea29..b16c5f979c 100644
--- a/test-files/golden-tests/explicit-ctor.html
+++ b/test-files/golden-tests/explicit-ctor.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -29,9 +29,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="Explicit">
 <div>
-<h2>Explicit</h2>
+<div>
+<h2 id="Explicit">Explicit</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -60,9 +60,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="Explicit-2constructor">
 <div>
-<h2><a href="#Explicit">Explicit</a>::Explicit</h2>
+<div>
+<h2 id="Explicit-2constructor"><a href="#Explicit">Explicit</a>::Explicit</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -100,9 +100,9 @@ <h3>Synopsis</h3>
 <a href="#Explicit-2constructor-03"><em>» more...</em></a>
 </div>
 </div>
-<div id="Explicit-2constructor-02">
 <div>
-<h2><a href="#Explicit">Explicit</a>::Explicit</h2>
+<div>
+<h2 id="Explicit-2constructor-02"><a href="#Explicit">Explicit</a>::Explicit</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -116,9 +116,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="Explicit-2constructor-00">
 <div>
-<h2><a href="#Explicit">Explicit</a>::Explicit</h2>
+<div>
+<h2 id="Explicit-2constructor-00"><a href="#Explicit">Explicit</a>::Explicit</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -132,9 +132,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="Explicit-2constructor-0b">
 <div>
-<h2><a href="#Explicit">Explicit</a>::Explicit</h2>
+<div>
+<h2 id="Explicit-2constructor-0b"><a href="#Explicit">Explicit</a>::Explicit</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -148,9 +148,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="Explicit-2constructor-03">
 <div>
-<h2><a href="#Explicit">Explicit</a>::Explicit</h2>
+<div>
+<h2 id="Explicit-2constructor-03"><a href="#Explicit">Explicit</a>::Explicit</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -166,9 +166,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="ExplicitTrue">
 <div>
-<h2>ExplicitTrue</h2>
+<div>
+<h2 id="ExplicitTrue">ExplicitTrue</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -197,9 +197,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="ExplicitTrue-2constructor">
 <div>
-<h2><a href="#ExplicitTrue">ExplicitTrue</a>::ExplicitTrue</h2>
+<div>
+<h2 id="ExplicitTrue-2constructor"><a href="#ExplicitTrue">ExplicitTrue</a>::ExplicitTrue</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -237,9 +237,9 @@ <h3>Synopsis</h3>
 <a href="#ExplicitTrue-2constructor-05"><em>» more...</em></a>
 </div>
 </div>
-<div id="ExplicitTrue-2constructor-0d">
 <div>
-<h2><a href="#ExplicitTrue">ExplicitTrue</a>::ExplicitTrue</h2>
+<div>
+<h2 id="ExplicitTrue-2constructor-0d"><a href="#ExplicitTrue">ExplicitTrue</a>::ExplicitTrue</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -253,9 +253,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="ExplicitTrue-2constructor-04">
 <div>
-<h2><a href="#ExplicitTrue">ExplicitTrue</a>::ExplicitTrue</h2>
+<div>
+<h2 id="ExplicitTrue-2constructor-04"><a href="#ExplicitTrue">ExplicitTrue</a>::ExplicitTrue</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -269,9 +269,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="ExplicitTrue-2constructor-08">
 <div>
-<h2><a href="#ExplicitTrue">ExplicitTrue</a>::ExplicitTrue</h2>
+<div>
+<h2 id="ExplicitTrue-2constructor-08"><a href="#ExplicitTrue">ExplicitTrue</a>::ExplicitTrue</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -285,9 +285,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="ExplicitTrue-2constructor-05">
 <div>
-<h2><a href="#ExplicitTrue">ExplicitTrue</a>::ExplicitTrue</h2>
+<div>
+<h2 id="ExplicitTrue-2constructor-05"><a href="#ExplicitTrue">ExplicitTrue</a>::ExplicitTrue</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -303,9 +303,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="ExplicitFalse">
 <div>
-<h2>ExplicitFalse</h2>
+<div>
+<h2 id="ExplicitFalse">ExplicitFalse</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -334,9 +334,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="ExplicitFalse-2constructor">
 <div>
-<h2><a href="#ExplicitFalse">ExplicitFalse</a>::ExplicitFalse</h2>
+<div>
+<h2 id="ExplicitFalse-2constructor"><a href="#ExplicitFalse">ExplicitFalse</a>::ExplicitFalse</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -374,9 +374,9 @@ <h3>Synopsis</h3>
 <a href="#ExplicitFalse-2constructor-04"><em>» more...</em></a>
 </div>
 </div>
-<div id="ExplicitFalse-2constructor-01">
 <div>
-<h2><a href="#ExplicitFalse">ExplicitFalse</a>::ExplicitFalse</h2>
+<div>
+<h2 id="ExplicitFalse-2constructor-01"><a href="#ExplicitFalse">ExplicitFalse</a>::ExplicitFalse</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -390,9 +390,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="ExplicitFalse-2constructor-08">
 <div>
-<h2><a href="#ExplicitFalse">ExplicitFalse</a>::ExplicitFalse</h2>
+<div>
+<h2 id="ExplicitFalse-2constructor-08"><a href="#ExplicitFalse">ExplicitFalse</a>::ExplicitFalse</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -406,9 +406,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="ExplicitFalse-2constructor-0a">
 <div>
-<h2><a href="#ExplicitFalse">ExplicitFalse</a>::ExplicitFalse</h2>
+<div>
+<h2 id="ExplicitFalse-2constructor-0a"><a href="#ExplicitFalse">ExplicitFalse</a>::ExplicitFalse</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -422,9 +422,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="ExplicitFalse-2constructor-04">
 <div>
-<h2><a href="#ExplicitFalse">ExplicitFalse</a>::ExplicitFalse</h2>
+<div>
+<h2 id="ExplicitFalse-2constructor-04"><a href="#ExplicitFalse">ExplicitFalse</a>::ExplicitFalse</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -440,9 +440,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="ExplicitExpression">
 <div>
-<h2>ExplicitExpression</h2>
+<div>
+<h2 id="ExplicitExpression">ExplicitExpression</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -472,9 +472,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="ExplicitExpression-2constructor">
 <div>
-<h2><a href="#ExplicitExpression">ExplicitExpression</a>::ExplicitExpression</h2>
+<div>
+<h2 id="ExplicitExpression-2constructor"><a href="#ExplicitExpression">ExplicitExpression</a>::ExplicitExpression</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -512,9 +512,9 @@ <h3>Synopsis</h3>
 <a href="#ExplicitExpression-2constructor-02"><em>» more...</em></a>
 </div>
 </div>
-<div id="ExplicitExpression-2constructor-0b">
 <div>
-<h2><a href="#ExplicitExpression">ExplicitExpression</a>::ExplicitExpression</h2>
+<div>
+<h2 id="ExplicitExpression-2constructor-0b"><a href="#ExplicitExpression">ExplicitExpression</a>::ExplicitExpression</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -528,9 +528,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="ExplicitExpression-2constructor-04">
 <div>
-<h2><a href="#ExplicitExpression">ExplicitExpression</a>::ExplicitExpression</h2>
+<div>
+<h2 id="ExplicitExpression-2constructor-04"><a href="#ExplicitExpression">ExplicitExpression</a>::ExplicitExpression</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -544,9 +544,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="ExplicitExpression-2constructor-08">
 <div>
-<h2><a href="#ExplicitExpression">ExplicitExpression</a>::ExplicitExpression</h2>
+<div>
+<h2 id="ExplicitExpression-2constructor-08"><a href="#ExplicitExpression">ExplicitExpression</a>::ExplicitExpression</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -560,9 +560,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="ExplicitExpression-2constructor-02">
 <div>
-<h2><a href="#ExplicitExpression">ExplicitExpression</a>::ExplicitExpression</h2>
+<div>
+<h2 id="ExplicitExpression-2constructor-02"><a href="#ExplicitExpression">ExplicitExpression</a>::ExplicitExpression</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/explicit-deduct-guide.html b/test-files/golden-tests/explicit-deduct-guide.html
index d4bc60a7a4..2b166193ee 100644
--- a/test-files/golden-tests/explicit-deduct-guide.html
+++ b/test-files/golden-tests/explicit-deduct-guide.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -42,9 +42,9 @@ <h2>Deduction Guides</h2>
 </tbody>
 </table>
 </div>
-<div id="X-0e">
 <div>
-<h2>X</h2>
+<div>
+<h2 id="X-0e">X</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -60,9 +60,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="X-0d">
 <div>
-<h2><a href="#X-0e">X</a>&lt;0&gt;</h2>
+<div>
+<h2 id="X-0d"><a href="#X-0e">X</a>&lt;0&gt;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -75,9 +75,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="X-00">
 <div>
-<h2><a href="#X-0e">X</a>&lt;0&gt;</h2>
+<div>
+<h2 id="X-00"><a href="#X-0e">X</a>&lt;0&gt;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -90,9 +90,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="X-0b">
 <div>
-<h2><a href="#X-0e">X</a>&lt;0&gt;</h2>
+<div>
+<h2 id="X-0b"><a href="#X-0e">X</a>&lt;0&gt;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -105,9 +105,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="X-06">
 <div>
-<h2><a href="#X-0e">X</a>&lt;0&gt;</h2>
+<div>
+<h2 id="X-06"><a href="#X-0e">X</a>&lt;0&gt;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/explicit-object-parameter.html b/test-files/golden-tests/explicit-object-parameter.html
index 2322669afd..6fd090916e 100644
--- a/test-files/golden-tests/explicit-object-parameter.html
+++ b/test-files/golden-tests/explicit-object-parameter.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -23,9 +23,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="Optional">
 <div>
-<h2>Optional</h2>
+<div>
+<h2 id="Optional">Optional</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -52,9 +52,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="Optional-value">
 <div>
-<h2><a href="#Optional">Optional</a>::value</h2>
+<div>
+<h2 id="Optional-value"><a href="#Optional">Optional</a>::value</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -82,9 +82,9 @@ <h3>Synopsis</h3>
 <a href="#Optional-value-06"><em>» more...</em></a>
 </div>
 </div>
-<div id="Optional-value-05">
 <div>
-<h2><a href="#Optional">Optional</a>::value</h2>
+<div>
+<h2 id="Optional-value-05"><a href="#Optional">Optional</a>::value</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -100,9 +100,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="Optional-value-06">
 <div>
-<h2><a href="#Optional">Optional</a>::value</h2>
+<div>
+<h2 id="Optional-value-06"><a href="#Optional">Optional</a>::value</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/filters/blacklist_0.html b/test-files/golden-tests/filters/blacklist_0.html
index df01c480d0..e7ee0fbc42 100644
--- a/test-files/golden-tests/filters/blacklist_0.html
+++ b/test-files/golden-tests/filters/blacklist_0.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -29,9 +29,9 @@ <h2>Namespaces</h2>
 </tbody>
 </table>
 </div>
-<div id="N0">
 <div>
-<h2>N0</h2>
+<div>
+<h2 id="N0">N0</h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -47,9 +47,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="N0-f0">
 <div>
-<h2><a href="#N0">N0</a>::f0</h2>
+<div>
+<h2 id="N0-f0"><a href="#N0">N0</a>::f0</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -63,14 +63,14 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="N3">
 <div>
-<h2>N3</h2>
+<div>
+<h2 id="N3">N3</h2>
 </div>
 </div>
-<div id="N4">
 <div>
-<h2>N4</h2>
+<div>
+<h2 id="N4">N4</h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -88,9 +88,9 @@ <h2>Namespaces</h2>
 </tbody>
 </table>
 </div>
-<div id="N4-N5">
 <div>
-<h2><a href="#N4">N4</a>::N5</h2>
+<div>
+<h2 id="N4-N5"><a href="#N4">N4</a>::N5</h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -106,9 +106,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="N4-N5-f1">
 <div>
-<h2><a href="#N4">N4</a>::<a href="#N4-N5">N5</a>::f1</h2>
+<div>
+<h2 id="N4-N5-f1"><a href="#N4">N4</a>::<a href="#N4-N5">N5</a>::f1</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -122,9 +122,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="N4-N6">
 <div>
-<h2><a href="#N4">N4</a>::N6</h2>
+<div>
+<h2 id="N4-N6"><a href="#N4">N4</a>::N6</h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -140,9 +140,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="N4-N6-f1">
 <div>
-<h2><a href="#N4">N4</a>::<a href="#N4-N6">N6</a>::f1</h2>
+<div>
+<h2 id="N4-N6-f1"><a href="#N4">N4</a>::<a href="#N4-N6">N6</a>::f1</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -156,9 +156,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="N7">
 <div>
-<h2>N7</h2>
+<div>
+<h2 id="N7">N7</h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -176,14 +176,14 @@ <h2>Namespaces</h2>
 </tbody>
 </table>
 </div>
-<div id="N7-N8">
 <div>
-<h2><a href="#N7">N7</a>::N8</h2>
+<div>
+<h2 id="N7-N8"><a href="#N7">N7</a>::N8</h2>
 </div>
 </div>
-<div id="N7-N9">
 <div>
-<h2><a href="#N7">N7</a>::N9</h2>
+<div>
+<h2 id="N7-N9"><a href="#N7">N7</a>::N9</h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -199,9 +199,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="N7-N9-g0">
 <div>
-<h2><a href="#N7">N7</a>::<a href="#N7-N9">N9</a>::g0</h2>
+<div>
+<h2 id="N7-N9-g0"><a href="#N7">N7</a>::<a href="#N7-N9">N9</a>::g0</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/filters/blacklist_test.html b/test-files/golden-tests/filters/blacklist_test.html
index e6be4a1ec4..29cc83a04a 100644
--- a/test-files/golden-tests/filters/blacklist_test.html
+++ b/test-files/golden-tests/filters/blacklist_test.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,9 +25,9 @@ <h2>Namespaces</h2>
 </tbody>
 </table>
 </div>
-<div id="to_be_documented">
 <div>
-<h2>to_be_documented</h2>
+<div>
+<h2 id="to_be_documented">to_be_documented</h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -43,9 +43,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="to_be_documented-documented_function">
 <div>
-<h2><a href="#to_be_documented">to_be_documented</a>::documented_function</h2>
+<div>
+<h2 id="to_be_documented-documented_function"><a href="#to_be_documented">to_be_documented</a>::documented_function</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -59,9 +59,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="blacklisted">
 <div>
-<h2>blacklisted</h2>
+<div>
+<h2 id="blacklisted">blacklisted</h2>
 </div>
 </div>
 
diff --git a/test-files/golden-tests/filters/filters.html b/test-files/golden-tests/filters/filters.html
index 2565608280..5358e29812 100644
--- a/test-files/golden-tests/filters/filters.html
+++ b/test-files/golden-tests/filters/filters.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -31,9 +31,9 @@ <h2>Namespaces</h2>
 </tbody>
 </table>
 </div>
-<div id="A">
 <div>
-<h2>A</h2>
+<div>
+<h2 id="A">A</h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -64,9 +64,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="A-f0">
 <div>
-<h2><a href="#A">A</a>::f0</h2>
+<div>
+<h2 id="A-f0"><a href="#A">A</a>::f0</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -80,9 +80,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A-detail">
 <div>
-<h2><a href="#A">A</a>::detail</h2>
+<div>
+<h2 id="A-detail"><a href="#A">A</a>::detail</h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -98,9 +98,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="A-detail-g0">
 <div>
-<h2><a href="#A">A</a>::<a href="#A-detail">detail</a>::g0</h2>
+<div>
+<h2 id="A-detail-g0"><a href="#A">A</a>::<a href="#A-detail">detail</a>::g0</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -114,9 +114,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A-detair">
 <div>
-<h2><a href="#A">A</a>::detair</h2>
+<div>
+<h2 id="A-detair"><a href="#A">A</a>::detair</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -145,9 +145,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="A-detair-f4">
 <div>
-<h2><a href="#A">A</a>::<a href="#A-detair">detair</a>::f4</h2>
+<div>
+<h2 id="A-detair-f4"><a href="#A">A</a>::<a href="#A-detair">detair</a>::f4</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -161,9 +161,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A-detair-Y">
 <div>
-<h2><a href="#A">A</a>::<a href="#A-detair">detair</a>::Y</h2>
+<div>
+<h2 id="A-detair-Y"><a href="#A">A</a>::<a href="#A-detair">detair</a>::Y</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -204,9 +204,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="A-detair-Y-f6">
 <div>
-<h2><a href="#A">A</a>::<a href="#A-detair">detair</a>::<a href="#A-detair-Y">Y</a>::f6</h2>
+<div>
+<h2 id="A-detair-Y-f6"><a href="#A">A</a>::<a href="#A-detair">detair</a>::<a href="#A-detair-Y">Y</a>::f6</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -220,9 +220,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A-detair-Y-Z">
 <div>
-<h2><a href="#A">A</a>::<a href="#A-detair">detair</a>::<a href="#A-detair-Y">Y</a>::Z</h2>
+<div>
+<h2 id="A-detair-Y-Z"><a href="#A">A</a>::<a href="#A-detair">detair</a>::<a href="#A-detair-Y">Y</a>::Z</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -250,9 +250,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="A-detair-Y-Z-f7">
 <div>
-<h2><a href="#A">A</a>::<a href="#A-detair">detair</a>::<a href="#A-detair-Y">Y</a>::<a href="#A-detair-Y-Z">Z</a>::f7</h2>
+<div>
+<h2 id="A-detair-Y-Z-f7"><a href="#A">A</a>::<a href="#A-detair">detair</a>::<a href="#A-detair-Y">Y</a>::<a href="#A-detair-Y-Z">Z</a>::f7</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -266,9 +266,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="B">
 <div>
-<h2>B</h2>
+<div>
+<h2 id="B">B</h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -297,9 +297,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="B-f0">
 <div>
-<h2><a href="#B">B</a>::f0</h2>
+<div>
+<h2 id="B-f0"><a href="#B">B</a>::f0</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -313,9 +313,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="B-detair">
 <div>
-<h2><a href="#B">B</a>::detair</h2>
+<div>
+<h2 id="B-detair"><a href="#B">B</a>::detair</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -344,9 +344,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="B-detair-f4">
 <div>
-<h2><a href="#B">B</a>::<a href="#B-detair">detair</a>::f4</h2>
+<div>
+<h2 id="B-detair-f4"><a href="#B">B</a>::<a href="#B-detair">detair</a>::f4</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -360,9 +360,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="B-detair-Y">
 <div>
-<h2><a href="#B">B</a>::<a href="#B-detair">detair</a>::Y</h2>
+<div>
+<h2 id="B-detair-Y"><a href="#B">B</a>::<a href="#B-detair">detair</a>::Y</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -403,9 +403,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="B-detair-Y-f6">
 <div>
-<h2><a href="#B">B</a>::<a href="#B-detair">detair</a>::<a href="#B-detair-Y">Y</a>::f6</h2>
+<div>
+<h2 id="B-detair-Y-f6"><a href="#B">B</a>::<a href="#B-detair">detair</a>::<a href="#B-detair-Y">Y</a>::f6</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -419,9 +419,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="B-detair-Y-Z">
 <div>
-<h2><a href="#B">B</a>::<a href="#B-detair">detair</a>::<a href="#B-detair-Y">Y</a>::Z</h2>
+<div>
+<h2 id="B-detair-Y-Z"><a href="#B">B</a>::<a href="#B-detair">detair</a>::<a href="#B-detair-Y">Y</a>::Z</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -449,9 +449,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="B-detair-Y-Z-f7">
 <div>
-<h2><a href="#B">B</a>::<a href="#B-detair">detair</a>::<a href="#B-detair-Y">Y</a>::<a href="#B-detair-Y-Z">Z</a>::f7</h2>
+<div>
+<h2 id="B-detair-Y-Z-f7"><a href="#B">B</a>::<a href="#B-detair">detair</a>::<a href="#B-detair-Y">Y</a>::<a href="#B-detair-Y-Z">Z</a>::f7</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -465,9 +465,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="C">
 <div>
-<h2>C</h2>
+<div>
+<h2 id="C">C</h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -483,9 +483,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="C-g0">
 <div>
-<h2><a href="#C">C</a>::g0</h2>
+<div>
+<h2 id="C-g0"><a href="#C">C</a>::g0</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -499,9 +499,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="D">
 <div>
-<h2>D</h2>
+<div>
+<h2 id="D">D</h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -532,9 +532,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="D-E">
 <div>
-<h2><a href="#D">D</a>::E</h2>
+<div>
+<h2 id="D-E"><a href="#D">D</a>::E</h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -550,9 +550,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="D-E-g0">
 <div>
-<h2><a href="#D">D</a>::<a href="#D-E">E</a>::g0</h2>
+<div>
+<h2 id="D-E-g0"><a href="#D">D</a>::<a href="#D-E">E</a>::g0</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -566,9 +566,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="D-f1">
 <div>
-<h2><a href="#D">D</a>::f1</h2>
+<div>
+<h2 id="D-f1"><a href="#D">D</a>::f1</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -582,9 +582,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="D-g1">
 <div>
-<h2><a href="#D">D</a>::g1</h2>
+<div>
+<h2 id="D-g1"><a href="#D">D</a>::g1</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -598,9 +598,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="F">
 <div>
-<h2>F</h2>
+<div>
+<h2 id="F">F</h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -629,9 +629,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="F-g0">
 <div>
-<h2><a href="#F">F</a>::g0</h2>
+<div>
+<h2 id="F-g0"><a href="#F">F</a>::g0</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -645,9 +645,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="F-G">
 <div>
-<h2><a href="#F">F</a>::G</h2>
+<div>
+<h2 id="F-G"><a href="#F">F</a>::G</h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -665,9 +665,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="F-G-f1">
 <div>
-<h2><a href="#F">F</a>::<a href="#F-G">G</a>::f1</h2>
+<div>
+<h2 id="F-G-f1"><a href="#F">F</a>::<a href="#F-G">G</a>::f1</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -681,9 +681,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="F-G-g1">
 <div>
-<h2><a href="#F">F</a>::<a href="#F-G">G</a>::g1</h2>
+<div>
+<h2 id="F-G-g1"><a href="#F">F</a>::<a href="#F-G">G</a>::g1</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/filters/whitelist_0.html b/test-files/golden-tests/filters/whitelist_0.html
index c261976bcc..5522db714b 100644
--- a/test-files/golden-tests/filters/whitelist_0.html
+++ b/test-files/golden-tests/filters/whitelist_0.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -27,9 +27,9 @@ <h2>Namespaces</h2>
 </tbody>
 </table>
 </div>
-<div id="N0">
 <div>
-<h2>N0</h2>
+<div>
+<h2 id="N0">N0</h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -45,9 +45,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="N0-f0_WL">
 <div>
-<h2><a href="#N0">N0</a>::f0_WL</h2>
+<div>
+<h2 id="N0-f0_WL"><a href="#N0">N0</a>::f0_WL</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -61,9 +61,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="N1">
 <div>
-<h2>N1</h2>
+<div>
+<h2 id="N1">N1</h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -81,9 +81,9 @@ <h2>Namespaces</h2>
 </tbody>
 </table>
 </div>
-<div id="N1-N3_WL">
 <div>
-<h2><a href="#N1">N1</a>::N3_WL</h2>
+<div>
+<h2 id="N1-N3_WL"><a href="#N1">N1</a>::N3_WL</h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -99,9 +99,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="N1-N3_WL-f1_WL">
 <div>
-<h2><a href="#N1">N1</a>::<a href="#N1-N3_WL">N3_WL</a>::f1_WL</h2>
+<div>
+<h2 id="N1-N3_WL-f1_WL"><a href="#N1">N1</a>::<a href="#N1-N3_WL">N3_WL</a>::f1_WL</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -115,9 +115,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="N1-N4">
 <div>
-<h2><a href="#N1">N1</a>::N4</h2>
+<div>
+<h2 id="N1-N4"><a href="#N1">N1</a>::N4</h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -133,9 +133,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="N1-N4-f1_WL">
 <div>
-<h2><a href="#N1">N1</a>::<a href="#N1-N4">N4</a>::f1_WL</h2>
+<div>
+<h2 id="N1-N4-f1_WL"><a href="#N1">N1</a>::<a href="#N1-N4">N4</a>::f1_WL</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -149,9 +149,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="N5">
 <div>
-<h2>N5</h2>
+<div>
+<h2 id="N5">N5</h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -180,9 +180,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="N5-f0">
 <div>
-<h2><a href="#N5">N5</a>::f0</h2>
+<div>
+<h2 id="N5-f0"><a href="#N5">N5</a>::f0</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -196,9 +196,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="N5-N6_BL">
 <div>
-<h2><a href="#N5">N5</a>::N6_BL</h2>
+<div>
+<h2 id="N5-N6_BL"><a href="#N5">N5</a>::N6_BL</h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -216,9 +216,9 @@ <h2>Namespaces</h2>
 </tbody>
 </table>
 </div>
-<div id="N5-N6_BL-N7">
 <div>
-<h2><a href="#N5">N5</a>::<a href="#N5-N6_BL">N6_BL</a>::N7</h2>
+<div>
+<h2 id="N5-N6_BL-N7"><a href="#N5">N5</a>::<a href="#N5-N6_BL">N6_BL</a>::N7</h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -234,9 +234,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="N5-N6_BL-N7-f2_WL">
 <div>
-<h2><a href="#N5">N5</a>::<a href="#N5-N6_BL">N6_BL</a>::<a href="#N5-N6_BL-N7">N7</a>::f2_WL</h2>
+<div>
+<h2 id="N5-N6_BL-N7-f2_WL"><a href="#N5">N5</a>::<a href="#N5-N6_BL">N6_BL</a>::<a href="#N5-N6_BL-N7">N7</a>::f2_WL</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -250,9 +250,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="N5-N6_BL-M7">
 <div>
-<h2><a href="#N5">N5</a>::<a href="#N5-N6_BL">N6_BL</a>::M7</h2>
+<div>
+<h2 id="N5-N6_BL-M7"><a href="#N5">N5</a>::<a href="#N5-N6_BL">N6_BL</a>::M7</h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -268,9 +268,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="N5-N6_BL-M7-f2_WL">
 <div>
-<h2><a href="#N5">N5</a>::<a href="#N5-N6_BL">N6_BL</a>::<a href="#N5-N6_BL-M7">M7</a>::f2_WL</h2>
+<div>
+<h2 id="N5-N6_BL-M7-f2_WL"><a href="#N5">N5</a>::<a href="#N5-N6_BL">N6_BL</a>::<a href="#N5-N6_BL-M7">M7</a>::f2_WL</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/filters/whitelist_test.html b/test-files/golden-tests/filters/whitelist_test.html
index 6285e69e68..bc0796fd7b 100644
--- a/test-files/golden-tests/filters/whitelist_test.html
+++ b/test-files/golden-tests/filters/whitelist_test.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,9 +25,9 @@ <h2>Namespaces</h2>
 </tbody>
 </table>
 </div>
-<div id="to_be_documented">
 <div>
-<h2>to_be_documented</h2>
+<div>
+<h2 id="to_be_documented">to_be_documented</h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -43,9 +43,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="to_be_documented-documented_function">
 <div>
-<h2><a href="#to_be_documented">to_be_documented</a>::documented_function</h2>
+<div>
+<h2 id="to_be_documented-documented_function"><a href="#to_be_documented">to_be_documented</a>::documented_function</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -59,9 +59,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="blacklisted">
 <div>
-<h2>blacklisted</h2>
+<div>
+<h2 id="blacklisted">blacklisted</h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -77,9 +77,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="blacklisted-whitelisted_function">
 <div>
-<h2><a href="#blacklisted">blacklisted</a>::whitelisted_function</h2>
+<div>
+<h2 id="blacklisted-whitelisted_function"><a href="#blacklisted">blacklisted</a>::whitelisted_function</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/friend-1.html b/test-files/golden-tests/friend-1.html
index 6043e52199..e49de486dc 100644
--- a/test-files/golden-tests/friend-1.html
+++ b/test-files/golden-tests/friend-1.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -38,9 +38,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="T">
 <div>
-<h2>T</h2>
+<div>
+<h2 id="T">T</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -70,9 +70,9 @@ <h2>Friends</h2>
 
 
 </div>
-<div id="T-08friend">
 <div>
-<h2>f</h2>
+<div>
+<h2 id="T-08friend">f</h2>
 <div>
 <p><span>f</span></p>
 
@@ -93,9 +93,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="f">
 <div>
-<h2>f</h2>
+<div>
+<h2 id="f">f</h2>
 <div>
 <p><span>f</span></p>
 
diff --git a/test-files/golden-tests/friend-2.html b/test-files/golden-tests/friend-2.html
index ee49b047cc..5a835b83ec 100644
--- a/test-files/golden-tests/friend-2.html
+++ b/test-files/golden-tests/friend-2.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -38,9 +38,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="T">
 <div>
-<h2>T</h2>
+<div>
+<h2 id="T">T</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -70,9 +70,9 @@ <h2>Friends</h2>
 
 
 </div>
-<div id="T-08friend">
 <div>
-<h2>f</h2>
+<div>
+<h2 id="T-08friend">f</h2>
 <div>
 <p><span>f</span></p>
 
@@ -93,9 +93,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="f">
 <div>
-<h2>f</h2>
+<div>
+<h2 id="f">f</h2>
 <div>
 <p><span>f</span></p>
 
diff --git a/test-files/golden-tests/friend-3.html b/test-files/golden-tests/friend-3.html
index b2f0069c8d..28c5ac214e 100644
--- a/test-files/golden-tests/friend-3.html
+++ b/test-files/golden-tests/friend-3.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -40,9 +40,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="T">
 <div>
-<h2>T</h2>
+<div>
+<h2 id="T">T</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -72,9 +72,9 @@ <h2>Friends</h2>
 
 
 </div>
-<div id="T-08friend">
 <div>
-<h2>f</h2>
+<div>
+<h2 id="T-08friend">f</h2>
 <div>
 <p><span>T::f</span></p>
 
@@ -95,9 +95,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="f">
 <div>
-<h2>f</h2>
+<div>
+<h2 id="f">f</h2>
 <div>
 <p><span>T::f</span></p>
 
@@ -117,9 +117,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="U">
 <div>
-<h2>U</h2>
+<div>
+<h2 id="U">U</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -147,9 +147,9 @@ <h2>Friends</h2>
 
 
 </div>
-<div id="U-08friend">
 <div>
-<h2>f</h2>
+<div>
+<h2 id="U-08friend">f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/friend-4.html b/test-files/golden-tests/friend-4.html
index ed0a8414c2..00262f2546 100644
--- a/test-files/golden-tests/friend-4.html
+++ b/test-files/golden-tests/friend-4.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -40,9 +40,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="T">
 <div>
-<h2>T</h2>
+<div>
+<h2 id="T">T</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -70,9 +70,9 @@ <h2>Friends</h2>
 
 
 </div>
-<div id="T-08friend">
 <div>
-<h2>f</h2>
+<div>
+<h2 id="T-08friend">f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -87,9 +87,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="f">
 <div>
-<h2>f</h2>
+<div>
+<h2 id="f">f</h2>
 <div>
 <p><span>U::f</span></p>
 
@@ -109,9 +109,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="U">
 <div>
-<h2>U</h2>
+<div>
+<h2 id="U">U</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -141,9 +141,9 @@ <h2>Friends</h2>
 
 
 </div>
-<div id="U-08friend">
 <div>
-<h2>f</h2>
+<div>
+<h2 id="U-08friend">f</h2>
 <div>
 <p><span>U::f</span></p>
 
diff --git a/test-files/golden-tests/friend-5.html b/test-files/golden-tests/friend-5.html
index e7bc41b6de..221b33b438 100644
--- a/test-files/golden-tests/friend-5.html
+++ b/test-files/golden-tests/friend-5.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -40,9 +40,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="T">
 <div>
-<h2>T</h2>
+<div>
+<h2 id="T">T</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -70,9 +70,9 @@ <h2>Friends</h2>
 
 
 </div>
-<div id="T-08friend">
 <div>
-<h2>f</h2>
+<div>
+<h2 id="T-08friend">f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -87,9 +87,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="f">
 <div>
-<h2>f</h2>
+<div>
+<h2 id="f">f</h2>
 <div>
 <p><span>f</span></p>
 
@@ -109,9 +109,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="U">
 <div>
-<h2>U</h2>
+<div>
+<h2 id="U">U</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -139,9 +139,9 @@ <h2>Friends</h2>
 
 
 </div>
-<div id="U-08friend">
 <div>
-<h2>f</h2>
+<div>
+<h2 id="U-08friend">f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/friend-6.html b/test-files/golden-tests/friend-6.html
index ffd876d377..569c854051 100644
--- a/test-files/golden-tests/friend-6.html
+++ b/test-files/golden-tests/friend-6.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -33,9 +33,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="T">
 <div>
-<h2>T</h2>
+<div>
+<h2 id="T">T</h2>
 <div>
 <p><span>Struct T brief</span></p>
 
@@ -75,9 +75,9 @@ <h2>Friends</h2>
 
 
 </div>
-<div id="T-08friend-04ce">
 <div>
-<h2>[object Object]</h2>
+<div>
+<h2 id="T-08friend-04ce">[object Object]</h2>
 <div>
 <p><span>Friend int brief</span></p>
 
@@ -96,9 +96,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="T-08friend-04cb">
 <div>
-<h2>[object Object]</h2>
+<div>
+<h2 id="T-08friend-04cb">[object Object]</h2>
 <div>
 <p><span>Friend class Z brief</span></p>
 
@@ -117,9 +117,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="U">
 <div>
-<h2>U</h2>
+<div>
+<h2 id="U">U</h2>
 <div>
 <p><span>Struct U brief</span></p>
 
@@ -155,9 +155,9 @@ <h2>Friends</h2>
 
 
 </div>
-<div id="U-08friend">
 <div>
-<h2>[object Object]</h2>
+<div>
+<h2 id="U-08friend">[object Object]</h2>
 <div>
 <p><span>Friend T brief</span></p>
 
@@ -176,9 +176,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="V">
 <div>
-<h2>V</h2>
+<div>
+<h2 id="V">V</h2>
 <div>
 <p><span>Struct V brief</span></p>
 
@@ -214,9 +214,9 @@ <h2>Friends</h2>
 
 
 </div>
-<div id="V-08friend">
 <div>
-<h2>[object Object]</h2>
+<div>
+<h2 id="V-08friend">[object Object]</h2>
 <div>
 <p><span>Friend struct U brief</span></p>
 
diff --git a/test-files/golden-tests/function-parm-decay.html b/test-files/golden-tests/function-parm-decay.html
index c695b41f05..625a104695 100644
--- a/test-files/golden-tests/function-parm-decay.html
+++ b/test-files/golden-tests/function-parm-decay.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -44,9 +44,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="f">
 <div>
-<h2>f</h2>
+<div>
+<h2 id="f">f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -60,9 +60,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="g">
 <div>
-<h2>g</h2>
+<div>
+<h2 id="g">g</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -76,9 +76,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="h">
 <div>
-<h2>h</h2>
+<div>
+<h2 id="h">h</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -92,9 +92,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="T">
 <div>
-<h2>T</h2>
+<div>
+<h2 id="T">T</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -107,9 +107,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="U">
 <div>
-<h2>U</h2>
+<div>
+<h2 id="U">U</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -122,9 +122,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="i">
 <div>
-<h2>i</h2>
+<div>
+<h2 id="i">i</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/function-template.html b/test-files/golden-tests/function-template.html
index 270d982307..ba6da45344 100644
--- a/test-files/golden-tests/function-template.html
+++ b/test-files/golden-tests/function-template.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -45,9 +45,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="f0">
 <div>
-<h2>f0</h2>
+<div>
+<h2 id="f0">f0</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -62,9 +62,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="f1">
 <div>
-<h2>f1</h2>
+<div>
+<h2 id="f1">f1</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -79,9 +79,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="f2">
 <div>
-<h2>f2</h2>
+<div>
+<h2 id="f2">f2</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -96,9 +96,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="f3">
 <div>
-<h2>f3</h2>
+<div>
+<h2 id="f3">f3</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -115,9 +115,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="g0">
 <div>
-<h2>g0</h2>
+<div>
+<h2 id="g0">g0</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -132,9 +132,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="g1">
 <div>
-<h2>g1</h2>
+<div>
+<h2 id="g1">g1</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -149,9 +149,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="g2">
 <div>
-<h2>g2</h2>
+<div>
+<h2 id="g2">g2</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -168,9 +168,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="h0">
 <div>
-<h2>h0</h2>
+<div>
+<h2 id="h0">h0</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -185,9 +185,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="h1">
 <div>
-<h2>h1</h2>
+<div>
+<h2 id="h1">h1</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -206,9 +206,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="i">
 <div>
-<h2>i</h2>
+<div>
+<h2 id="i">i</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -225,9 +225,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="j0">
 <div>
-<h2>j0</h2>
+<div>
+<h2 id="j0">j0</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -242,9 +242,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="j1">
 <div>
-<h2>j1</h2>
+<div>
+<h2 id="j1">j1</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/function-tparm-decay.html b/test-files/golden-tests/function-tparm-decay.html
index e59fbe1f68..c9942d411c 100644
--- a/test-files/golden-tests/function-tparm-decay.html
+++ b/test-files/golden-tests/function-tparm-decay.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -44,9 +44,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="f">
 <div>
-<h2>f</h2>
+<div>
+<h2 id="f">f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -61,9 +61,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="g">
 <div>
-<h2>g</h2>
+<div>
+<h2 id="g">g</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -78,9 +78,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="h">
 <div>
-<h2>h</h2>
+<div>
+<h2 id="h">h</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -95,9 +95,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="T">
 <div>
-<h2>T</h2>
+<div>
+<h2 id="T">T</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -110,9 +110,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="U">
 <div>
-<h2>U</h2>
+<div>
+<h2 id="U">U</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -125,9 +125,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="i">
 <div>
-<h2>i</h2>
+<div>
+<h2 id="i">i</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/implicit-instantiation-member-ref.html b/test-files/golden-tests/implicit-instantiation-member-ref.html
index 010c6317bc..e5aafeadbb 100644
--- a/test-files/golden-tests/implicit-instantiation-member-ref.html
+++ b/test-files/golden-tests/implicit-instantiation-member-ref.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -45,9 +45,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="S0">
 <div>
-<h2>S0</h2>
+<div>
+<h2 id="S0">S0</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -82,9 +82,9 @@ <h2>Types</h2>
 
 
 </div>
-<div id="S0-M0">
 <div>
-<h2><a href="#S0">S0</a>::M0</h2>
+<div>
+<h2 id="S0-M0"><a href="#S0">S0</a>::M0</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -97,9 +97,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="S0-S1">
 <div>
-<h2><a href="#S0">S0</a>::S1</h2>
+<div>
+<h2 id="S0-S1"><a href="#S0">S0</a>::S1</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -114,9 +114,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="S0-M1">
 <div>
-<h2><a href="#S0">S0</a>::M1</h2>
+<div>
+<h2 id="S0-M1"><a href="#S0">S0</a>::M1</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -130,9 +130,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="S0-S2">
 <div>
-<h2><a href="#S0">S0</a>::S2</h2>
+<div>
+<h2 id="S0-S2"><a href="#S0">S0</a>::S2</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -167,9 +167,9 @@ <h2>Types</h2>
 
 
 </div>
-<div id="S0-S2-M2">
 <div>
-<h2><a href="#S0">S0</a>::<a href="#S0-S2">S2</a>::M2</h2>
+<div>
+<h2 id="S0-S2-M2"><a href="#S0">S0</a>::<a href="#S0-S2">S2</a>::M2</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -182,9 +182,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="S0-S2-S3">
 <div>
-<h2><a href="#S0">S0</a>::<a href="#S0-S2">S2</a>::S3</h2>
+<div>
+<h2 id="S0-S2-S3"><a href="#S0">S0</a>::<a href="#S0-S2">S2</a>::S3</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -199,9 +199,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="S0-S2-M3">
 <div>
-<h2><a href="#S0">S0</a>::<a href="#S0-S2">S2</a>::M3</h2>
+<div>
+<h2 id="S0-S2-M3"><a href="#S0">S0</a>::<a href="#S0-S2">S2</a>::M3</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -215,9 +215,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="S0-S2-S4">
 <div>
-<h2><a href="#S0">S0</a>::<a href="#S0-S2">S2</a>::S4</h2>
+<div>
+<h2 id="S0-S2-S4"><a href="#S0">S0</a>::<a href="#S0-S2">S2</a>::S4</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -246,9 +246,9 @@ <h2>Types</h2>
 
 
 </div>
-<div id="S0-S2-S4-M4">
 <div>
-<h2><a href="#S0">S0</a>::<a href="#S0-S2">S2</a>::<a href="#S0-S2-S4">S4</a>::M4</h2>
+<div>
+<h2 id="S0-S2-S4-M4"><a href="#S0">S0</a>::<a href="#S0-S2">S2</a>::<a href="#S0-S2-S4">S4</a>::M4</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -261,9 +261,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A0">
 <div>
-<h2>A0</h2>
+<div>
+<h2 id="A0">A0</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -276,9 +276,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A1">
 <div>
-<h2>A1</h2>
+<div>
+<h2 id="A1">A1</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -291,9 +291,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A2">
 <div>
-<h2>A2</h2>
+<div>
+<h2 id="A2">A2</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -306,9 +306,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A3">
 <div>
-<h2>A3</h2>
+<div>
+<h2 id="A3">A3</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -321,9 +321,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A4">
 <div>
-<h2>A4</h2>
+<div>
+<h2 id="A4">A4</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -336,9 +336,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A5">
 <div>
-<h2>A5</h2>
+<div>
+<h2 id="A5">A5</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -351,9 +351,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A6">
 <div>
-<h2>A6</h2>
+<div>
+<h2 id="A6">A6</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -366,9 +366,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A7">
 <div>
-<h2>A7</h2>
+<div>
+<h2 id="A7">A7</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -381,9 +381,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A8">
 <div>
-<h2>A8</h2>
+<div>
+<h2 id="A8">A8</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -396,9 +396,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A9">
 <div>
-<h2>A9</h2>
+<div>
+<h2 id="A9">A9</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -411,9 +411,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A10">
 <div>
-<h2>A10</h2>
+<div>
+<h2 id="A10">A10</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/local-class.html b/test-files/golden-tests/local-class.html
index 45c8af707b..e20c57c2f9 100644
--- a/test-files/golden-tests/local-class.html
+++ b/test-files/golden-tests/local-class.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -36,9 +36,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="f">
 <div>
-<h2>f</h2>
+<div>
+<h2 id="f">f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -52,9 +52,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="B">
 <div>
-<h2>B</h2>
+<div>
+<h2 id="B">B</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/mem-fn.html b/test-files/golden-tests/mem-fn.html
index c71c04f0c4..3580b175ff 100644
--- a/test-files/golden-tests/mem-fn.html
+++ b/test-files/golden-tests/mem-fn.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -57,9 +57,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="T01">
 <div>
-<h2>T01</h2>
+<div>
+<h2 id="T01">T01</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -87,9 +87,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="T01-f">
 <div>
-<h2><a href="#T01">T01</a>::f</h2>
+<div>
+<h2 id="T01-f"><a href="#T01">T01</a>::f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -103,9 +103,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="T02">
 <div>
-<h2>T02</h2>
+<div>
+<h2 id="T02">T02</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -133,9 +133,9 @@ <h2>Static Member Functions</h2>
 
 
 </div>
-<div id="T02-f">
 <div>
-<h2><a href="#T02">T02</a>::f</h2>
+<div>
+<h2 id="T02-f"><a href="#T02">T02</a>::f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -150,9 +150,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="T03">
 <div>
-<h2>T03</h2>
+<div>
+<h2 id="T03">T03</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -180,9 +180,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="T03-f">
 <div>
-<h2><a href="#T03">T03</a>::f</h2>
+<div>
+<h2 id="T03-f"><a href="#T03">T03</a>::f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -196,9 +196,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="T04">
 <div>
-<h2>T04</h2>
+<div>
+<h2 id="T04">T04</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -226,9 +226,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="T04-f">
 <div>
-<h2><a href="#T04">T04</a>::f</h2>
+<div>
+<h2 id="T04-f"><a href="#T04">T04</a>::f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -242,9 +242,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="T05">
 <div>
-<h2>T05</h2>
+<div>
+<h2 id="T05">T05</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -272,9 +272,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="T05-f">
 <div>
-<h2><a href="#T05">T05</a>::f</h2>
+<div>
+<h2 id="T05-f"><a href="#T05">T05</a>::f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -288,9 +288,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="T06">
 <div>
-<h2>T06</h2>
+<div>
+<h2 id="T06">T06</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -318,9 +318,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="T06-f">
 <div>
-<h2><a href="#T06">T06</a>::f</h2>
+<div>
+<h2 id="T06-f"><a href="#T06">T06</a>::f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -335,9 +335,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="T08">
 <div>
-<h2>T08</h2>
+<div>
+<h2 id="T08">T08</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -365,9 +365,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="T08-f">
 <div>
-<h2><a href="#T08">T08</a>::f</h2>
+<div>
+<h2 id="T08-f"><a href="#T08">T08</a>::f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -381,9 +381,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="T09">
 <div>
-<h2>T09</h2>
+<div>
+<h2 id="T09">T09</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -411,9 +411,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="T09-f">
 <div>
-<h2><a href="#T09">T09</a>::f</h2>
+<div>
+<h2 id="T09-f"><a href="#T09">T09</a>::f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -427,9 +427,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="T10">
 <div>
-<h2>T10</h2>
+<div>
+<h2 id="T10">T10</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -457,9 +457,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="T10-f">
 <div>
-<h2><a href="#T10">T10</a>::f</h2>
+<div>
+<h2 id="T10-f"><a href="#T10">T10</a>::f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -473,9 +473,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="T11">
 <div>
-<h2>T11</h2>
+<div>
+<h2 id="T11">T11</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -503,9 +503,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="T11-f">
 <div>
-<h2><a href="#T11">T11</a>::f</h2>
+<div>
+<h2 id="T11-f"><a href="#T11">T11</a>::f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -519,9 +519,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="T12">
 <div>
-<h2>T12</h2>
+<div>
+<h2 id="T12">T12</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -549,9 +549,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="T12-f">
 <div>
-<h2><a href="#T12">T12</a>::f</h2>
+<div>
+<h2 id="T12-f"><a href="#T12">T12</a>::f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -565,9 +565,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="T13">
 <div>
-<h2>T13</h2>
+<div>
+<h2 id="T13">T13</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -595,9 +595,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="T13-f">
 <div>
-<h2><a href="#T13">T13</a>::f</h2>
+<div>
+<h2 id="T13-f"><a href="#T13">T13</a>::f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -612,9 +612,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="T14">
 <div>
-<h2>T14</h2>
+<div>
+<h2 id="T14">T14</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -642,9 +642,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="T14-f">
 <div>
-<h2><a href="#T14">T14</a>::f</h2>
+<div>
+<h2 id="T14-f"><a href="#T14">T14</a>::f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -659,9 +659,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="T15">
 <div>
-<h2>T15</h2>
+<div>
+<h2 id="T15">T15</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -689,9 +689,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="T15-f">
 <div>
-<h2><a href="#T15">T15</a>::f</h2>
+<div>
+<h2 id="T15-f"><a href="#T15">T15</a>::f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -705,9 +705,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="T16">
 <div>
-<h2>T16</h2>
+<div>
+<h2 id="T16">T16</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -735,9 +735,9 @@ <h2>Static Member Functions</h2>
 
 
 </div>
-<div id="T16-f">
 <div>
-<h2><a href="#T16">T16</a>::f</h2>
+<div>
+<h2 id="T16-f"><a href="#T16">T16</a>::f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -752,9 +752,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="T17">
 <div>
-<h2>T17</h2>
+<div>
+<h2 id="T17">T17</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -782,9 +782,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="T17-f">
 <div>
-<h2><a href="#T17">T17</a>::f</h2>
+<div>
+<h2 id="T17-f"><a href="#T17">T17</a>::f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -799,9 +799,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="U">
 <div>
-<h2>U</h2>
+<div>
+<h2 id="U">U</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -844,9 +844,9 @@ <h2>Static Member Functions</h2>
 
 
 </div>
-<div id="U-f1">
 <div>
-<h2><a href="#U">U</a>::f1</h2>
+<div>
+<h2 id="U-f1"><a href="#U">U</a>::f1</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -861,9 +861,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="U-f2">
 <div>
-<h2><a href="#U">U</a>::f2</h2>
+<div>
+<h2 id="U-f2"><a href="#U">U</a>::f2</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -879,9 +879,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="U-f3">
 <div>
-<h2><a href="#U">U</a>::f3</h2>
+<div>
+<h2 id="U-f3"><a href="#U">U</a>::f3</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -896,9 +896,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="V">
 <div>
-<h2>V</h2>
+<div>
+<h2 id="V">V</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -941,9 +941,9 @@ <h2>Static Member Functions</h2>
 
 
 </div>
-<div id="V-f3">
 <div>
-<h2><a href="#V">V</a>::f3</h2>
+<div>
+<h2 id="V-f3"><a href="#V">V</a>::f3</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/namespace-alias-1.html b/test-files/golden-tests/namespace-alias-1.html
index 885d307ed1..a6ac88f821 100644
--- a/test-files/golden-tests/namespace-alias-1.html
+++ b/test-files/golden-tests/namespace-alias-1.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -23,14 +23,14 @@ <h2>Namespaces</h2>
 </tbody>
 </table>
 </div>
-<div id="LongName">
 <div>
-<h2>LongName</h2>
+<div>
+<h2 id="LongName">LongName</h2>
 </div>
 </div>
-<div id="A">
 <div>
-<h2>A</h2>
+<div>
+<h2 id="A">A</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/namespace-alias-2.html b/test-files/golden-tests/namespace-alias-2.html
index e17b0a25e5..40d55e32f0 100644
--- a/test-files/golden-tests/namespace-alias-2.html
+++ b/test-files/golden-tests/namespace-alias-2.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -23,14 +23,14 @@ <h2>Namespaces</h2>
 </tbody>
 </table>
 </div>
-<div id="LongName">
 <div>
-<h2>LongName</h2>
+<div>
+<h2 id="LongName">LongName</h2>
 </div>
 </div>
-<div id="A">
 <div>
-<h2>A</h2>
+<div>
+<h2 id="A">A</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -43,9 +43,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="B">
 <div>
-<h2>B</h2>
+<div>
+<h2 id="B">B</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/namespace-alias-3.html b/test-files/golden-tests/namespace-alias-3.html
index 04ebe2f889..e2b0bf1fd7 100644
--- a/test-files/golden-tests/namespace-alias-3.html
+++ b/test-files/golden-tests/namespace-alias-3.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -23,14 +23,14 @@ <h2>Namespaces</h2>
 </tbody>
 </table>
 </div>
-<div id="LongName">
 <div>
-<h2>LongName</h2>
+<div>
+<h2 id="LongName">LongName</h2>
 </div>
 </div>
-<div id="A">
 <div>
-<h2>A</h2>
+<div>
+<h2 id="A">A</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -43,9 +43,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="B">
 <div>
-<h2>B</h2>
+<div>
+<h2 id="B">B</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/namespace.html b/test-files/golden-tests/namespace.html
index 54f6669431..9dadbaacb7 100644
--- a/test-files/golden-tests/namespace.html
+++ b/test-files/golden-tests/namespace.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -29,9 +29,9 @@ <h2>Namespaces</h2>
 </tbody>
 </table>
 </div>
-<div id="A">
 <div>
-<h2>A</h2>
+<div>
+<h2 id="A">A</h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -64,9 +64,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="A-f0">
 <div>
-<h2><a href="#A">A</a>::f0</h2>
+<div>
+<h2 id="A-f0"><a href="#A">A</a>::f0</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -80,9 +80,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A-B">
 <div>
-<h2><a href="#A">A</a>::B</h2>
+<div>
+<h2 id="A-B"><a href="#A">A</a>::B</h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -98,9 +98,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="A-B-f1">
 <div>
-<h2><a href="#A">A</a>::<a href="#A-B">B</a>::f1</h2>
+<div>
+<h2 id="A-B-f1"><a href="#A">A</a>::<a href="#A-B">B</a>::f1</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -114,9 +114,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A-C">
 <div>
-<h2><a href="#A">A</a>::C</h2>
+<div>
+<h2 id="A-C"><a href="#A">A</a>::C</h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -132,9 +132,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="A-C-f2">
 <div>
-<h2><a href="#A">A</a>::<a href="#A-C">C</a>::f2</h2>
+<div>
+<h2 id="A-C-f2"><a href="#A">A</a>::<a href="#A-C">C</a>::f2</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -148,9 +148,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A-00namespace">
 <div>
-<h2>Unnamed namespace</h2>
+<div>
+<h2 id="A-00namespace">Unnamed namespace</h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -166,9 +166,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="A-00namespace-f3">
 <div>
-<h2><a href="#A">A</a>::f3</h2>
+<div>
+<h2 id="A-00namespace-f3"><a href="#A">A</a>::f3</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -182,9 +182,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="D">
 <div>
-<h2>D</h2>
+<div>
+<h2 id="D">D</h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -217,9 +217,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="D-f5">
 <div>
-<h2><a href="#D">D</a>::f5</h2>
+<div>
+<h2 id="D-f5"><a href="#D">D</a>::f5</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -233,9 +233,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="D-E">
 <div>
-<h2><a href="#D">D</a>::E</h2>
+<div>
+<h2 id="D-E"><a href="#D">D</a>::E</h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -251,9 +251,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="D-E-f6">
 <div>
-<h2><a href="#D">D</a>::<a href="#D-E">E</a>::f6</h2>
+<div>
+<h2 id="D-E-f6"><a href="#D">D</a>::<a href="#D-E">E</a>::f6</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -267,9 +267,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="D-F">
 <div>
-<h2><a href="#D">D</a>::F</h2>
+<div>
+<h2 id="D-F"><a href="#D">D</a>::F</h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -285,9 +285,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="D-F-f7">
 <div>
-<h2><a href="#D">D</a>::<a href="#D-F">F</a>::f7</h2>
+<div>
+<h2 id="D-F-f7"><a href="#D">D</a>::<a href="#D-F">F</a>::f7</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -301,9 +301,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="D-00namespace">
 <div>
-<h2>Unnamed namespace</h2>
+<div>
+<h2 id="D-00namespace">Unnamed namespace</h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -319,9 +319,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="D-00namespace-f8">
 <div>
-<h2><a href="#D">D</a>::f8</h2>
+<div>
+<h2 id="D-00namespace-f8"><a href="#D">D</a>::f8</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -335,9 +335,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="00namespace">
 <div>
-<h2>Unnamed namespace</h2>
+<div>
+<h2 id="00namespace">Unnamed namespace</h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -368,9 +368,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="00namespace-f10">
 <div>
-<h2>f10</h2>
+<div>
+<h2 id="00namespace-f10">f10</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -384,9 +384,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="00namespace-G">
 <div>
-<h2>G</h2>
+<div>
+<h2 id="00namespace-G">G</h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -402,9 +402,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="00namespace-G-f11">
 <div>
-<h2><a href="#00namespace-G">G</a>::f11</h2>
+<div>
+<h2 id="00namespace-G-f11"><a href="#00namespace-G">G</a>::f11</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -418,9 +418,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="00namespace-H">
 <div>
-<h2>H</h2>
+<div>
+<h2 id="00namespace-H">H</h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -436,9 +436,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="00namespace-H-f12">
 <div>
-<h2><a href="#00namespace-H">H</a>::f12</h2>
+<div>
+<h2 id="00namespace-H-f12"><a href="#00namespace-H">H</a>::f12</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -452,9 +452,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="I">
 <div>
-<h2>I</h2>
+<div>
+<h2 id="I">I</h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -470,9 +470,9 @@ <h2>Namespaces</h2>
 </tbody>
 </table>
 </div>
-<div id="I-00namespace">
 <div>
-<h2>Unnamed namespace</h2>
+<div>
+<h2 id="I-00namespace">Unnamed namespace</h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -488,9 +488,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="I-00namespace-f14">
 <div>
-<h2><a href="#I">I</a>::f14</h2>
+<div>
+<h2 id="I-00namespace-f14"><a href="#I">I</a>::f14</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/nested-private-template.html b/test-files/golden-tests/nested-private-template.html
index 59b8997c67..5fb380d1d9 100644
--- a/test-files/golden-tests/nested-private-template.html
+++ b/test-files/golden-tests/nested-private-template.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -23,9 +23,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="range">
 <div>
-<h2>range</h2>
+<div>
+<h2 id="range">range</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -56,9 +56,9 @@ <h2>Private Types</h2>
 </tbody>
 </table>
 </div>
-<div id="range-impl-0e">
 <div>
-<h2><a href="#range">range</a>::impl</h2>
+<div>
+<h2 id="range-impl-0e"><a href="#range">range</a>::impl</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -76,9 +76,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="range-impl-00">
 <div>
-<h2><a href="#range">range</a>::impl&lt;R, false&gt;</h2>
+<div>
+<h2 id="range-impl-00"><a href="#range">range</a>::impl&lt;R, false&gt;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/no_unique_address.html b/test-files/golden-tests/no_unique_address.html
index 8e5821d5da..e6d341173c 100644
--- a/test-files/golden-tests/no_unique_address.html
+++ b/test-files/golden-tests/no_unique_address.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,9 +25,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="Empty">
 <div>
-<h2>Empty</h2>
+<div>
+<h2 id="Empty">Empty</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -42,9 +42,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="T">
 <div>
-<h2>T</h2>
+<div>
+<h2 id="T">T</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -74,9 +74,9 @@ <h2>Data Members</h2>
 
 
 </div>
-<div id="T-i">
 <div>
-<h2><a href="#T">T</a>::i</h2>
+<div>
+<h2 id="T-i"><a href="#T">T</a>::i</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -89,9 +89,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="T-e">
 <div>
-<h2><a href="#T">T</a>::e</h2>
+<div>
+<h2 id="T-e"><a href="#T">T</a>::e</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/noreturn.html b/test-files/golden-tests/noreturn.html
index 6d9f91b5f9..5504010bd1 100644
--- a/test-files/golden-tests/noreturn.html
+++ b/test-files/golden-tests/noreturn.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -36,9 +36,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="f1">
 <div>
-<h2>f1</h2>
+<div>
+<h2 id="f1">f1</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -52,9 +52,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="T">
 <div>
-<h2>T</h2>
+<div>
+<h2 id="T">T</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -108,9 +108,9 @@ <h2>Friends</h2>
 
 
 </div>
-<div id="T-f2">
 <div>
-<h2><a href="#T">T</a>::f2</h2>
+<div>
+<h2 id="T-f2"><a href="#T">T</a>::f2</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -125,9 +125,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="T-f3">
 <div>
-<h2><a href="#T">T</a>::f3</h2>
+<div>
+<h2 id="T-f3"><a href="#T">T</a>::f3</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -141,9 +141,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="T-08friend">
 <div>
-<h2>f1</h2>
+<div>
+<h2 id="T-08friend">f1</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/ns-variables.html b/test-files/golden-tests/ns-variables.html
index 4d87c6fffd..7c7842445c 100644
--- a/test-files/golden-tests/ns-variables.html
+++ b/test-files/golden-tests/ns-variables.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -52,9 +52,9 @@ <h2>Variables</h2>
 </tbody>
 </table>
 </div>
-<div id="i">
 <div>
-<h2>i</h2>
+<div>
+<h2 id="i">i</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -68,9 +68,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="j">
 <div>
-<h2>j</h2>
+<div>
+<h2 id="j">j</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -83,9 +83,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="k">
 <div>
-<h2>k</h2>
+<div>
+<h2 id="k">k</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -100,9 +100,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="l">
 <div>
-<h2>l</h2>
+<div>
+<h2 id="l">l</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -116,9 +116,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="pi">
 <div>
-<h2>pi</h2>
+<div>
+<h2 id="pi">pi</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -131,9 +131,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="T">
 <div>
-<h2>T</h2>
+<div>
+<h2 id="T">T</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -148,9 +148,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="t">
 <div>
-<h2>t</h2>
+<div>
+<h2 id="t">t</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -164,9 +164,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="x0">
 <div>
-<h2>x0</h2>
+<div>
+<h2 id="x0">x0</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -180,9 +180,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="x1">
 <div>
-<h2>x1</h2>
+<div>
+<h2 id="x1">x1</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -197,9 +197,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="x2">
 <div>
-<h2>x2</h2>
+<div>
+<h2 id="x2">x2</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/out-of-line-record-def.html b/test-files/golden-tests/out-of-line-record-def.html
index 8e47f91d6a..ff36b8cb14 100644
--- a/test-files/golden-tests/out-of-line-record-def.html
+++ b/test-files/golden-tests/out-of-line-record-def.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -23,9 +23,9 @@ <h2>Namespaces</h2>
 </tbody>
 </table>
 </div>
-<div id="N">
 <div>
-<h2>N</h2>
+<div>
+<h2 id="N">N</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -41,9 +41,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="N-S">
 <div>
-<h2><a href="#N">N</a>::S</h2>
+<div>
+<h2 id="N-S"><a href="#N">N</a>::S</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/overloaded-op-1.html b/test-files/golden-tests/overloaded-op-1.html
index 23e22b2c31..6adde92296 100644
--- a/test-files/golden-tests/overloaded-op-1.html
+++ b/test-files/golden-tests/overloaded-op-1.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -23,9 +23,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="T">
 <div>
-<h2>T</h2>
+<div>
+<h2 id="T">T</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -53,9 +53,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="T-operator_plus">
 <div>
-<h2><a href="#T">T</a>::operator+</h2>
+<div>
+<h2 id="T-operator_plus"><a href="#T">T</a>::operator+</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/overloaded-op-2.html b/test-files/golden-tests/overloaded-op-2.html
index ce2029a0fa..c325faf109 100644
--- a/test-files/golden-tests/overloaded-op-2.html
+++ b/test-files/golden-tests/overloaded-op-2.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -23,9 +23,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="T">
 <div>
-<h2>T</h2>
+<div>
+<h2 id="T">T</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -53,9 +53,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="T-operator_plus">
 <div>
-<h2><a href="#T">T</a>::operator+</h2>
+<div>
+<h2 id="T-operator_plus"><a href="#T">T</a>::operator+</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/para-1.html b/test-files/golden-tests/para-1.html
index da0a1029c5..853d2c6302 100644
--- a/test-files/golden-tests/para-1.html
+++ b/test-files/golden-tests/para-1.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -31,9 +31,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="f1">
 <div>
-<h2>f1</h2>
+<div>
+<h2 id="f1">f1</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -47,9 +47,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="f2">
 <div>
-<h2>f2</h2>
+<div>
+<h2 id="f2">f2</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -63,9 +63,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="f3">
 <div>
-<h2>f3</h2>
+<div>
+<h2 id="f3">f3</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -79,9 +79,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="f4">
 <div>
-<h2>f4</h2>
+<div>
+<h2 id="f4">f4</h2>
 <div>
 <p><span>brief</span></p>
 
diff --git a/test-files/golden-tests/para-2.html b/test-files/golden-tests/para-2.html
index 8e4e1671fb..cb06f0f439 100644
--- a/test-files/golden-tests/para-2.html
+++ b/test-files/golden-tests/para-2.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,9 +25,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="f1">
 <div>
-<h2>f1</h2>
+<div>
+<h2 id="f1">f1</h2>
 <div>
 <p><span>brief</span></p>
 
diff --git a/test-files/golden-tests/param-direction.html b/test-files/golden-tests/param-direction.html
index 60a4b2a4c5..8940b22876 100644
--- a/test-files/golden-tests/param-direction.html
+++ b/test-files/golden-tests/param-direction.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -41,9 +41,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="f">
 <div>
-<h2>f</h2>
+<div>
+<h2 id="f">f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -74,9 +74,9 @@ <h3>Parameters</h3>
 </table>
 </div>
 </div>
-<div id="g">
 <div>
-<h2>g</h2>
+<div>
+<h2 id="g">g</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -113,9 +113,9 @@ <h3>Parameters</h3>
 </table>
 </div>
 </div>
-<div id="h">
 <div>
-<h2>h</h2>
+<div>
+<h2 id="h">h</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -152,9 +152,9 @@ <h3>Parameters</h3>
 </table>
 </div>
 </div>
-<div id="i">
 <div>
-<h2>i</h2>
+<div>
+<h2 id="i">i</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -191,9 +191,9 @@ <h3>Parameters</h3>
 </table>
 </div>
 </div>
-<div id="j">
 <div>
-<h2>j</h2>
+<div>
+<h2 id="j">j</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -230,9 +230,9 @@ <h3>Parameters</h3>
 </table>
 </div>
 </div>
-<div id="k">
 <div>
-<h2>k</h2>
+<div>
+<h2 id="k">k</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -274,9 +274,9 @@ <h3>Parameters</h3>
 </table>
 </div>
 </div>
-<div id="l">
 <div>
-<h2>l</h2>
+<div>
+<h2 id="l">l</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -319,9 +319,9 @@ <h3>Parameters</h3>
 </table>
 </div>
 </div>
-<div id="m">
 <div>
-<h2>m</h2>
+<div>
+<h2 id="m">m</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -358,9 +358,9 @@ <h3>Parameters</h3>
 </table>
 </div>
 </div>
-<div id="n">
 <div>
-<h2>n</h2>
+<div>
+<h2 id="n">n</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -391,9 +391,9 @@ <h3>Parameters</h3>
 </table>
 </div>
 </div>
-<div id="o">
 <div>
-<h2>o</h2>
+<div>
+<h2 id="o">o</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/param.html b/test-files/golden-tests/param.html
index 0aeb5694a7..e8e3d0e0b2 100644
--- a/test-files/golden-tests/param.html
+++ b/test-files/golden-tests/param.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -29,9 +29,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="f">
 <div>
-<h2>f</h2>
+<div>
+<h2 id="f">f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -62,9 +62,9 @@ <h3>Parameters</h3>
 </table>
 </div>
 </div>
-<div id="g">
 <div>
-<h2>g</h2>
+<div>
+<h2 id="g">g</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -101,9 +101,9 @@ <h3>Parameters</h3>
 </table>
 </div>
 </div>
-<div id="h">
 <div>
-<h2>h</h2>
+<div>
+<h2 id="h">h</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -145,9 +145,9 @@ <h3>Parameters</h3>
 </table>
 </div>
 </div>
-<div id="i">
 <div>
-<h2>i</h2>
+<div>
+<h2 id="i">i</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/pre-post.html b/test-files/golden-tests/pre-post.html
index 4a231df447..62ee195a92 100644
--- a/test-files/golden-tests/pre-post.html
+++ b/test-files/golden-tests/pre-post.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -23,9 +23,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="f">
 <div>
-<h2>f</h2>
+<div>
+<h2 id="f">f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/record-1.html b/test-files/golden-tests/record-1.html
index 05d2f9f0ba..fe194b411f 100644
--- a/test-files/golden-tests/record-1.html
+++ b/test-files/golden-tests/record-1.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -23,9 +23,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="T">
 <div>
-<h2>T</h2>
+<div>
+<h2 id="T">T</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -95,9 +95,9 @@ <h2>Protected Member Functions</h2>
 </table>
 
 </div>
-<div id="T-U1">
 <div>
-<h2><a href="#T">T</a>::U1</h2>
+<div>
+<h2 id="T-U1"><a href="#T">T</a>::U1</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -110,9 +110,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="T-U2">
 <div>
-<h2><a href="#T">T</a>::U2</h2>
+<div>
+<h2 id="T-U2"><a href="#T">T</a>::U2</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -125,9 +125,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="T-f1">
 <div>
-<h2><a href="#T">T</a>::f1</h2>
+<div>
+<h2 id="T-f1"><a href="#T">T</a>::f1</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -141,9 +141,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="T-f2">
 <div>
-<h2><a href="#T">T</a>::f2</h2>
+<div>
+<h2 id="T-f2"><a href="#T">T</a>::f2</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -157,9 +157,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="T-f3">
 <div>
-<h2><a href="#T">T</a>::f3</h2>
+<div>
+<h2 id="T-f3"><a href="#T">T</a>::f3</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -173,9 +173,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="T-g1">
 <div>
-<h2><a href="#T">T</a>::g1</h2>
+<div>
+<h2 id="T-g1"><a href="#T">T</a>::g1</h2>
 <div>
 <p><span>brief-g1</span></p>
 
@@ -202,9 +202,9 @@ <h3>Description</h3>
 
 </div>
 </div>
-<div id="T-g2">
 <div>
-<h2><a href="#T">T</a>::g2</h2>
+<div>
+<h2 id="T-g2"><a href="#T">T</a>::g2</h2>
 <div>
 <p><span>brief-g2</span></p>
 
@@ -224,9 +224,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="T-g3">
 <div>
-<h2><a href="#T">T</a>::g3</h2>
+<div>
+<h2 id="T-g3"><a href="#T">T</a>::g3</h2>
 <div>
 <p><span>brief-g3</span></p>
 
diff --git a/test-files/golden-tests/record-access.html b/test-files/golden-tests/record-access.html
index 302c3383f2..f463bbc294 100644
--- a/test-files/golden-tests/record-access.html
+++ b/test-files/golden-tests/record-access.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -27,9 +27,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="S0">
 <div>
-<h2>S0</h2>
+<div>
+<h2 id="S0">S0</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -83,9 +83,9 @@ <h2>Private Member Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="S0-f0">
 <div>
-<h2><a href="#S0">S0</a>::f0</h2>
+<div>
+<h2 id="S0-f0"><a href="#S0">S0</a>::f0</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -99,9 +99,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="S0-f1">
 <div>
-<h2><a href="#S0">S0</a>::f1</h2>
+<div>
+<h2 id="S0-f1"><a href="#S0">S0</a>::f1</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -115,9 +115,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="S0-f2">
 <div>
-<h2><a href="#S0">S0</a>::f2</h2>
+<div>
+<h2 id="S0-f2"><a href="#S0">S0</a>::f2</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -131,9 +131,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="C0">
 <div>
-<h2>C0</h2>
+<div>
+<h2 id="C0">C0</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -187,9 +187,9 @@ <h2>Private Member Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="C0-f0">
 <div>
-<h2><a href="#C0">C0</a>::f0</h2>
+<div>
+<h2 id="C0-f0"><a href="#C0">C0</a>::f0</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -203,9 +203,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="C0-f1">
 <div>
-<h2><a href="#C0">C0</a>::f1</h2>
+<div>
+<h2 id="C0-f1"><a href="#C0">C0</a>::f1</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -219,9 +219,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="C0-f2">
 <div>
-<h2><a href="#C0">C0</a>::f2</h2>
+<div>
+<h2 id="C0-f2"><a href="#C0">C0</a>::f2</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -235,9 +235,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="U0">
 <div>
-<h2>U0</h2>
+<div>
+<h2 id="U0">U0</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -291,9 +291,9 @@ <h2>Private Member Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="U0-f0">
 <div>
-<h2><a href="#U0">U0</a>::f0</h2>
+<div>
+<h2 id="U0-f0"><a href="#U0">U0</a>::f0</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -307,9 +307,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="U0-f1">
 <div>
-<h2><a href="#U0">U0</a>::f1</h2>
+<div>
+<h2 id="U0-f1"><a href="#U0">U0</a>::f1</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -323,9 +323,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="U0-f2">
 <div>
-<h2><a href="#U0">U0</a>::f2</h2>
+<div>
+<h2 id="U0-f2"><a href="#U0">U0</a>::f2</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/record-data.html b/test-files/golden-tests/record-data.html
index 107b59b620..373a456e5a 100644
--- a/test-files/golden-tests/record-data.html
+++ b/test-files/golden-tests/record-data.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -31,9 +31,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="T">
 <div>
-<h2>T</h2>
+<div>
+<h2 id="T">T</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -69,9 +69,9 @@ <h2>Data Members</h2>
 
 
 </div>
-<div id="T-i">
 <div>
-<h2><a href="#T">T</a>::i</h2>
+<div>
+<h2 id="T-i"><a href="#T">T</a>::i</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -84,9 +84,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="T-j">
 <div>
-<h2><a href="#T">T</a>::j</h2>
+<div>
+<h2 id="T-j"><a href="#T">T</a>::j</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -99,9 +99,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="T-k">
 <div>
-<h2><a href="#T">T</a>::k</h2>
+<div>
+<h2 id="T-k"><a href="#T">T</a>::k</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -115,9 +115,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="T-l">
 <div>
-<h2><a href="#T">T</a>::l</h2>
+<div>
+<h2 id="T-l"><a href="#T">T</a>::l</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -130,9 +130,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="T-m">
 <div>
-<h2><a href="#T">T</a>::m</h2>
+<div>
+<h2 id="T-m"><a href="#T">T</a>::m</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -145,9 +145,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="U">
 <div>
-<h2>U</h2>
+<div>
+<h2 id="U">U</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -175,9 +175,9 @@ <h2>Data Members</h2>
 
 
 </div>
-<div id="U-t">
 <div>
-<h2><a href="#U">U</a>::t</h2>
+<div>
+<h2 id="U-t"><a href="#U">U</a>::t</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -190,9 +190,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="V">
 <div>
-<h2>V</h2>
+<div>
+<h2 id="V">V</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -235,9 +235,9 @@ <h2>Private Data Members</h2>
 </tbody>
 </table>
 </div>
-<div id="V-i">
 <div>
-<h2><a href="#V">V</a>::i</h2>
+<div>
+<h2 id="V-i"><a href="#V">V</a>::i</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -250,9 +250,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="V-j">
 <div>
-<h2><a href="#V">V</a>::j</h2>
+<div>
+<h2 id="V-j"><a href="#V">V</a>::j</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -265,9 +265,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="V-k">
 <div>
-<h2><a href="#V">V</a>::k</h2>
+<div>
+<h2 id="V-k"><a href="#V">V</a>::k</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -280,9 +280,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="W">
 <div>
-<h2>W</h2>
+<div>
+<h2 id="W">W</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -310,9 +310,9 @@ <h2>Data Members</h2>
 
 
 </div>
-<div id="W-buf">
 <div>
-<h2><a href="#W">W</a>::buf</h2>
+<div>
+<h2 id="W-buf"><a href="#W">W</a>::buf</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -325,9 +325,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="X">
 <div>
-<h2>X</h2>
+<div>
+<h2 id="X">X</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -379,9 +379,9 @@ <h2>Data Members</h2>
 
 
 </div>
-<div id="X-Q">
 <div>
-<h2><a href="#X">X</a>::Q</h2>
+<div>
+<h2 id="X-Q"><a href="#X">X</a>::Q</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -394,9 +394,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="X-x0">
 <div>
-<h2><a href="#X">X</a>::x0</h2>
+<div>
+<h2 id="X-x0"><a href="#X">X</a>::x0</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -409,9 +409,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="X-x1">
 <div>
-<h2><a href="#X">X</a>::x1</h2>
+<div>
+<h2 id="X-x1"><a href="#X">X</a>::x1</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -424,9 +424,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="X-x2">
 <div>
-<h2><a href="#X">X</a>::x2</h2>
+<div>
+<h2 id="X-x2"><a href="#X">X</a>::x2</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -439,9 +439,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="X-x3">
 <div>
-<h2><a href="#X">X</a>::x3</h2>
+<div>
+<h2 id="X-x3"><a href="#X">X</a>::x3</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -454,9 +454,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="X-x4">
 <div>
-<h2><a href="#X">X</a>::x4</h2>
+<div>
+<h2 id="X-x4"><a href="#X">X</a>::x4</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/record-inheritance.html b/test-files/golden-tests/record-inheritance.html
index 6a1162af3b..b7591b5187 100644
--- a/test-files/golden-tests/record-inheritance.html
+++ b/test-files/golden-tests/record-inheritance.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -53,9 +53,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="S0">
 <div>
-<h2>S0</h2>
+<div>
+<h2 id="S0">S0</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -70,9 +70,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="C0">
 <div>
-<h2>C0</h2>
+<div>
+<h2 id="C0">C0</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -87,9 +87,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="U0">
 <div>
-<h2>U0</h2>
+<div>
+<h2 id="U0">U0</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -104,9 +104,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="S1">
 <div>
-<h2>S1</h2>
+<div>
+<h2 id="S1">S1</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -121,9 +121,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="S2">
 <div>
-<h2>S2</h2>
+<div>
+<h2 id="S2">S2</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -139,9 +139,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="S3">
 <div>
-<h2>S3</h2>
+<div>
+<h2 id="S3">S3</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -157,9 +157,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="S4">
 <div>
-<h2>S4</h2>
+<div>
+<h2 id="S4">S4</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -176,9 +176,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="C1">
 <div>
-<h2>C1</h2>
+<div>
+<h2 id="C1">C1</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -194,9 +194,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="C2">
 <div>
-<h2>C2</h2>
+<div>
+<h2 id="C2">C2</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -212,9 +212,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="C3">
 <div>
-<h2>C3</h2>
+<div>
+<h2 id="C3">C3</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -230,9 +230,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="C4">
 <div>
-<h2>C4</h2>
+<div>
+<h2 id="C4">C4</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -248,9 +248,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="C5">
 <div>
-<h2>C5</h2>
+<div>
+<h2 id="C5">C5</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -266,9 +266,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="C6">
 <div>
-<h2>C6</h2>
+<div>
+<h2 id="C6">C6</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -284,9 +284,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="C7">
 <div>
-<h2>C7</h2>
+<div>
+<h2 id="C7">C7</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -303,9 +303,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="S5">
 <div>
-<h2>S5</h2>
+<div>
+<h2 id="S5">S5</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -322,9 +322,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="S6">
 <div>
-<h2>S6</h2>
+<div>
+<h2 id="S6">S6</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/ref.html b/test-files/golden-tests/ref.html
index 2221f54978..20ff3ad765 100644
--- a/test-files/golden-tests/ref.html
+++ b/test-files/golden-tests/ref.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -57,9 +57,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="f0">
 <div>
-<h2>f0</h2>
+<div>
+<h2 id="f0">f0</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -73,9 +73,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A">
 <div>
-<h2>A</h2>
+<div>
+<h2 id="A">A</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -112,9 +112,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="A-f1">
 <div>
-<h2><a href="#A">A</a>::f1</h2>
+<div>
+<h2 id="A-f1"><a href="#A">A</a>::f1</h2>
 <div>
 <p><span>See</span> <a href="#f0">f0</a></p>
 
@@ -141,9 +141,9 @@ <h3>Description</h3>
 
 </div>
 </div>
-<div id="A-B">
 <div>
-<h2><a href="#A">A</a>::B</h2>
+<div>
+<h2 id="A-B"><a href="#A">A</a>::B</h2>
 <div>
 <p><span>See</span> <a href="#A-f1">f1</a></p>
 
@@ -187,9 +187,9 @@ <h3>Description</h3>
 
 </div>
 </div>
-<div id="A-B-f2">
 <div>
-<h2><a href="#A">A</a>::<a href="#A-B">B</a>::f2</h2>
+<div>
+<h2 id="A-B-f2"><a href="#A">A</a>::<a href="#A-B">B</a>::f2</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -203,9 +203,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A-C">
 <div>
-<h2><a href="#A">A</a>::C</h2>
+<div>
+<h2 id="A-C"><a href="#A">A</a>::C</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -235,9 +235,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="A-C-f3">
 <div>
-<h2><a href="#A">A</a>::<a href="#A-C">C</a>::f3</h2>
+<div>
+<h2 id="A-C-f3"><a href="#A">A</a>::<a href="#A-C">C</a>::f3</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -251,9 +251,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A-C-f4">
 <div>
-<h2><a href="#A">A</a>::<a href="#A-C">C</a>::f4</h2>
+<div>
+<h2 id="A-C-f4"><a href="#A">A</a>::<a href="#A-C">C</a>::f4</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -267,9 +267,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A-D">
 <div>
-<h2><a href="#A">A</a>::D</h2>
+<div>
+<h2 id="A-D"><a href="#A">A</a>::D</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -314,9 +314,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="A-D-f4">
 <div>
-<h2><a href="#A">A</a>::<a href="#A-D">D</a>::f4</h2>
+<div>
+<h2 id="A-D-f4"><a href="#A">A</a>::<a href="#A-D">D</a>::f4</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -330,9 +330,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A-D-E">
 <div>
-<h2><a href="#A">A</a>::<a href="#A-D">D</a>::E</h2>
+<div>
+<h2 id="A-D-E"><a href="#A">A</a>::<a href="#A-D">D</a>::E</h2>
 <div>
 <p><span>See</span> <a href="#A-C-f3">f3</a></p>
 
@@ -362,9 +362,9 @@ <h3>Description</h3>
 
 </div>
 </div>
-<div id="f5">
 <div>
-<h2>f5</h2>
+<div>
+<h2 id="f5">f5</h2>
 <div>
 <p><span>See</span> <a href="#A-f1">A::f1</a></p>
 
@@ -391,9 +391,9 @@ <h3>Description</h3>
 
 </div>
 </div>
-<div id="F">
 <div>
-<h2>F</h2>
+<div>
+<h2 id="F">F</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -497,9 +497,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="F-operator_bitnot">
 <div>
-<h2><a href="#F">F</a>::operator~</h2>
+<div>
+<h2 id="F-operator_bitnot"><a href="#F">F</a>::operator~</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -513,9 +513,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="F-operator_comma">
 <div>
-<h2><a href="#F">F</a>::operator,</h2>
+<div>
+<h2 id="F-operator_comma"><a href="#F">F</a>::operator,</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -529,9 +529,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="F-operator_call">
 <div>
-<h2><a href="#F">F</a>::operator()</h2>
+<div>
+<h2 id="F-operator_call"><a href="#F">F</a>::operator()</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -545,9 +545,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="F-operator_subs">
 <div>
-<h2><a href="#F">F</a>::operator[]</h2>
+<div>
+<h2 id="F-operator_subs"><a href="#F">F</a>::operator[]</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -561,9 +561,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="F-operator_plus">
 <div>
-<h2><a href="#F">F</a>::operator+</h2>
+<div>
+<h2 id="F-operator_plus"><a href="#F">F</a>::operator+</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -577,9 +577,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="F-operator_inc">
 <div>
-<h2><a href="#F">F</a>::operator++</h2>
+<div>
+<h2 id="F-operator_inc"><a href="#F">F</a>::operator++</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -593,9 +593,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="F-operator_plus_eq">
 <div>
-<h2><a href="#F">F</a>::operator+&#x3D;</h2>
+<div>
+<h2 id="F-operator_plus_eq"><a href="#F">F</a>::operator+&#x3D;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -609,9 +609,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="F-operator_bitand">
 <div>
-<h2><a href="#F">F</a>::operator&amp;</h2>
+<div>
+<h2 id="F-operator_bitand"><a href="#F">F</a>::operator&amp;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -625,9 +625,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="F-operator_and">
 <div>
-<h2><a href="#F">F</a>::operator&amp;&amp;</h2>
+<div>
+<h2 id="F-operator_and"><a href="#F">F</a>::operator&amp;&amp;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -641,9 +641,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="F-operator_and_eq">
 <div>
-<h2><a href="#F">F</a>::operator&amp;&#x3D;</h2>
+<div>
+<h2 id="F-operator_and_eq"><a href="#F">F</a>::operator&amp;&#x3D;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -657,9 +657,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="F-operator_bitor">
 <div>
-<h2><a href="#F">F</a>::operator|</h2>
+<div>
+<h2 id="F-operator_bitor"><a href="#F">F</a>::operator|</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -673,9 +673,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="F-operator_or">
 <div>
-<h2><a href="#F">F</a>::operator||</h2>
+<div>
+<h2 id="F-operator_or"><a href="#F">F</a>::operator||</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -689,9 +689,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="F-operator_or_eq">
 <div>
-<h2><a href="#F">F</a>::operator|&#x3D;</h2>
+<div>
+<h2 id="F-operator_or_eq"><a href="#F">F</a>::operator|&#x3D;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -705,9 +705,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="F-operator_minus">
 <div>
-<h2><a href="#F">F</a>::operator-</h2>
+<div>
+<h2 id="F-operator_minus"><a href="#F">F</a>::operator-</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -721,9 +721,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="F-operator_dec">
 <div>
-<h2><a href="#F">F</a>::operator--</h2>
+<div>
+<h2 id="F-operator_dec"><a href="#F">F</a>::operator--</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -737,9 +737,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="F-operator_minus_eq">
 <div>
-<h2><a href="#F">F</a>::operator-&#x3D;</h2>
+<div>
+<h2 id="F-operator_minus_eq"><a href="#F">F</a>::operator-&#x3D;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -753,9 +753,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="F-operator_ptr">
 <div>
-<h2><a href="#F">F</a>::operator-&gt;</h2>
+<div>
+<h2 id="F-operator_ptr"><a href="#F">F</a>::operator-&gt;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -769,9 +769,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="F-operator_ptrmem">
 <div>
-<h2><a href="#F">F</a>::operator-&gt;*</h2>
+<div>
+<h2 id="F-operator_ptrmem"><a href="#F">F</a>::operator-&gt;*</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -785,9 +785,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="F-operator_lt">
 <div>
-<h2><a href="#F">F</a>::operator&lt;</h2>
+<div>
+<h2 id="F-operator_lt"><a href="#F">F</a>::operator&lt;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -801,9 +801,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="F-operator_lshift">
 <div>
-<h2><a href="#F">F</a>::operator&lt;&lt;</h2>
+<div>
+<h2 id="F-operator_lshift"><a href="#F">F</a>::operator&lt;&lt;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -817,9 +817,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="F-operator_lshift_eq">
 <div>
-<h2><a href="#F">F</a>::operator&lt;&lt;&#x3D;</h2>
+<div>
+<h2 id="F-operator_lshift_eq"><a href="#F">F</a>::operator&lt;&lt;&#x3D;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -833,9 +833,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="F-operator_le">
 <div>
-<h2><a href="#F">F</a>::operator&lt;&#x3D;</h2>
+<div>
+<h2 id="F-operator_le"><a href="#F">F</a>::operator&lt;&#x3D;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -849,9 +849,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="F-operator_3way">
 <div>
-<h2><a href="#F">F</a>::operator&lt;&#x3D;&gt;</h2>
+<div>
+<h2 id="F-operator_3way"><a href="#F">F</a>::operator&lt;&#x3D;&gt;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -865,9 +865,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="F-operator_gt">
 <div>
-<h2><a href="#F">F</a>::operator&gt;</h2>
+<div>
+<h2 id="F-operator_gt"><a href="#F">F</a>::operator&gt;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -881,9 +881,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="F-operator_rshift">
 <div>
-<h2><a href="#F">F</a>::operator&gt;&gt;</h2>
+<div>
+<h2 id="F-operator_rshift"><a href="#F">F</a>::operator&gt;&gt;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -897,9 +897,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="F-operator_rshift_eq">
 <div>
-<h2><a href="#F">F</a>::operator&gt;&gt;&#x3D;</h2>
+<div>
+<h2 id="F-operator_rshift_eq"><a href="#F">F</a>::operator&gt;&gt;&#x3D;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -913,9 +913,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="F-operator_ge">
 <div>
-<h2><a href="#F">F</a>::operator&gt;&#x3D;</h2>
+<div>
+<h2 id="F-operator_ge"><a href="#F">F</a>::operator&gt;&#x3D;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -929,9 +929,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="F-operator_star">
 <div>
-<h2><a href="#F">F</a>::operator*</h2>
+<div>
+<h2 id="F-operator_star"><a href="#F">F</a>::operator*</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -945,9 +945,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="F-operator_star_eq">
 <div>
-<h2><a href="#F">F</a>::operator*&#x3D;</h2>
+<div>
+<h2 id="F-operator_star_eq"><a href="#F">F</a>::operator*&#x3D;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -961,9 +961,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="F-operator_mod">
 <div>
-<h2><a href="#F">F</a>::operator%</h2>
+<div>
+<h2 id="F-operator_mod"><a href="#F">F</a>::operator%</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -977,9 +977,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="F-operator_mod_eq">
 <div>
-<h2><a href="#F">F</a>::operator%&#x3D;</h2>
+<div>
+<h2 id="F-operator_mod_eq"><a href="#F">F</a>::operator%&#x3D;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -993,9 +993,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="F-operator_slash">
 <div>
-<h2><a href="#F">F</a>::operator/</h2>
+<div>
+<h2 id="F-operator_slash"><a href="#F">F</a>::operator/</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1009,9 +1009,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="F-operator_slash_eq">
 <div>
-<h2><a href="#F">F</a>::operator/&#x3D;</h2>
+<div>
+<h2 id="F-operator_slash_eq"><a href="#F">F</a>::operator/&#x3D;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1025,9 +1025,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="F-operator_xor">
 <div>
-<h2><a href="#F">F</a>::operator^</h2>
+<div>
+<h2 id="F-operator_xor"><a href="#F">F</a>::operator^</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1041,9 +1041,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="F-operator_xor_eq">
 <div>
-<h2><a href="#F">F</a>::operator^&#x3D;</h2>
+<div>
+<h2 id="F-operator_xor_eq"><a href="#F">F</a>::operator^&#x3D;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1057,9 +1057,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="F-operator_assign">
 <div>
-<h2><a href="#F">F</a>::operator&#x3D;</h2>
+<div>
+<h2 id="F-operator_assign"><a href="#F">F</a>::operator&#x3D;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1073,9 +1073,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="F-operator_eq">
 <div>
-<h2><a href="#F">F</a>::operator&#x3D;&#x3D;</h2>
+<div>
+<h2 id="F-operator_eq"><a href="#F">F</a>::operator&#x3D;&#x3D;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1089,9 +1089,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="F-operator_not">
 <div>
-<h2><a href="#F">F</a>::operator!</h2>
+<div>
+<h2 id="F-operator_not"><a href="#F">F</a>::operator!</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1105,9 +1105,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="F-operator_not_eq">
 <div>
-<h2><a href="#F">F</a>::operator!&#x3D;</h2>
+<div>
+<h2 id="F-operator_not_eq"><a href="#F">F</a>::operator!&#x3D;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -1121,9 +1121,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="f6">
 <div>
-<h2>f6</h2>
+<div>
+<h2 id="f6">f6</h2>
 <div>
 <p><span>See</span> <a href="#F-operator_bitnot">F::operator~</a></p>
 
diff --git a/test-files/golden-tests/requires-clause.html b/test-files/golden-tests/requires-clause.html
index 82b9f5b07e..48138fc90a 100644
--- a/test-files/golden-tests/requires-clause.html
+++ b/test-files/golden-tests/requires-clause.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -36,9 +36,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="f">
 <div>
-<h2>f</h2>
+<div>
+<h2 id="f">f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -62,9 +62,9 @@ <h3>Synopsis</h3>
 <a href="#f-08"><em>» more...</em></a>
 </div>
 </div>
-<div id="f-05">
 <div>
-<h2>f</h2>
+<div>
+<h2 id="f-05">f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -79,9 +79,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="f-08">
 <div>
-<h2>f</h2>
+<div>
+<h2 id="f-08">f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -96,9 +96,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="g">
 <div>
-<h2>g</h2>
+<div>
+<h2 id="g">g</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -122,9 +122,9 @@ <h3>Synopsis</h3>
 <a href="#g-0c"><em>» more...</em></a>
 </div>
 </div>
-<div id="g-0a">
 <div>
-<h2>g</h2>
+<div>
+<h2 id="g-0a">g</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -139,9 +139,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="g-0c">
 <div>
-<h2>g</h2>
+<div>
+<h2 id="g-0c">g</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -156,9 +156,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A">
 <div>
-<h2>A</h2>
+<div>
+<h2 id="A">A</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/spec-mem-implicit-instantiation.html b/test-files/golden-tests/spec-mem-implicit-instantiation.html
index 53c2d6788d..c44346cea5 100644
--- a/test-files/golden-tests/spec-mem-implicit-instantiation.html
+++ b/test-files/golden-tests/spec-mem-implicit-instantiation.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,9 +25,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="A-0e">
 <div>
-<h2>A</h2>
+<div>
+<h2 id="A-0e">A</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -71,9 +71,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="A-0e-f">
 <div>
-<h2><a href="#A-0e">A</a>::f</h2>
+<div>
+<h2 id="A-0e-f"><a href="#A-0e">A</a>::f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -87,9 +87,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A-0e-B">
 <div>
-<h2><a href="#A-0e">A</a>::B</h2>
+<div>
+<h2 id="A-0e-B"><a href="#A-0e">A</a>::B</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -118,9 +118,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="A-0e-B-g">
 <div>
-<h2><a href="#A-0e">A</a>::<a href="#A-0e-B">B</a>::g</h2>
+<div>
+<h2 id="A-0e-B-g"><a href="#A-0e">A</a>::<a href="#A-0e-B">B</a>::g</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -134,9 +134,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A-0e-C">
 <div>
-<h2><a href="#A-0e">A</a>::C</h2>
+<div>
+<h2 id="A-0e-C"><a href="#A-0e">A</a>::C</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -165,9 +165,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="A-0e-C-h">
 <div>
-<h2><a href="#A-0e">A</a>::<a href="#A-0e-C">C</a>::h</h2>
+<div>
+<h2 id="A-0e-C-h"><a href="#A-0e">A</a>::<a href="#A-0e-C">C</a>::h</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -181,9 +181,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="D">
 <div>
-<h2>D</h2>
+<div>
+<h2 id="D">D</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -211,9 +211,9 @@ <h2>Types</h2>
 
 
 </div>
-<div id="D-E-0e">
 <div>
-<h2><a href="#D">D</a>::E</h2>
+<div>
+<h2 id="D-E-0e"><a href="#D">D</a>::E</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -242,9 +242,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="D-E-0e-k">
 <div>
-<h2><a href="#D">D</a>::<a href="#D-E-0e">E</a>::k</h2>
+<div>
+<h2 id="D-E-0e-k"><a href="#D">D</a>::<a href="#D-E-0e">E</a>::k</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/static-data-def-constexpr.html b/test-files/golden-tests/static-data-def-constexpr.html
index 601275963d..24001cf0a3 100644
--- a/test-files/golden-tests/static-data-def-constexpr.html
+++ b/test-files/golden-tests/static-data-def-constexpr.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,9 +25,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="S">
 <div>
-<h2>S</h2>
+<div>
+<h2 id="S">S</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -55,9 +55,9 @@ <h2>Static Data Members</h2>
 
 
 </div>
-<div id="S-s">
 <div>
-<h2><a href="#S">S</a>::s</h2>
+<div>
+<h2 id="S-s"><a href="#S">S</a>::s</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -72,9 +72,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="T">
 <div>
-<h2>T</h2>
+<div>
+<h2 id="T">T</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -102,9 +102,9 @@ <h2>Static Data Members</h2>
 
 
 </div>
-<div id="T-t">
 <div>
-<h2><a href="#T">T</a>::t</h2>
+<div>
+<h2 id="T-t"><a href="#T">T</a>::t</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/static-data-def.html b/test-files/golden-tests/static-data-def.html
index 5b1b370a70..6a1b7f96e1 100644
--- a/test-files/golden-tests/static-data-def.html
+++ b/test-files/golden-tests/static-data-def.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -38,9 +38,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="A">
 <div>
-<h2>A</h2>
+<div>
+<h2 id="A">A</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -83,9 +83,9 @@ <h2>Static Data Members</h2>
 
 
 </div>
-<div id="A-v0">
 <div>
-<h2><a href="#A">A</a>::v0</h2>
+<div>
+<h2 id="A-v0"><a href="#A">A</a>::v0</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -99,9 +99,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A-v1">
 <div>
-<h2><a href="#A">A</a>::v1</h2>
+<div>
+<h2 id="A-v1"><a href="#A">A</a>::v1</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -115,9 +115,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A-v2">
 <div>
-<h2><a href="#A">A</a>::v2</h2>
+<div>
+<h2 id="A-v2"><a href="#A">A</a>::v2</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -132,9 +132,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A-v3">
 <div>
-<h2><a href="#A">A</a>::v3</h2>
+<div>
+<h2 id="A-v3"><a href="#A">A</a>::v3</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -148,9 +148,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A-v4">
 <div>
-<h2><a href="#A">A</a>::v4</h2>
+<div>
+<h2 id="A-v4"><a href="#A">A</a>::v4</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -164,9 +164,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A-v5">
 <div>
-<h2><a href="#A">A</a>::v5</h2>
+<div>
+<h2 id="A-v5"><a href="#A">A</a>::v5</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -180,9 +180,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A-v6">
 <div>
-<h2><a href="#A">A</a>::v6</h2>
+<div>
+<h2 id="A-v6"><a href="#A">A</a>::v6</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -196,9 +196,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A-v7">
 <div>
-<h2><a href="#A">A</a>::v7</h2>
+<div>
+<h2 id="A-v7"><a href="#A">A</a>::v7</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -213,9 +213,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="B">
 <div>
-<h2>B</h2>
+<div>
+<h2 id="B">B</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -245,9 +245,9 @@ <h2>Static Data Members</h2>
 
 
 </div>
-<div id="B-x0">
 <div>
-<h2><a href="#B">B</a>::x0</h2>
+<div>
+<h2 id="B-x0"><a href="#B">B</a>::x0</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -262,9 +262,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="B-x1">
 <div>
-<h2><a href="#B">B</a>::x1</h2>
+<div>
+<h2 id="B-x1"><a href="#B">B</a>::x1</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -280,9 +280,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="f">
 <div>
-<h2>f</h2>
+<div>
+<h2 id="f">f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/static-data-template.html b/test-files/golden-tests/static-data-template.html
index 3357324942..09ef4c7d9a 100644
--- a/test-files/golden-tests/static-data-template.html
+++ b/test-files/golden-tests/static-data-template.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -23,9 +23,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="A">
 <div>
-<h2>A</h2>
+<div>
+<h2 id="A">A</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -58,9 +58,9 @@ <h2>Static Data Members</h2>
 
 
 </div>
-<div id="A-x-0e">
 <div>
-<h2><a href="#A">A</a>::x</h2>
+<div>
+<h2 id="A-x-0e"><a href="#A">A</a>::x</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -78,9 +78,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A-x-0a">
 <div>
-<h2><a href="#A">A</a>::x&lt;U*, T&gt;</h2>
+<div>
+<h2 id="A-x-0a"><a href="#A">A</a>::x&lt;U*, T&gt;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -96,9 +96,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A-x-07">
 <div>
-<h2><a href="#A">A</a>::x&lt;T, long&gt;</h2>
+<div>
+<h2 id="A-x-07"><a href="#A">A</a>::x&lt;T, long&gt;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/temp/c_mct_expl_inline.html b/test-files/golden-tests/temp/c_mct_expl_inline.html
index fcad55951a..c863997763 100644
--- a/test-files/golden-tests/temp/c_mct_expl_inline.html
+++ b/test-files/golden-tests/temp/c_mct_expl_inline.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -23,9 +23,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="A">
 <div>
-<h2>A</h2>
+<div>
+<h2 id="A">A</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -55,9 +55,9 @@ <h2>Types</h2>
 
 
 </div>
-<div id="A-B-04">
 <div>
-<h2><a href="#A">A</a>::B</h2>
+<div>
+<h2 id="A-B-04"><a href="#A">A</a>::B</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -86,9 +86,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="A-B-04-f">
 <div>
-<h2><a href="#A">A</a>::<a href="#A-B-04">B</a>::f</h2>
+<div>
+<h2 id="A-B-04-f"><a href="#A">A</a>::<a href="#A-B-04">B</a>::f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -102,9 +102,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A-B-01">
 <div>
-<h2><a href="#A">A</a>::B&lt;int&gt;</h2>
+<div>
+<h2 id="A-B-01"><a href="#A">A</a>::B&lt;int&gt;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -133,9 +133,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="A-B-01-g">
 <div>
-<h2><a href="#A">A</a>::<a href="#A-B-01">B</a>&lt;int&gt;::g</h2>
+<div>
+<h2 id="A-B-01-g"><a href="#A">A</a>::<a href="#A-B-01">B</a>&lt;int&gt;::g</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/temp/c_mct_expl_outside.html b/test-files/golden-tests/temp/c_mct_expl_outside.html
index 2215a40836..041b5c7fe6 100644
--- a/test-files/golden-tests/temp/c_mct_expl_outside.html
+++ b/test-files/golden-tests/temp/c_mct_expl_outside.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -23,9 +23,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="A">
 <div>
-<h2>A</h2>
+<div>
+<h2 id="A">A</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -55,9 +55,9 @@ <h2>Types</h2>
 
 
 </div>
-<div id="A-B-04">
 <div>
-<h2><a href="#A">A</a>::B</h2>
+<div>
+<h2 id="A-B-04"><a href="#A">A</a>::B</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -86,9 +86,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="A-B-04-f">
 <div>
-<h2><a href="#A">A</a>::<a href="#A-B-04">B</a>::f</h2>
+<div>
+<h2 id="A-B-04-f"><a href="#A">A</a>::<a href="#A-B-04">B</a>::f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -102,9 +102,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A-B-01">
 <div>
-<h2><a href="#A">A</a>::B&lt;int&gt;</h2>
+<div>
+<h2 id="A-B-01"><a href="#A">A</a>::B&lt;int&gt;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -133,9 +133,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="A-B-01-g">
 <div>
-<h2><a href="#A">A</a>::<a href="#A-B-01">B</a>&lt;int&gt;::g</h2>
+<div>
+<h2 id="A-B-01-g"><a href="#A">A</a>::<a href="#A-B-01">B</a>&lt;int&gt;::g</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/temp/c_mft_expl_inline.html b/test-files/golden-tests/temp/c_mft_expl_inline.html
index 1afe9d3cd1..8cad73f481 100644
--- a/test-files/golden-tests/temp/c_mft_expl_inline.html
+++ b/test-files/golden-tests/temp/c_mft_expl_inline.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -23,9 +23,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="A">
 <div>
-<h2>A</h2>
+<div>
+<h2 id="A">A</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -52,9 +52,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="A-f">
 <div>
-<h2><a href="#A">A</a>::f</h2>
+<div>
+<h2 id="A-f"><a href="#A">A</a>::f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -78,9 +78,9 @@ <h3>Synopsis</h3>
 <a href="#A-f-0b"><em>» more...</em></a>
 </div>
 </div>
-<div id="A-f-0e">
 <div>
-<h2><a href="#A">A</a>::f</h2>
+<div>
+<h2 id="A-f-0e"><a href="#A">A</a>::f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -95,9 +95,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A-f-0b">
 <div>
-<h2><a href="#A">A</a>::f&lt;int&gt;</h2>
+<div>
+<h2 id="A-f-0b"><a href="#A">A</a>::f&lt;int&gt;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/temp/c_mft_expl_outside.html b/test-files/golden-tests/temp/c_mft_expl_outside.html
index 7d2aa714e8..fcf2cfee8d 100644
--- a/test-files/golden-tests/temp/c_mft_expl_outside.html
+++ b/test-files/golden-tests/temp/c_mft_expl_outside.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -23,9 +23,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="A">
 <div>
-<h2>A</h2>
+<div>
+<h2 id="A">A</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -52,9 +52,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="A-f">
 <div>
-<h2><a href="#A">A</a>::f</h2>
+<div>
+<h2 id="A-f"><a href="#A">A</a>::f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -78,9 +78,9 @@ <h3>Synopsis</h3>
 <a href="#A-f-0b"><em>» more...</em></a>
 </div>
 </div>
-<div id="A-f-0e">
 <div>
-<h2><a href="#A">A</a>::f</h2>
+<div>
+<h2 id="A-f-0e"><a href="#A">A</a>::f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -95,9 +95,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A-f-0b">
 <div>
-<h2><a href="#A">A</a>::f&lt;int&gt;</h2>
+<div>
+<h2 id="A-f-0b"><a href="#A">A</a>::f&lt;int&gt;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/temp/ct_expl.html b/test-files/golden-tests/temp/ct_expl.html
index 6da5022e4a..e6abc6e16f 100644
--- a/test-files/golden-tests/temp/ct_expl.html
+++ b/test-files/golden-tests/temp/ct_expl.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,9 +25,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="A-0e">
 <div>
-<h2>A</h2>
+<div>
+<h2 id="A-0e">A</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -56,9 +56,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="A-0e-f">
 <div>
-<h2><a href="#A-0e">A</a>::f</h2>
+<div>
+<h2 id="A-0e-f"><a href="#A-0e">A</a>::f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -72,9 +72,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A-00">
 <div>
-<h2>A&lt;int&gt;</h2>
+<div>
+<h2 id="A-00">A&lt;int&gt;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -103,9 +103,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="A-00-g">
 <div>
-<h2><a href="#A-00">A</a>&lt;int&gt;::g</h2>
+<div>
+<h2 id="A-00-g"><a href="#A-00">A</a>&lt;int&gt;::g</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/temp/ct_mc.html b/test-files/golden-tests/temp/ct_mc.html
index be527b0bb8..37ecdde64a 100644
--- a/test-files/golden-tests/temp/ct_mc.html
+++ b/test-files/golden-tests/temp/ct_mc.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -23,9 +23,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="A">
 <div>
-<h2>A</h2>
+<div>
+<h2 id="A">A</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -54,9 +54,9 @@ <h2>Types</h2>
 
 
 </div>
-<div id="A-B">
 <div>
-<h2><a href="#A">A</a>::B</h2>
+<div>
+<h2 id="A-B"><a href="#A">A</a>::B</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -84,9 +84,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="A-B-f">
 <div>
-<h2><a href="#A">A</a>::<a href="#A-B">B</a>::f</h2>
+<div>
+<h2 id="A-B-f"><a href="#A">A</a>::<a href="#A-B">B</a>::f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/temp/ct_mc_expl_outside.html b/test-files/golden-tests/temp/ct_mc_expl_outside.html
index 2957a27c29..1b4141a587 100644
--- a/test-files/golden-tests/temp/ct_mc_expl_outside.html
+++ b/test-files/golden-tests/temp/ct_mc_expl_outside.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -23,9 +23,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="A-0e">
 <div>
-<h2>A</h2>
+<div>
+<h2 id="A-0e">A</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -54,9 +54,9 @@ <h2>Types</h2>
 
 
 </div>
-<div id="A-0e-B">
 <div>
-<h2><a href="#A-0e">A</a>::B</h2>
+<div>
+<h2 id="A-0e-B"><a href="#A-0e">A</a>::B</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -84,9 +84,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="A-0e-B-f">
 <div>
-<h2><a href="#A-0e">A</a>::<a href="#A-0e-B">B</a>::f</h2>
+<div>
+<h2 id="A-0e-B-f"><a href="#A-0e">A</a>::<a href="#A-0e-B">B</a>::f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/temp/ct_mct.html b/test-files/golden-tests/temp/ct_mct.html
index 6aebdfb02d..1be0b1cba9 100644
--- a/test-files/golden-tests/temp/ct_mct.html
+++ b/test-files/golden-tests/temp/ct_mct.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -23,9 +23,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="A">
 <div>
-<h2>A</h2>
+<div>
+<h2 id="A">A</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -54,9 +54,9 @@ <h2>Types</h2>
 
 
 </div>
-<div id="A-B">
 <div>
-<h2><a href="#A">A</a>::B</h2>
+<div>
+<h2 id="A-B"><a href="#A">A</a>::B</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -85,9 +85,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="A-B-f">
 <div>
-<h2><a href="#A">A</a>::<a href="#A-B">B</a>::f</h2>
+<div>
+<h2 id="A-B-f"><a href="#A">A</a>::<a href="#A-B">B</a>::f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/temp/ct_mct_expl_inline.html b/test-files/golden-tests/temp/ct_mct_expl_inline.html
index 9a184745d0..50cd529a33 100644
--- a/test-files/golden-tests/temp/ct_mct_expl_inline.html
+++ b/test-files/golden-tests/temp/ct_mct_expl_inline.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -23,9 +23,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="A">
 <div>
-<h2>A</h2>
+<div>
+<h2 id="A">A</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -56,9 +56,9 @@ <h2>Types</h2>
 
 
 </div>
-<div id="A-B-07">
 <div>
-<h2><a href="#A">A</a>::B</h2>
+<div>
+<h2 id="A-B-07"><a href="#A">A</a>::B</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -87,9 +87,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="A-B-07-f">
 <div>
-<h2><a href="#A">A</a>::<a href="#A-B-07">B</a>::f</h2>
+<div>
+<h2 id="A-B-07-f"><a href="#A">A</a>::<a href="#A-B-07">B</a>::f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -103,9 +103,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A-B-06">
 <div>
-<h2><a href="#A">A</a>::B&lt;int&gt;</h2>
+<div>
+<h2 id="A-B-06"><a href="#A">A</a>::B&lt;int&gt;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -134,9 +134,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="A-B-06-g">
 <div>
-<h2><a href="#A">A</a>::<a href="#A-B-06">B</a>&lt;int&gt;::g</h2>
+<div>
+<h2 id="A-B-06-g"><a href="#A">A</a>::<a href="#A-B-06">B</a>&lt;int&gt;::g</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/temp/ct_mct_expl_outside.html b/test-files/golden-tests/temp/ct_mct_expl_outside.html
index 10eb9ac19b..54129069cb 100644
--- a/test-files/golden-tests/temp/ct_mct_expl_outside.html
+++ b/test-files/golden-tests/temp/ct_mct_expl_outside.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -23,9 +23,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="A-0e">
 <div>
-<h2>A</h2>
+<div>
+<h2 id="A-0e">A</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -54,9 +54,9 @@ <h2>Types</h2>
 
 
 </div>
-<div id="A-0e-B">
 <div>
-<h2><a href="#A-0e">A</a>::B</h2>
+<div>
+<h2 id="A-0e-B"><a href="#A-0e">A</a>::B</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -85,9 +85,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="A-0e-B-f">
 <div>
-<h2><a href="#A-0e">A</a>::<a href="#A-0e-B">B</a>::f</h2>
+<div>
+<h2 id="A-0e-B-f"><a href="#A-0e">A</a>::<a href="#A-0e-B">B</a>::f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/temp/ct_mf.html b/test-files/golden-tests/temp/ct_mf.html
index bbd106cdae..8933e1348e 100644
--- a/test-files/golden-tests/temp/ct_mf.html
+++ b/test-files/golden-tests/temp/ct_mf.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -23,9 +23,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="A">
 <div>
-<h2>A</h2>
+<div>
+<h2 id="A">A</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -54,9 +54,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="A-f">
 <div>
-<h2><a href="#A">A</a>::f</h2>
+<div>
+<h2 id="A-f"><a href="#A">A</a>::f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/temp/ct_mf_expl_outside.html b/test-files/golden-tests/temp/ct_mf_expl_outside.html
index 2f3ee8de89..ff27c6971b 100644
--- a/test-files/golden-tests/temp/ct_mf_expl_outside.html
+++ b/test-files/golden-tests/temp/ct_mf_expl_outside.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -23,9 +23,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="A-0e">
 <div>
-<h2>A</h2>
+<div>
+<h2 id="A-0e">A</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -54,9 +54,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="A-0e-f">
 <div>
-<h2><a href="#A-0e">A</a>::f</h2>
+<div>
+<h2 id="A-0e-f"><a href="#A-0e">A</a>::f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/temp/ct_mft.html b/test-files/golden-tests/temp/ct_mft.html
index e24b1578fa..678eee787f 100644
--- a/test-files/golden-tests/temp/ct_mft.html
+++ b/test-files/golden-tests/temp/ct_mft.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -23,9 +23,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="A">
 <div>
-<h2>A</h2>
+<div>
+<h2 id="A">A</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -54,9 +54,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="A-f">
 <div>
-<h2><a href="#A">A</a>::f</h2>
+<div>
+<h2 id="A-f"><a href="#A">A</a>::f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/temp/ct_mft_expl_inline.html b/test-files/golden-tests/temp/ct_mft_expl_inline.html
index a4fe3b4d73..eb45d80bd2 100644
--- a/test-files/golden-tests/temp/ct_mft_expl_inline.html
+++ b/test-files/golden-tests/temp/ct_mft_expl_inline.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -23,9 +23,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="A">
 <div>
-<h2>A</h2>
+<div>
+<h2 id="A">A</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -53,9 +53,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="A-f">
 <div>
-<h2><a href="#A">A</a>::f</h2>
+<div>
+<h2 id="A-f"><a href="#A">A</a>::f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -79,9 +79,9 @@ <h3>Synopsis</h3>
 <a href="#A-f-04"><em>» more...</em></a>
 </div>
 </div>
-<div id="A-f-07">
 <div>
-<h2><a href="#A">A</a>::f</h2>
+<div>
+<h2 id="A-f-07"><a href="#A">A</a>::f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -96,9 +96,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A-f-04">
 <div>
-<h2><a href="#A">A</a>::f&lt;int&gt;</h2>
+<div>
+<h2 id="A-f-04"><a href="#A">A</a>::f&lt;int&gt;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/temp/ct_mft_expl_outside.html b/test-files/golden-tests/temp/ct_mft_expl_outside.html
index b6271798f8..b28198cc3e 100644
--- a/test-files/golden-tests/temp/ct_mft_expl_outside.html
+++ b/test-files/golden-tests/temp/ct_mft_expl_outside.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -23,9 +23,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="A-0e">
 <div>
-<h2>A</h2>
+<div>
+<h2 id="A-0e">A</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -54,9 +54,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="A-0e-f">
 <div>
-<h2><a href="#A-0e">A</a>::f</h2>
+<div>
+<h2 id="A-0e-f"><a href="#A-0e">A</a>::f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/temp/ft_expl.html b/test-files/golden-tests/temp/ft_expl.html
index ab1ee57267..fdbb6e92d0 100644
--- a/test-files/golden-tests/temp/ft_expl.html
+++ b/test-files/golden-tests/temp/ft_expl.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -22,9 +22,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="f">
 <div>
-<h2>f</h2>
+<div>
+<h2 id="f">f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -48,9 +48,9 @@ <h3>Synopsis</h3>
 <a href="#f-0c"><em>» more...</em></a>
 </div>
 </div>
-<div id="f-03">
 <div>
-<h2>f</h2>
+<div>
+<h2 id="f-03">f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -65,9 +65,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="f-0c">
 <div>
-<h2>f&lt;int&gt;</h2>
+<div>
+<h2 id="f-0c">f&lt;int&gt;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/type-resolution.html b/test-files/golden-tests/type-resolution.html
index 9d3729ee4f..27caea91e2 100644
--- a/test-files/golden-tests/type-resolution.html
+++ b/test-files/golden-tests/type-resolution.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -132,9 +132,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="A">
 <div>
-<h2>A</h2>
+<div>
+<h2 id="A">A</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -149,9 +149,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="B">
 <div>
-<h2>B</h2>
+<div>
+<h2 id="B">B</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -169,9 +169,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="C">
 <div>
-<h2>C</h2>
+<div>
+<h2 id="C">C</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -184,9 +184,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="D">
 <div>
-<h2>D</h2>
+<div>
+<h2 id="D">D</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -199,9 +199,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="E">
 <div>
-<h2>E</h2>
+<div>
+<h2 id="E">E</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -215,9 +215,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="f0">
 <div>
-<h2>f0</h2>
+<div>
+<h2 id="f0">f0</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -231,9 +231,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="f1">
 <div>
-<h2>f1</h2>
+<div>
+<h2 id="f1">f1</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -247,9 +247,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="f2">
 <div>
-<h2>f2</h2>
+<div>
+<h2 id="f2">f2</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -263,9 +263,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="f3">
 <div>
-<h2>f3</h2>
+<div>
+<h2 id="f3">f3</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -279,9 +279,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="f4">
 <div>
-<h2>f4</h2>
+<div>
+<h2 id="f4">f4</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -295,9 +295,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="f5">
 <div>
-<h2>f5</h2>
+<div>
+<h2 id="f5">f5</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -311,9 +311,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="f6">
 <div>
-<h2>f6</h2>
+<div>
+<h2 id="f6">f6</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -327,9 +327,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="f7">
 <div>
-<h2>f7</h2>
+<div>
+<h2 id="f7">f7</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -343,9 +343,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="f8">
 <div>
-<h2>f8</h2>
+<div>
+<h2 id="f8">f8</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -359,9 +359,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="g0">
 <div>
-<h2>g0</h2>
+<div>
+<h2 id="g0">g0</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -375,9 +375,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="g1">
 <div>
-<h2>g1</h2>
+<div>
+<h2 id="g1">g1</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -391,9 +391,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="g2">
 <div>
-<h2>g2</h2>
+<div>
+<h2 id="g2">g2</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -407,9 +407,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="g3">
 <div>
-<h2>g3</h2>
+<div>
+<h2 id="g3">g3</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -423,9 +423,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="g4">
 <div>
-<h2>g4</h2>
+<div>
+<h2 id="g4">g4</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -439,9 +439,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="g5">
 <div>
-<h2>g5</h2>
+<div>
+<h2 id="g5">g5</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -455,9 +455,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="g6">
 <div>
-<h2>g6</h2>
+<div>
+<h2 id="g6">g6</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -471,9 +471,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="g7">
 <div>
-<h2>g7</h2>
+<div>
+<h2 id="g7">g7</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -487,9 +487,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="g8">
 <div>
-<h2>g8</h2>
+<div>
+<h2 id="g8">g8</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -503,9 +503,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="h0">
 <div>
-<h2>h0</h2>
+<div>
+<h2 id="h0">h0</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -519,9 +519,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="h1">
 <div>
-<h2>h1</h2>
+<div>
+<h2 id="h1">h1</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -535,9 +535,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="h2">
 <div>
-<h2>h2</h2>
+<div>
+<h2 id="h2">h2</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -551,9 +551,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="h3">
 <div>
-<h2>h3</h2>
+<div>
+<h2 id="h3">h3</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -567,9 +567,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="h4">
 <div>
-<h2>h4</h2>
+<div>
+<h2 id="h4">h4</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -583,9 +583,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="h5">
 <div>
-<h2>h5</h2>
+<div>
+<h2 id="h5">h5</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -599,9 +599,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="h6">
 <div>
-<h2>h6</h2>
+<div>
+<h2 id="h6">h6</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -615,9 +615,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="h7">
 <div>
-<h2>h7</h2>
+<div>
+<h2 id="h7">h7</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -631,9 +631,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="h8">
 <div>
-<h2>h8</h2>
+<div>
+<h2 id="h8">h8</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -647,9 +647,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="i0">
 <div>
-<h2>i0</h2>
+<div>
+<h2 id="i0">i0</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -663,9 +663,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="i1">
 <div>
-<h2>i1</h2>
+<div>
+<h2 id="i1">i1</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -679,9 +679,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="i2">
 <div>
-<h2>i2</h2>
+<div>
+<h2 id="i2">i2</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -695,9 +695,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="i3">
 <div>
-<h2>i3</h2>
+<div>
+<h2 id="i3">i3</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -711,9 +711,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="i4">
 <div>
-<h2>i4</h2>
+<div>
+<h2 id="i4">i4</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -727,9 +727,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="i5">
 <div>
-<h2>i5</h2>
+<div>
+<h2 id="i5">i5</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -743,9 +743,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="i6">
 <div>
-<h2>i6</h2>
+<div>
+<h2 id="i6">i6</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -759,9 +759,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="i7">
 <div>
-<h2>i7</h2>
+<div>
+<h2 id="i7">i7</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -775,9 +775,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="i8">
 <div>
-<h2>i8</h2>
+<div>
+<h2 id="i8">i8</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -791,9 +791,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="j0">
 <div>
-<h2>j0</h2>
+<div>
+<h2 id="j0">j0</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -807,9 +807,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="j1">
 <div>
-<h2>j1</h2>
+<div>
+<h2 id="j1">j1</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -823,9 +823,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="j2">
 <div>
-<h2>j2</h2>
+<div>
+<h2 id="j2">j2</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -839,9 +839,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="j3">
 <div>
-<h2>j3</h2>
+<div>
+<h2 id="j3">j3</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -855,9 +855,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="j4">
 <div>
-<h2>j4</h2>
+<div>
+<h2 id="j4">j4</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -871,9 +871,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="j5">
 <div>
-<h2>j5</h2>
+<div>
+<h2 id="j5">j5</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -887,9 +887,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="j6">
 <div>
-<h2>j6</h2>
+<div>
+<h2 id="j6">j6</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -903,9 +903,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="j7">
 <div>
-<h2>j7</h2>
+<div>
+<h2 id="j7">j7</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -919,9 +919,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="j8">
 <div>
-<h2>j8</h2>
+<div>
+<h2 id="j8">j8</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/union.html b/test-files/golden-tests/union.html
index 6c12dcbc2b..2065400570 100644
--- a/test-files/golden-tests/union.html
+++ b/test-files/golden-tests/union.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -25,9 +25,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="A">
 <div>
-<h2>A</h2>
+<div>
+<h2 id="A">A</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -61,9 +61,9 @@ <h2>Data Members</h2>
 
 
 </div>
-<div id="A-x">
 <div>
-<h2><a href="#A">A</a>::x</h2>
+<div>
+<h2 id="A-x"><a href="#A">A</a>::x</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -76,9 +76,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A-y">
 <div>
-<h2><a href="#A">A</a>::y</h2>
+<div>
+<h2 id="A-y"><a href="#A">A</a>::y</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -91,9 +91,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="B">
 <div>
-<h2>B</h2>
+<div>
+<h2 id="B">B</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -129,9 +129,9 @@ <h2>Data Members</h2>
 
 
 </div>
-<div id="B-x">
 <div>
-<h2><a href="#B">B</a>::x</h2>
+<div>
+<h2 id="B-x"><a href="#B">B</a>::x</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -144,9 +144,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="B-y">
 <div>
-<h2><a href="#B">B</a>::y</h2>
+<div>
+<h2 id="B-y"><a href="#B">B</a>::y</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -159,9 +159,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="B-z">
 <div>
-<h2><a href="#B">B</a>::z</h2>
+<div>
+<h2 id="B-z"><a href="#B">B</a>::z</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/using-1.html b/test-files/golden-tests/using-1.html
index 3cc06b3b36..3c6d3f02b1 100644
--- a/test-files/golden-tests/using-1.html
+++ b/test-files/golden-tests/using-1.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -40,9 +40,9 @@ <h2>Using Directives</h2>
 </div>
 
 </div>
-<div id="LongName">
 <div>
-<h2>LongName</h2>
+<div>
+<h2 id="LongName">LongName</h2>
 </div>
 </div>
 
diff --git a/test-files/golden-tests/using-2.html b/test-files/golden-tests/using-2.html
index d755d33a7e..476683e086 100644
--- a/test-files/golden-tests/using-2.html
+++ b/test-files/golden-tests/using-2.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -23,9 +23,9 @@ <h2>Namespaces</h2>
 </tbody>
 </table>
 </div>
-<div id="LongName">
 <div>
-<h2>LongName</h2>
+<div>
+<h2 id="LongName">LongName</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -43,9 +43,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="LongName-S1">
 <div>
-<h2><a href="#LongName">LongName</a>::S1</h2>
+<div>
+<h2 id="LongName-S1"><a href="#LongName">LongName</a>::S1</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -60,9 +60,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="LongName-S2">
 <div>
-<h2><a href="#LongName">LongName</a>::S2</h2>
+<div>
+<h2 id="LongName-S2"><a href="#LongName">LongName</a>::S2</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -77,9 +77,9 @@ <h3>Synopsis</h3>
 
 
 </div>
-<div id="S1">
 <div>
-<h2>S1</h2>
+<div>
+<h2 id="S1">S1</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -108,9 +108,9 @@ <h3>Introduced Symbols</h3>
 </div>
 
 </div>
-<div id="S2">
 <div>
-<h2>S2</h2>
+<div>
+<h2 id="S2">S2</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/using-3.html b/test-files/golden-tests/using-3.html
index d2dc78a768..a12eaa7d0d 100644
--- a/test-files/golden-tests/using-3.html
+++ b/test-files/golden-tests/using-3.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -27,9 +27,9 @@ <h2>Types</h2>
 </tbody>
 </table>
 </div>
-<div id="A">
 <div>
-<h2>A</h2>
+<div>
+<h2 id="A">A</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -57,9 +57,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="A-f">
 <div>
-<h2><a href="#A">A</a>::f</h2>
+<div>
+<h2 id="A-f"><a href="#A">A</a>::f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -73,9 +73,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="B">
 <div>
-<h2>B</h2>
+<div>
+<h2 id="B">B</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -103,9 +103,9 @@ <h2>Member Functions</h2>
 
 
 </div>
-<div id="B-f">
 <div>
-<h2><a href="#B">B</a>::f</h2>
+<div>
+<h2 id="B-f"><a href="#B">B</a>::f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -119,9 +119,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="C">
 <div>
-<h2>C</h2>
+<div>
+<h2 id="C">C</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -165,9 +165,9 @@ <h2>Using Declarations</h2>
 
 
 </div>
-<div id="C-f-08">
 <div>
-<h2><a href="#C">C</a>::f</h2>
+<div>
+<h2 id="C-f-08"><a href="#C">C</a>::f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -196,9 +196,9 @@ <h3>Introduced Symbols</h3>
 </div>
 
 </div>
-<div id="C-f-03">
 <div>
-<h2><a href="#C">C</a>::f</h2>
+<div>
+<h2 id="C-f-03"><a href="#C">C</a>::f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/utf-8.html b/test-files/golden-tests/utf-8.html
index 575876b496..d53a0ecc8d 100644
--- a/test-files/golden-tests/utf-8.html
+++ b/test-files/golden-tests/utf-8.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -23,9 +23,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="Христос_воскрес">
 <div>
-<h2>Христос_воскрес</h2>
+<div>
+<h2 id="Христос_воскрес">Христос_воскрес</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/var-template.html b/test-files/golden-tests/var-template.html
index 8d026684cc..fea5e1e1aa 100644
--- a/test-files/golden-tests/var-template.html
+++ b/test-files/golden-tests/var-template.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -40,9 +40,9 @@ <h2>Variables</h2>
 </tbody>
 </table>
 </div>
-<div id="A-084">
 <div>
-<h2>A</h2>
+<div>
+<h2 id="A-084">A</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -56,9 +56,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A-08e">
 <div>
-<h2>A&lt;void&gt;</h2>
+<div>
+<h2 id="A-08e">A&lt;void&gt;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -72,9 +72,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="A-01">
 <div>
-<h2>A&lt;T&&gt;</h2>
+<div>
+<h2 id="A-01">A&lt;T&&gt;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -88,9 +88,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="B">
 <div>
-<h2>B</h2>
+<div>
+<h2 id="B">B</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -122,9 +122,9 @@ <h2>Static Data Members</h2>
 
 
 </div>
-<div id="B-C-0e">
 <div>
-<h2><a href="#B">B</a>::C</h2>
+<div>
+<h2 id="B-C-0e"><a href="#B">B</a>::C</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -139,9 +139,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="B-C-05">
 <div>
-<h2><a href="#B">B</a>::C&lt;int&gt;</h2>
+<div>
+<h2 id="B-C-05"><a href="#B">B</a>::C&lt;int&gt;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -156,9 +156,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="B-C-0c">
 <div>
-<h2><a href="#B">B</a>::C&lt;T*&gt;</h2>
+<div>
+<h2 id="B-C-0c"><a href="#B">B</a>::C&lt;T*&gt;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/variadic-function.html b/test-files/golden-tests/variadic-function.html
index f92f281782..bd6c99346c 100644
--- a/test-files/golden-tests/variadic-function.html
+++ b/test-files/golden-tests/variadic-function.html
@@ -5,9 +5,9 @@
 <body>
 <div>
 <h1>Reference</h1>
-<div id="index">
 <div>
-<h2>Global namespace</h2>
+<div>
+<h2 id="index">Global namespace</h2>
 </div>
 <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
@@ -42,9 +42,9 @@ <h2>Functions</h2>
 </tbody>
 </table>
 </div>
-<div id="T">
 <div>
-<h2>T</h2>
+<div>
+<h2 id="T">T</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -57,9 +57,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="U">
 <div>
-<h2>U</h2>
+<div>
+<h2 id="U">U</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -72,9 +72,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="f">
 <div>
-<h2>f</h2>
+<div>
+<h2 id="f">f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -88,9 +88,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="g">
 <div>
-<h2>g</h2>
+<div>
+<h2 id="g">g</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -104,9 +104,9 @@ <h3>Synopsis</h3>
 </pre>
 </div>
 </div>
-<div id="C">
 <div>
-<h2>C</h2>
+<div>
+<h2 id="C">C</h2>
 </div>
 <div>
 <h3>Synopsis</h3>