From fec9bb65dc7a7cef1801f1e2ca8d555a4150889d Mon Sep 17 00:00:00 2001
From: "lina.wolf" <lwolf@w-commerce.de>
Date: Thu, 19 Sep 2024 13:47:35 +0200
Subject: [PATCH] [FEATURE] Make confvals searchable

---
 .../Confval/ConfvalTrees.rst                  |   7 +
 Documentation-rendertest/guides.xml           |   1 +
 .../template/body/directive/confval.html.twig |   4 +
 .../Typo3DocsThemeExtension.php               |   1 +
 .../src/Nodes/ConfvalMenuNode.php             |   6 +
 .../confval/confval-basic/expected/index.html |   4 +-
 .../expected/anotherDomain.html               |   4 +-
 .../expected/index.html                       |   4 +-
 .../expected/anotherDomain.html               |   4 +-
 .../confval-duplicate/expected/index.html     |   4 +-
 .../expected/index.html                       |  16 +-
 .../expected/index.html                       |  28 ++-
 .../confval-menu-tree/expected/index.html     |  59 +++---
 .../expected/anotherDomain.html               |   4 +-
 .../confval-noindex/expected/index.html       |   4 +-
 .../site-set-ext-syntax/expected/index.html   | 182 +++++++----------
 .../expected/index.html                       | 185 +++++++-----------
 .../tests/site-set-labels/expected/index.html | 185 +++++++-----------
 .../tests/site-set/expected/index.html        | 185 +++++++-----------
 19 files changed, 395 insertions(+), 492 deletions(-)

diff --git a/Documentation-rendertest/Confval/ConfvalTrees.rst b/Documentation-rendertest/Confval/ConfvalTrees.rst
index 844c8d904..500891d52 100644
--- a/Documentation-rendertest/Confval/ConfvalTrees.rst
+++ b/Documentation-rendertest/Confval/ConfvalTrees.rst
@@ -16,6 +16,7 @@ Properties of CASE
     ..  confval:: array of cObjects
         :name: case-array
         :type: cObject
+        :searchFacet: TypoScript
 
         Array of cObjects. Use this to define cObjects for the different
         values of `cobj-case-key`. If `cobj-case-key` has a certain value,
@@ -25,12 +26,14 @@ Properties of CASE
     ..  confval:: cache
         :name: case-cache
         :type: cache
+        :searchFacet: TypoScript
 
         See  for details.
 
     ..  confval:: default
         :name: case-default
         :type: cObject
+        :searchFacet: TypoScript
 
         Use this to define the rendering for *those* values of cobj-case-key that
         do *not* match any of the values of the cobj-case-array-of-cObjects. If no
@@ -40,6 +43,7 @@ Properties of CASE
     ..  confval:: if
         :name: case-if
         :type: ->if
+        :searchFacet: TypoScript
 
         If if returns false, nothing is returned.
 
@@ -55,6 +59,7 @@ Properties of COA
     ..  confval:: 1,2,3,4...
         :name: coa-array
         :type: cObject
+        :searchFacet: TCA
 
         Numbered properties to define the different cObjects, which should be
         rendered.
@@ -62,12 +67,14 @@ Properties of COA
     ..  confval:: cache
         :name: coa-cache
         :type: cache
+        :searchFacet: TCA
 
         See cache function description for details.
 
     ..  confval:: if
         :name: coa-if
         :type: ->if <if>
+        :searchFacet: TCA
 
         If `if` returns false, the COA is **not** rendered.
 
diff --git a/Documentation-rendertest/guides.xml b/Documentation-rendertest/guides.xml
index 238388760..a43c444f4 100644
--- a/Documentation-rendertest/guides.xml
+++ b/Documentation-rendertest/guides.xml
@@ -5,6 +5,7 @@
         links-are-relative="true">
     <extension class="\T3Docs\Typo3DocsTheme\DependencyInjection\Typo3DocsThemeExtension"
                typo3-core-preferred="stable"
+               confval-default="TypoScript"
     />
     <project title="TYPO3 Theme Rendering Test"
              release="main"
diff --git a/packages/typo3-docs-theme/resources/template/body/directive/confval.html.twig b/packages/typo3-docs-theme/resources/template/body/directive/confval.html.twig
index 660fc707b..ab0855580 100644
--- a/packages/typo3-docs-theme/resources/template/body/directive/confval.html.twig
+++ b/packages/typo3-docs-theme/resources/template/body/directive/confval.html.twig
@@ -1,3 +1,4 @@
+<section data-search-title="{{ node.plainContent }}" data-search-id="{{ node.anchor }}" data-search-facet="{{ renderNode(node.additionalOptions.searchFacet)|default(getSettings('confval_default')) }}">
 <dl class="confval">
     <dt{% if not node.noindex %} id="{{ node.anchor }}"{% endif %} class="d-flex justify-content-between">
         <div class="confval-header">
@@ -35,9 +36,11 @@
             </dd>
             {% endif -%}
             {%- for key, option in node.additionalOptions -%}
+                {%- if not key in ['searchFacet', 'searchKeywords']  %}
                 <dt class="field-even">{{ key }}</dt>
                 <dd class="field-even">{{  renderNode(option) }}
                 </dd>
+                {% endif -%}
             {% endfor -%}
         </dl>
         {% endif %}
@@ -46,3 +49,4 @@
         </div>
     </dd>
 </dl>
+</section>
diff --git a/packages/typo3-docs-theme/src/DependencyInjection/Typo3DocsThemeExtension.php b/packages/typo3-docs-theme/src/DependencyInjection/Typo3DocsThemeExtension.php
index 7088e98b4..34f2707c7 100644
--- a/packages/typo3-docs-theme/src/DependencyInjection/Typo3DocsThemeExtension.php
+++ b/packages/typo3-docs-theme/src/DependencyInjection/Typo3DocsThemeExtension.php
@@ -65,6 +65,7 @@ public function load(array $configs, ContainerBuilder $container): void
                         'project_issues' => $this->getConfigValue($configs, 'project_issues', ''),
                         'report_issue' => $this->getConfigValue($configs, 'report_issue', ''),
                         'typo3_core_preferred' => $this->getConfigValue($configs, 'typo3_core_preferred', ''),
+                        'confval_default' => $this->getConfigValue($configs, 'confval_default', 'Option'),
                     ],
                 ],
             );
diff --git a/packages/typo3-docs-theme/src/Nodes/ConfvalMenuNode.php b/packages/typo3-docs-theme/src/Nodes/ConfvalMenuNode.php
index c7a2aea85..e9ae43c51 100644
--- a/packages/typo3-docs-theme/src/Nodes/ConfvalMenuNode.php
+++ b/packages/typo3-docs-theme/src/Nodes/ConfvalMenuNode.php
@@ -33,6 +33,7 @@ public function __construct(
         private readonly bool $excludeNoindex = false,
         private readonly array $exclude = [],
         private readonly bool $noindex = false,
+        private readonly string $facet = 'Option',
     ) {
         parent::__construct('confval-menu', $plainContent, $content, $value);
     }
@@ -112,4 +113,9 @@ public function isNoindex(): bool
     {
         return $this->noindex;
     }
+
+    public function getFacet(): string
+    {
+        return $this->facet;
+    }
 }
diff --git a/tests/Integration/tests/confval/confval-basic/expected/index.html b/tests/Integration/tests/confval/confval-basic/expected/index.html
index cf37b2727..d0afd2e20 100644
--- a/tests/Integration/tests/confval/confval-basic/expected/index.html
+++ b/tests/Integration/tests/confval/confval-basic/expected/index.html
@@ -1,7 +1,8 @@
 <!-- content start -->
                 <section class="section" id="confval">
             <h1>Confval<a class="headerlink" href="#confval" data-bs-toggle="modal" data-bs-target="#linkReferenceModal"  title="Reference this headline">¶</a></h1>
-            <dl class="confval">
+            <section data-search-title="demo" data-search-id="confval-demo" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-demo" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">demo</span></code>
@@ -25,6 +26,7 @@ <h1>Confval<a class="headerlink" href="#confval" data-bs-toggle="modal" data-bs-
         </div>
     </dd>
 </dl>
+</section>
 
     <p>See also <a href="#confval-demo">demo</a>.</p>
 
diff --git a/tests/Integration/tests/confval/confval-duplicate-with-name/expected/anotherDomain.html b/tests/Integration/tests/confval/confval-duplicate-with-name/expected/anotherDomain.html
index 4c8077e33..b2f4be57a 100644
--- a/tests/Integration/tests/confval/confval-duplicate-with-name/expected/anotherDomain.html
+++ b/tests/Integration/tests/confval/confval-duplicate-with-name/expected/anotherDomain.html
@@ -1,7 +1,8 @@
 <!-- content start -->
                 <section class="section" id="confval-in-another-domain">
             <h1>Confval in another domain<a class="headerlink" href="#confval-in-another-domain" data-bs-toggle="modal" data-bs-target="#linkReferenceModal"  title="Reference this headline">¶</a></h1>
-            <dl class="confval">
+            <section data-search-title="demo" data-search-id="confval-another-demo" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-another-demo" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">demo</span></code>
@@ -25,5 +26,6 @@ <h1>Confval in another domain<a class="headerlink" href="#confval-in-another-dom
         </div>
     </dd>
 </dl>
+</section>
     </section>
         <!-- content end -->
diff --git a/tests/Integration/tests/confval/confval-duplicate-with-name/expected/index.html b/tests/Integration/tests/confval/confval-duplicate-with-name/expected/index.html
index 175ebee38..2b0bd4d50 100644
--- a/tests/Integration/tests/confval/confval-duplicate-with-name/expected/index.html
+++ b/tests/Integration/tests/confval/confval-duplicate-with-name/expected/index.html
@@ -1,7 +1,8 @@
 <!-- content start -->
                 <section class="section" id="confval">
             <h1>Confval<a class="headerlink" href="#confval" data-bs-toggle="modal" data-bs-target="#linkReferenceModal"  title="Reference this headline">¶</a></h1>
-            <dl class="confval">
+            <section data-search-title="demo" data-search-id="confval-demo" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-demo" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">demo</span></code>
@@ -25,6 +26,7 @@ <h1>Confval<a class="headerlink" href="#confval" data-bs-toggle="modal" data-bs-
         </div>
     </dd>
 </dl>
+</section>
 
     <p>See also <a href="#confval-demo">demo</a> and the config value in the other domain: <a href="anotherDomain.html#confval-another-demo">demo</a>.</p>
 
diff --git a/tests/Integration/tests/confval/confval-duplicate/expected/anotherDomain.html b/tests/Integration/tests/confval/confval-duplicate/expected/anotherDomain.html
index 8168bba23..3a67e68f3 100644
--- a/tests/Integration/tests/confval/confval-duplicate/expected/anotherDomain.html
+++ b/tests/Integration/tests/confval/confval-duplicate/expected/anotherDomain.html
@@ -1,7 +1,8 @@
 <!-- content start -->
                 <section class="section" id="confval-in-another-domain">
             <h1>Confval in another domain<a class="headerlink" href="#confval-in-another-domain" data-bs-toggle="modal" data-bs-target="#linkReferenceModal"  title="Reference this headline">¶</a></h1>
-            <dl class="confval">
+            <section data-search-title="demo" data-search-id="confval-demo" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-demo" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">demo</span></code>
@@ -25,5 +26,6 @@ <h1>Confval in another domain<a class="headerlink" href="#confval-in-another-dom
         </div>
     </dd>
 </dl>
+</section>
     </section>
         <!-- content end -->
diff --git a/tests/Integration/tests/confval/confval-duplicate/expected/index.html b/tests/Integration/tests/confval/confval-duplicate/expected/index.html
index 80de67a7d..aad1da6f3 100644
--- a/tests/Integration/tests/confval/confval-duplicate/expected/index.html
+++ b/tests/Integration/tests/confval/confval-duplicate/expected/index.html
@@ -1,7 +1,8 @@
 <!-- content start -->
                 <section class="section" id="confval">
             <h1>Confval<a class="headerlink" href="#confval" data-bs-toggle="modal" data-bs-target="#linkReferenceModal"  title="Reference this headline">¶</a></h1>
-            <dl class="confval">
+            <section data-search-title="demo" data-search-id="confval-demo" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-demo" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">demo</span></code>
@@ -25,6 +26,7 @@ <h1>Confval<a class="headerlink" href="#confval" data-bs-toggle="modal" data-bs-
         </div>
     </dd>
 </dl>
+</section>
 
     <p>See also <a href="anotherDomain.html#confval-demo">demo</a>.</p>
 
diff --git a/tests/Integration/tests/confval/confval-menu-tree-anchor/expected/index.html b/tests/Integration/tests/confval/confval-menu-tree-anchor/expected/index.html
index 086f9943c..ca7dfc7e1 100644
--- a/tests/Integration/tests/confval/confval-menu-tree-anchor/expected/index.html
+++ b/tests/Integration/tests/confval/confval-menu-tree-anchor/expected/index.html
@@ -45,7 +45,8 @@ <h1>Confval<a class="headerlink" href="#confval" data-bs-toggle="modal" data-bs-
             </table>
 </div>
             <a id="case-array"></a>
-                <dl class="confval">
+                <section data-search-title="array of cObjects" data-search-id="confval-case-array" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-case-array" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">array of c<wbr>Objects</span></code>
@@ -69,8 +70,10 @@ <h1>Confval<a class="headerlink" href="#confval" data-bs-toggle="modal" data-bs-
         </div>
     </dd>
 </dl>
+</section>
                 <a id="case-cache"></a>
-                <dl class="confval">
+                <section data-search-title="cache" data-search-id="confval-case-cache" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-case-cache" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">cache</span></code>
@@ -91,8 +94,10 @@ <h1>Confval<a class="headerlink" href="#confval" data-bs-toggle="modal" data-bs-
         </div>
     </dd>
 </dl>
+</section>
                 <a id="case-default"></a>
-                <dl class="confval">
+                <section data-search-title="default" data-search-id="confval-case-default" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-case-default" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">default</span></code>
@@ -116,9 +121,11 @@ <h1>Confval<a class="headerlink" href="#confval" data-bs-toggle="modal" data-bs-
         </div>
     </dd>
 </dl>
+</section>
                 <div class="rubric h2">Conditions</div>
                 <a id="case-if"></a>
-                <dl class="confval">
+                <section data-search-title="if" data-search-id="confval-case-if" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-case-if" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">if</span></code>
@@ -139,6 +146,7 @@ <h1>Confval<a class="headerlink" href="#confval" data-bs-toggle="modal" data-bs-
         </div>
     </dd>
 </dl>
+</section>
 
     </section>
         <!-- content end -->
diff --git a/tests/Integration/tests/confval/confval-menu-tree-multiple/expected/index.html b/tests/Integration/tests/confval/confval-menu-tree-multiple/expected/index.html
index 75d785858..ed8158807 100644
--- a/tests/Integration/tests/confval/confval-menu-tree-multiple/expected/index.html
+++ b/tests/Integration/tests/confval/confval-menu-tree-multiple/expected/index.html
@@ -49,7 +49,8 @@ <h2>Properties of CASE<a class="headerlink" href="#properties-of-case" data-bs-t
 
             </table>
 </div>
-            <dl class="confval">
+            <section data-search-title="array of cObjects" data-search-id="confval-case-array" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-case-array" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">array of c<wbr>Objects</span></code>
@@ -73,7 +74,9 @@ <h2>Properties of CASE<a class="headerlink" href="#properties-of-case" data-bs-t
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="cache" data-search-id="confval-case-cache" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-case-cache" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">cache</span></code>
@@ -94,7 +97,9 @@ <h2>Properties of CASE<a class="headerlink" href="#properties-of-case" data-bs-t
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="default" data-search-id="confval-case-default" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-case-default" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">default</span></code>
@@ -118,7 +123,9 @@ <h2>Properties of CASE<a class="headerlink" href="#properties-of-case" data-bs-t
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="if" data-search-id="confval-case-if" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-case-if" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">if</span></code>
@@ -139,6 +146,7 @@ <h2>Properties of CASE<a class="headerlink" href="#properties-of-case" data-bs-t
         </div>
     </dd>
 </dl>
+</section>
 
     </section>
             <section class="section" id="properties-of-coa">
@@ -179,7 +187,8 @@ <h2>Properties of COA<a class="headerlink" href="#properties-of-coa" data-bs-tog
 
             </table>
 </div>
-            <dl class="confval">
+            <section data-search-title="1,2,3,4..." data-search-id="confval-coa-array" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-coa-array" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">1,2,3,4...</span></code>
@@ -201,7 +210,9 @@ <h2>Properties of COA<a class="headerlink" href="#properties-of-coa" data-bs-tog
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="cache" data-search-id="confval-coa-cache" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-coa-cache" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">cache</span></code>
@@ -222,7 +233,9 @@ <h2>Properties of COA<a class="headerlink" href="#properties-of-coa" data-bs-tog
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="if" data-search-id="confval-coa-if" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-coa-if" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">if</span></code>
@@ -243,6 +256,7 @@ <h2>Properties of COA<a class="headerlink" href="#properties-of-coa" data-bs-tog
         </div>
     </dd>
 </dl>
+</section>
 
     </section>
     </section>
diff --git a/tests/Integration/tests/confval/confval-menu-tree/expected/index.html b/tests/Integration/tests/confval/confval-menu-tree/expected/index.html
index 3d8bc12c7..5a897bf0f 100644
--- a/tests/Integration/tests/confval/confval-menu-tree/expected/index.html
+++ b/tests/Integration/tests/confval/confval-menu-tree/expected/index.html
@@ -652,7 +652,8 @@ <h2>Confval menu as table<a class="headerlink" href="#confval-menu-as-table" dat
     </section>
             <section class="section" id="confvals">
             <h2>Confvals<a class="headerlink" href="#confvals" data-bs-toggle="modal" data-bs-target="#linkReferenceModal"  title="Reference this headline">¶</a></h2>
-            <dl class="confval">
+            <section data-search-title="demo 1" data-search-id="confval-demo-1" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-demo-1" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">demo 1</span></code>
@@ -668,9 +669,6 @@ <h2>Confvals<a class="headerlink" href="#confvals" data-bs-toggle="modal" data-b
                         <dt class="field-odd">Default</dt>
             <dd class="field-odd"><code>&quot;Hello World&quot;</code>
             </dd>
-            <dt class="field-even">Level</dt>
-                <dd class="field-even">1
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -679,7 +677,9 @@ <h2>Confvals<a class="headerlink" href="#confvals" data-bs-toggle="modal" data-b
         </div>
     </dd>
 </dl>
-            <dl class="confval">
+</section>
+            <section data-search-title="demo 2" data-search-id="confval-demo-2" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-demo-2" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">demo 2</span></code>
@@ -695,13 +695,11 @@ <h2>Confvals<a class="headerlink" href="#confvals" data-bs-toggle="modal" data-b
                         <dt class="field-odd">Default</dt>
             <dd class="field-odd"><code>&quot;Hello World&quot;</code>
             </dd>
-            <dt class="field-even">Level</dt>
-                <dd class="field-even">1
-                </dd>
             </dl>
                 <div class="confval-description">
 
     <p>Some Text</p>
+<section data-search-title="demo 2.1" data-search-id="confval-demo-2-1" data-search-facet="Option">
 <dl class="confval">
     <dt id="confval-demo-2-1" class="d-flex justify-content-between">
         <div class="confval-header">
@@ -718,13 +716,11 @@ <h2>Confvals<a class="headerlink" href="#confvals" data-bs-toggle="modal" data-b
                         <dt class="field-odd">Default</dt>
             <dd class="field-odd"><code>&quot;Hello World&quot;</code>
             </dd>
-            <dt class="field-even">Level</dt>
-                <dd class="field-even">2
-                </dd>
             </dl>
                 <div class="confval-description">
 
     <p>Some Text</p>
+<section data-search-title="demo 2.1.1" data-search-id="confval-demo-2-1-1" data-search-facet="Option">
 <dl class="confval">
     <dt id="confval-demo-2-1-1" class="d-flex justify-content-between">
         <div class="confval-header">
@@ -741,9 +737,6 @@ <h2>Confvals<a class="headerlink" href="#confvals" data-bs-toggle="modal" data-b
                         <dt class="field-odd">Default</dt>
             <dd class="field-odd"><code>&quot;Hello World&quot;</code>
             </dd>
-            <dt class="field-even">Level</dt>
-                <dd class="field-even">3
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -751,7 +744,9 @@ <h2>Confvals<a class="headerlink" href="#confvals" data-bs-toggle="modal" data-b
 
         </div>
     </dd>
-</dl><dl class="confval">
+</dl>
+</section><section data-search-title="demo 2.1.2" data-search-id="confval-demo-2-1-2" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-demo-2-1-2" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">demo 2.<wbr>1.<wbr>2</span></code>
@@ -767,9 +762,6 @@ <h2>Confvals<a class="headerlink" href="#confvals" data-bs-toggle="modal" data-b
                         <dt class="field-odd">Default</dt>
             <dd class="field-odd"><code>&quot;Hello World&quot;</code>
             </dd>
-            <dt class="field-even">Level</dt>
-                <dd class="field-even">3
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -778,9 +770,12 @@ <h2>Confvals<a class="headerlink" href="#confvals" data-bs-toggle="modal" data-b
         </div>
     </dd>
 </dl>
+</section>
         </div>
     </dd>
-</dl><dl class="confval">
+</dl>
+</section><section data-search-title="demo 2.2" data-search-id="confval-demo-2-2" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-demo-2-2" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">demo 2.<wbr>2</span></code>
@@ -796,9 +791,6 @@ <h2>Confvals<a class="headerlink" href="#confvals" data-bs-toggle="modal" data-b
                         <dt class="field-odd">Default</dt>
             <dd class="field-odd"><code>&quot;Hello World&quot;</code>
             </dd>
-            <dt class="field-even">Level</dt>
-                <dd class="field-even">2
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -807,10 +799,13 @@ <h2>Confvals<a class="headerlink" href="#confvals" data-bs-toggle="modal" data-b
         </div>
     </dd>
 </dl>
+</section>
         </div>
     </dd>
 </dl>
-            <dl class="confval">
+</section>
+            <section data-search-title="demo 3" data-search-id="confval-demo-3" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-demo-3" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">demo 3</span></code>
@@ -826,9 +821,6 @@ <h2>Confvals<a class="headerlink" href="#confvals" data-bs-toggle="modal" data-b
                         <dt class="field-odd">Default</dt>
             <dd class="field-odd"><code>&quot;Hello World&quot;</code>
             </dd>
-            <dt class="field-even">Level</dt>
-                <dd class="field-even">1
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -837,7 +829,9 @@ <h2>Confvals<a class="headerlink" href="#confvals" data-bs-toggle="modal" data-b
         </div>
     </dd>
 </dl>
-            <dl class="confval">
+</section>
+            <section data-search-title="demo 4" data-search-id="confval-demo-4" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-demo-4" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">demo 4</span></code>
@@ -853,9 +847,6 @@ <h2>Confvals<a class="headerlink" href="#confvals" data-bs-toggle="modal" data-b
                         <dt class="field-odd">Default</dt>
             <dd class="field-odd"><code>&quot;Hello World&quot;</code>
             </dd>
-            <dt class="field-even">Level</dt>
-                <dd class="field-even">1
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -864,7 +855,9 @@ <h2>Confvals<a class="headerlink" href="#confvals" data-bs-toggle="modal" data-b
         </div>
     </dd>
 </dl>
-            <dl class="confval">
+</section>
+            <section data-search-title="exclude in table" data-search-id="confval-exclude-in-table" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-exclude-in-table" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">exclude in table</span></code>
@@ -880,9 +873,6 @@ <h2>Confvals<a class="headerlink" href="#confvals" data-bs-toggle="modal" data-b
                         <dt class="field-odd">Default</dt>
             <dd class="field-odd"><code>&quot;Hello World&quot;</code>
             </dd>
-            <dt class="field-even">Level</dt>
-                <dd class="field-even">1
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -891,6 +881,7 @@ <h2>Confvals<a class="headerlink" href="#confvals" data-bs-toggle="modal" data-b
         </div>
     </dd>
 </dl>
+</section>
     </section>
     </section>
         <!-- content end -->
diff --git a/tests/Integration/tests/confval/confval-noindex/expected/anotherDomain.html b/tests/Integration/tests/confval/confval-noindex/expected/anotherDomain.html
index 8168bba23..3a67e68f3 100644
--- a/tests/Integration/tests/confval/confval-noindex/expected/anotherDomain.html
+++ b/tests/Integration/tests/confval/confval-noindex/expected/anotherDomain.html
@@ -1,7 +1,8 @@
 <!-- content start -->
                 <section class="section" id="confval-in-another-domain">
             <h1>Confval in another domain<a class="headerlink" href="#confval-in-another-domain" data-bs-toggle="modal" data-bs-target="#linkReferenceModal"  title="Reference this headline">¶</a></h1>
-            <dl class="confval">
+            <section data-search-title="demo" data-search-id="confval-demo" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-demo" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">demo</span></code>
@@ -25,5 +26,6 @@ <h1>Confval in another domain<a class="headerlink" href="#confval-in-another-dom
         </div>
     </dd>
 </dl>
+</section>
     </section>
         <!-- content end -->
diff --git a/tests/Integration/tests/confval/confval-noindex/expected/index.html b/tests/Integration/tests/confval/confval-noindex/expected/index.html
index 6d3f9f288..b8208af81 100644
--- a/tests/Integration/tests/confval/confval-noindex/expected/index.html
+++ b/tests/Integration/tests/confval/confval-noindex/expected/index.html
@@ -1,7 +1,8 @@
 <!-- content start -->
                 <section class="section" id="confval">
             <h1>Confval<a class="headerlink" href="#confval" data-bs-toggle="modal" data-bs-target="#linkReferenceModal"  title="Reference this headline">¶</a></h1>
-            <dl class="confval">
+            <section data-search-title="demo" data-search-id="confval-demo" data-search-facet="Option">
+<dl class="confval">
     <dt class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">demo</span></code>
@@ -25,6 +26,7 @@ <h1>Confval<a class="headerlink" href="#confval" data-bs-toggle="modal" data-bs-
         </div>
     </dd>
 </dl>
+</section>
 
     <p>See also <a href="anotherDomain.html#confval-demo">demo</a>.</p>
 
diff --git a/tests/Integration/tests/site-set-ext-syntax/expected/index.html b/tests/Integration/tests/site-set-ext-syntax/expected/index.html
index 2e395f17e..738a862b4 100644
--- a/tests/Integration/tests/site-set-ext-syntax/expected/index.html
+++ b/tests/Integration/tests/site-set-ext-syntax/expected/index.html
@@ -354,7 +354,8 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
 
             </table>
 </div>
-            <dl class="confval">
+            <section data-search-title="styles.content.defaultHeaderType" data-search-id="confval-fluid-styled-content-styles-content-defaultheadertype" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-fluid-styled-content-styles-content-defaultheadertype" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">styles.<wbr>content.<wbr>default<wbr>Header<wbr>Type</span></code>
@@ -378,9 +379,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">2</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Default Header type
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -389,7 +387,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="styles.content.shortcut.tables" data-search-id="confval-fluid-styled-content-styles-content-shortcut-tables" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-fluid-styled-content-styles-content-shortcut-tables" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">styles.<wbr>content.<wbr>shortcut.<wbr>tables</span></code>
@@ -413,9 +413,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">&quot;tt_<wbr>content&quot;</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">List of accepted tables
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -423,7 +420,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="styles.content.allowTags" data-search-id="confval-fluid-styled-content-styles-content-allowtags" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-fluid-styled-content-styles-content-allowtags" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">styles.<wbr>content.<wbr>allow<wbr>Tags</span></code>
@@ -447,9 +446,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">&quot;a, abbr, acronym, address, article, aside, b, bdo, big, blockquote, br, caption, center, cite, code, col, colgroup, dd, del, dfn, dl, div, dt, em, figure, font, footer, header, h1, h2, h3, h4, h5, h6, hr, i, img, ins, kbd, label, li, link, meta, nav, ol, p, pre, q, s, samp, sdfield, section, small, span, strike, strong, style, sub, sup, table, thead, tbody, tfoot, td, th, tr, title, tt, u, ul, var&quot;</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">List of allowed HTML tags when rendering RTE content
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -457,7 +453,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="styles.content.image.lazyLoading" data-search-id="confval-fluid-styled-content-styles-content-image-lazyloading" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-fluid-styled-content-styles-content-image-lazyloading" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">styles.<wbr>content.<wbr>image.<wbr>lazy<wbr>Loading</span></code>
@@ -481,16 +479,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">&quot;lazy&quot;</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Default settings for browser-native image lazy loading
-                </dd>
-            <dt class="field-even">Enum</dt>
-                <dd class="field-even">{
-    &quot;lazy&quot;: &quot;Lazy&quot;,
-    &quot;eager&quot;: &quot;Eager&quot;,
-    &quot;auto&quot;: &quot;Auto&quot;
-}
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -499,7 +487,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="styles.content.image.imageDecoding" data-search-id="confval-fluid-styled-content-styles-content-image-imagedecoding" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-fluid-styled-content-styles-content-image-imagedecoding" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">styles.<wbr>content.<wbr>image.<wbr>image<wbr>Decoding</span></code>
@@ -516,16 +506,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">string</code>
                 </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Default settings for an image decoding hint to the browser
-                </dd>
-            <dt class="field-even">Enum</dt>
-                <dd class="field-even">{
-    &quot;sync&quot;: &quot;Sync&quot;,
-    &quot;async&quot;: &quot;Asynchronous&quot;,
-    &quot;auto&quot;: &quot;Auto&quot;
-}
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -534,7 +514,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="styles.content.textmedia.maxW" data-search-id="confval-fluid-styled-content-styles-content-textmedia-maxw" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-fluid-styled-content-styles-content-textmedia-maxw" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">styles.<wbr>content.<wbr>textmedia.<wbr>max<wbr>W</span></code>
@@ -558,9 +540,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">600</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Max Image/Media Width
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -569,7 +548,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="styles.content.textmedia.maxWInText" data-search-id="confval-fluid-styled-content-styles-content-textmedia-maxwintext" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-fluid-styled-content-styles-content-textmedia-maxwintext" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">styles.<wbr>content.<wbr>textmedia.<wbr>max<wbr>WIn<wbr>Text</span></code>
@@ -593,9 +574,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">300</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Max Image/Media Width (Text)
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -604,7 +582,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="styles.content.textmedia.columnSpacing" data-search-id="confval-fluid-styled-content-styles-content-textmedia-columnspacing" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-fluid-styled-content-styles-content-textmedia-columnspacing" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">styles.<wbr>content.<wbr>textmedia.<wbr>column<wbr>Spacing</span></code>
@@ -628,9 +608,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">10</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Advanced, Column space
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -639,7 +616,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="styles.content.textmedia.rowSpacing" data-search-id="confval-fluid-styled-content-styles-content-textmedia-rowspacing" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-fluid-styled-content-styles-content-textmedia-rowspacing" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">styles.<wbr>content.<wbr>textmedia.<wbr>row<wbr>Spacing</span></code>
@@ -663,9 +642,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">10</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Advanced, Row space
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -674,7 +650,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="styles.content.textmedia.textMargin" data-search-id="confval-fluid-styled-content-styles-content-textmedia-textmargin" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-fluid-styled-content-styles-content-textmedia-textmargin" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">styles.<wbr>content.<wbr>textmedia.<wbr>text<wbr>Margin</span></code>
@@ -698,9 +676,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">10</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Advanced, Margin to text
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -709,7 +684,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="styles.content.textmedia.borderColor" data-search-id="confval-fluid-styled-content-styles-content-textmedia-bordercolor" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-fluid-styled-content-styles-content-textmedia-bordercolor" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">styles.<wbr>content.<wbr>textmedia.<wbr>border<wbr>Color</span></code>
@@ -733,9 +710,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">&quot;#000000&quot;</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Media element border, color
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -744,7 +718,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="styles.content.textmedia.borderWidth" data-search-id="confval-fluid-styled-content-styles-content-textmedia-borderwidth" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-fluid-styled-content-styles-content-textmedia-borderwidth" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">styles.<wbr>content.<wbr>textmedia.<wbr>border<wbr>Width</span></code>
@@ -768,9 +744,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">2</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Media element border, thickness
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -779,7 +752,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="styles.content.textmedia.borderPadding" data-search-id="confval-fluid-styled-content-styles-content-textmedia-borderpadding" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-fluid-styled-content-styles-content-textmedia-borderpadding" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">styles.<wbr>content.<wbr>textmedia.<wbr>border<wbr>Padding</span></code>
@@ -803,9 +778,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">0</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Media element border, padding
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -814,7 +786,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="styles.content.textmedia.linkWrap.width" data-search-id="confval-fluid-styled-content-styles-content-textmedia-linkwrap-width" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-fluid-styled-content-styles-content-textmedia-linkwrap-width" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">styles.<wbr>content.<wbr>textmedia.<wbr>link<wbr>Wrap.<wbr>width</span></code>
@@ -838,9 +812,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">&quot;800m&quot;</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Click-enlarge Media Width
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -849,7 +820,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="styles.content.textmedia.linkWrap.height" data-search-id="confval-fluid-styled-content-styles-content-textmedia-linkwrap-height" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-fluid-styled-content-styles-content-textmedia-linkwrap-height" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">styles.<wbr>content.<wbr>textmedia.<wbr>link<wbr>Wrap.<wbr>height</span></code>
@@ -873,9 +846,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">&quot;600m&quot;</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Click-enlarge Media Height
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -884,7 +854,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="styles.content.textmedia.linkWrap.newWindow" data-search-id="confval-fluid-styled-content-styles-content-textmedia-linkwrap-newwindow" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-fluid-styled-content-styles-content-textmedia-linkwrap-newwindow" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">styles.<wbr>content.<wbr>textmedia.<wbr>link<wbr>Wrap.<wbr>new<wbr>Window</span></code>
@@ -908,9 +880,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">false</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Advanced, New window
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -919,7 +888,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="styles.content.textmedia.linkWrap.lightboxEnabled" data-search-id="confval-fluid-styled-content-styles-content-textmedia-linkwrap-lightboxenabled" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-fluid-styled-content-styles-content-textmedia-linkwrap-lightboxenabled" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">styles.<wbr>content.<wbr>textmedia.<wbr>link<wbr>Wrap.<wbr>lightbox<wbr>Enabled</span></code>
@@ -943,9 +914,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">false</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Lightbox click-enlarge rendering
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -954,7 +922,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="styles.content.textmedia.linkWrap.lightboxCssClass" data-search-id="confval-fluid-styled-content-styles-content-textmedia-linkwrap-lightboxcssclass" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-fluid-styled-content-styles-content-textmedia-linkwrap-lightboxcssclass" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">styles.<wbr>content.<wbr>textmedia.<wbr>link<wbr>Wrap.<wbr>lightbox<wbr>Css<wbr>Class</span></code>
@@ -978,9 +948,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">&quot;lightbox&quot;</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Lightbox CSS class
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -989,7 +956,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="styles.content.textmedia.linkWrap.lightboxRelAttribute" data-search-id="confval-fluid-styled-content-styles-content-textmedia-linkwrap-lightboxrelattribute" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-fluid-styled-content-styles-content-textmedia-linkwrap-lightboxrelattribute" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">styles.<wbr>content.<wbr>textmedia.<wbr>link<wbr>Wrap.<wbr>lightbox<wbr>Rel<wbr>Attribute</span></code>
@@ -1013,9 +982,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">&quot;lightbox<wbr>[<wbr>{field:<wbr>uid}]&quot;</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Lightbox rel=&quot;&quot; attribute
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -1024,7 +990,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="styles.content.links.extTarget" data-search-id="confval-fluid-styled-content-styles-content-links-exttarget" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-fluid-styled-content-styles-content-links-exttarget" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">styles.<wbr>content.<wbr>links.<wbr>ext<wbr>Target</span></code>
@@ -1048,9 +1016,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">&quot;_<wbr>blank&quot;</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Target for external links
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -1058,7 +1023,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="styles.content.links.keep" data-search-id="confval-fluid-styled-content-styles-content-links-keep" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-fluid-styled-content-styles-content-links-keep" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">styles.<wbr>content.<wbr>links.<wbr>keep</span></code>
@@ -1082,9 +1049,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">&quot;path&quot;</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Parts to keep when building links
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -1093,7 +1057,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="styles.templates.templateRootPath" data-search-id="confval-fluid-styled-content-styles-templates-templaterootpath" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-fluid-styled-content-styles-templates-templaterootpath" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">styles.<wbr>templates.<wbr>template<wbr>Root<wbr>Path</span></code>
@@ -1110,9 +1076,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">string</code>
                 </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Path of Fluid Templates for all defined content elements
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -1120,7 +1083,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="styles.templates.partialRootPath" data-search-id="confval-fluid-styled-content-styles-templates-partialrootpath" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-fluid-styled-content-styles-templates-partialrootpath" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">styles.<wbr>templates.<wbr>partial<wbr>Root<wbr>Path</span></code>
@@ -1137,9 +1102,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">string</code>
                 </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Path of Fluid Partials for all defined content elements
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -1147,7 +1109,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="styles.templates.layoutRootPath" data-search-id="confval-fluid-styled-content-styles-templates-layoutrootpath" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-fluid-styled-content-styles-templates-layoutrootpath" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">styles.<wbr>templates.<wbr>layout<wbr>Root<wbr>Path</span></code>
@@ -1164,9 +1128,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">string</code>
                 </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Path of Fluid Layouts for all defined content elements
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -1174,6 +1135,7 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
+</section>
 
     </section>
         <!-- content end -->
diff --git a/tests/Integration/tests/site-set-labels-autoload/expected/index.html b/tests/Integration/tests/site-set-labels-autoload/expected/index.html
index 0b067deb0..270e36b74 100644
--- a/tests/Integration/tests/site-set-labels-autoload/expected/index.html
+++ b/tests/Integration/tests/site-set-labels-autoload/expected/index.html
@@ -368,7 +368,8 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
 
             </table>
 </div>
-            <dl class="confval">
+            <section data-search-title="felogin.pid" data-search-id="confval-felogin-felogin-pid" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-pid" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>pid</span></code>
@@ -392,9 +393,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">&quot;0&quot;</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">User Storage Page
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -403,7 +401,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.recursive" data-search-id="confval-felogin-felogin-recursive" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-recursive" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>recursive</span></code>
@@ -427,19 +427,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">&quot;0&quot;</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Recursive
-                </dd>
-            <dt class="field-even">Enum</dt>
-                <dd class="field-even">{
-    &quot;0&quot;: &quot;0&quot;,
-    &quot;1&quot;: &quot;1&quot;,
-    &quot;2&quot;: &quot;2&quot;,
-    &quot;3&quot;: &quot;3&quot;,
-    &quot;4&quot;: &quot;4&quot;,
-    &quot;255&quot;: &quot;255&quot;
-}
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -448,7 +435,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.showForgotPassword" data-search-id="confval-felogin-felogin-showforgotpassword" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-showforgotpassword" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>show<wbr>Forgot<wbr>Password</span></code>
@@ -472,9 +461,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">false</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Display Password Recovery Link
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -483,7 +469,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.showPermaLogin" data-search-id="confval-felogin-felogin-showpermalogin" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-showpermalogin" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>show<wbr>Perma<wbr>Login</span></code>
@@ -507,9 +495,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">false</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Display Remember Login Option
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -518,7 +503,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.showLogoutFormAfterLogin" data-search-id="confval-felogin-felogin-showlogoutformafterlogin" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-showlogoutformafterlogin" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>show<wbr>Logout<wbr>Form<wbr>After<wbr>Login</span></code>
@@ -542,9 +529,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">false</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Disable redirect after successful login, but display logout-form
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -553,7 +537,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.emailFrom" data-search-id="confval-felogin-felogin-emailfrom" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-emailfrom" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>email<wbr>From</span></code>
@@ -570,9 +556,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">string</code>
                 </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Email Sender Address
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -581,7 +564,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.emailFromName" data-search-id="confval-felogin-felogin-emailfromname" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-emailfromname" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>email<wbr>From<wbr>Name</span></code>
@@ -598,9 +583,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">string</code>
                 </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Email Sender Name
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -609,7 +591,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.replyToEmail" data-search-id="confval-felogin-felogin-replytoemail" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-replytoemail" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>reply<wbr>To<wbr>Email</span></code>
@@ -626,9 +610,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">string</code>
                 </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Reply-to email Address
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -637,7 +618,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.dateFormat" data-search-id="confval-felogin-felogin-dateformat" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-dateformat" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>date<wbr>Format</span></code>
@@ -661,9 +644,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">&quot;Y-<wbr>m-<wbr>d H:<wbr>i&quot;</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Date format
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -672,7 +652,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.email.layoutRootPath" data-search-id="confval-felogin-felogin-email-layoutrootpath" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-email-layoutrootpath" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>email.<wbr>layout<wbr>Root<wbr>Path</span></code>
@@ -689,9 +671,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">string</code>
                 </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Layout root path
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -700,7 +679,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.email.templateRootPath" data-search-id="confval-felogin-felogin-email-templaterootpath" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-email-templaterootpath" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>email.<wbr>template<wbr>Root<wbr>Path</span></code>
@@ -724,9 +705,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">&quot;EXT:<wbr>felogin/<wbr>Resources/<wbr>Private/<wbr>Email/<wbr>Templates/&quot;</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Template root path
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -735,7 +713,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.email.partialRootPath" data-search-id="confval-felogin-felogin-email-partialrootpath" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-email-partialrootpath" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>email.<wbr>partial<wbr>Root<wbr>Path</span></code>
@@ -752,9 +732,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">string</code>
                 </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Partial root path
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -763,7 +740,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.email.templateName" data-search-id="confval-felogin-felogin-email-templatename" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-email-templatename" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>email.<wbr>template<wbr>Name</span></code>
@@ -787,9 +766,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">&quot;Password<wbr>Recovery&quot;</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Template name for emails.
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -798,7 +774,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.redirectMode" data-search-id="confval-felogin-felogin-redirectmode" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-redirectmode" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>redirect<wbr>Mode</span></code>
@@ -815,9 +793,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">string</code>
                 </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Redirect Mode
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -826,7 +801,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.redirectFirstMethod" data-search-id="confval-felogin-felogin-redirectfirstmethod" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-redirectfirstmethod" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>redirect<wbr>First<wbr>Method</span></code>
@@ -850,9 +827,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">false</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Use First Supported Mode from Selection
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -861,7 +835,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.redirectPageLogin" data-search-id="confval-felogin-felogin-redirectpagelogin" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-redirectpagelogin" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>redirect<wbr>Page<wbr>Login</span></code>
@@ -885,9 +861,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">0</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">After Successful Login Redirect to Page
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -896,7 +869,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.redirectPageLoginError" data-search-id="confval-felogin-felogin-redirectpageloginerror" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-redirectpageloginerror" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>redirect<wbr>Page<wbr>Login<wbr>Error</span></code>
@@ -920,9 +895,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">0</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">After Failed Login Redirect to Page
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -931,7 +903,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.redirectPageLogout" data-search-id="confval-felogin-felogin-redirectpagelogout" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-redirectpagelogout" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>redirect<wbr>Page<wbr>Logout</span></code>
@@ -955,9 +929,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">0</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">After Logout Redirect to Page
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -966,7 +937,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.redirectDisable" data-search-id="confval-felogin-felogin-redirectdisable" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-redirectdisable" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>redirect<wbr>Disable</span></code>
@@ -990,9 +963,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">false</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Disable Redirect
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -1001,7 +971,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.forgotLinkHashValidTime" data-search-id="confval-felogin-felogin-forgotlinkhashvalidtime" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-forgotlinkhashvalidtime" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>forgot<wbr>Link<wbr>Hash<wbr>Valid<wbr>Time</span></code>
@@ -1025,9 +997,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">12</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Time in hours how long the link for forgot password is valid
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -1036,7 +1005,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.domains" data-search-id="confval-felogin-felogin-domains" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-domains" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>domains</span></code>
@@ -1053,9 +1024,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">string</code>
                 </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Allowed Referrer-Redirect-Domains
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -1064,7 +1032,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.exposeNonexistentUserInForgotPasswordDialog" data-search-id="confval-felogin-felogin-exposenonexistentuserinforgotpassworddialog" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-exposenonexistentuserinforgotpassworddialog" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>expose<wbr>Nonexistent<wbr>User<wbr>In<wbr>Forgot<wbr>Password<wbr>Dialog</span></code>
@@ -1088,9 +1058,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">false</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Expose existing users
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -1099,7 +1066,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.view.templateRootPath" data-search-id="confval-felogin-felogin-view-templaterootpath" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-view-templaterootpath" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>view.<wbr>template<wbr>Root<wbr>Path</span></code>
@@ -1116,9 +1085,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">string</code>
                 </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Path to template root (frontend)
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -1127,7 +1093,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.view.partialRootPath" data-search-id="confval-felogin-felogin-view-partialrootpath" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-view-partialrootpath" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>view.<wbr>partial<wbr>Root<wbr>Path</span></code>
@@ -1144,9 +1112,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">string</code>
                 </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Path to template partials (frontend)
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -1155,7 +1120,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.view.layoutRootPath" data-search-id="confval-felogin-felogin-view-layoutrootpath" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-view-layoutrootpath" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>view.<wbr>layout<wbr>Root<wbr>Path</span></code>
@@ -1172,9 +1139,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">string</code>
                 </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Path to template layouts (frontend)
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -1183,6 +1147,7 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
+</section>
 
     </section>
         <!-- content end -->
diff --git a/tests/Integration/tests/site-set-labels/expected/index.html b/tests/Integration/tests/site-set-labels/expected/index.html
index 0b067deb0..270e36b74 100644
--- a/tests/Integration/tests/site-set-labels/expected/index.html
+++ b/tests/Integration/tests/site-set-labels/expected/index.html
@@ -368,7 +368,8 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
 
             </table>
 </div>
-            <dl class="confval">
+            <section data-search-title="felogin.pid" data-search-id="confval-felogin-felogin-pid" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-pid" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>pid</span></code>
@@ -392,9 +393,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">&quot;0&quot;</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">User Storage Page
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -403,7 +401,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.recursive" data-search-id="confval-felogin-felogin-recursive" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-recursive" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>recursive</span></code>
@@ -427,19 +427,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">&quot;0&quot;</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Recursive
-                </dd>
-            <dt class="field-even">Enum</dt>
-                <dd class="field-even">{
-    &quot;0&quot;: &quot;0&quot;,
-    &quot;1&quot;: &quot;1&quot;,
-    &quot;2&quot;: &quot;2&quot;,
-    &quot;3&quot;: &quot;3&quot;,
-    &quot;4&quot;: &quot;4&quot;,
-    &quot;255&quot;: &quot;255&quot;
-}
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -448,7 +435,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.showForgotPassword" data-search-id="confval-felogin-felogin-showforgotpassword" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-showforgotpassword" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>show<wbr>Forgot<wbr>Password</span></code>
@@ -472,9 +461,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">false</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Display Password Recovery Link
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -483,7 +469,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.showPermaLogin" data-search-id="confval-felogin-felogin-showpermalogin" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-showpermalogin" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>show<wbr>Perma<wbr>Login</span></code>
@@ -507,9 +495,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">false</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Display Remember Login Option
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -518,7 +503,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.showLogoutFormAfterLogin" data-search-id="confval-felogin-felogin-showlogoutformafterlogin" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-showlogoutformafterlogin" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>show<wbr>Logout<wbr>Form<wbr>After<wbr>Login</span></code>
@@ -542,9 +529,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">false</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Disable redirect after successful login, but display logout-form
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -553,7 +537,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.emailFrom" data-search-id="confval-felogin-felogin-emailfrom" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-emailfrom" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>email<wbr>From</span></code>
@@ -570,9 +556,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">string</code>
                 </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Email Sender Address
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -581,7 +564,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.emailFromName" data-search-id="confval-felogin-felogin-emailfromname" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-emailfromname" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>email<wbr>From<wbr>Name</span></code>
@@ -598,9 +583,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">string</code>
                 </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Email Sender Name
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -609,7 +591,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.replyToEmail" data-search-id="confval-felogin-felogin-replytoemail" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-replytoemail" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>reply<wbr>To<wbr>Email</span></code>
@@ -626,9 +610,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">string</code>
                 </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Reply-to email Address
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -637,7 +618,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.dateFormat" data-search-id="confval-felogin-felogin-dateformat" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-dateformat" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>date<wbr>Format</span></code>
@@ -661,9 +644,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">&quot;Y-<wbr>m-<wbr>d H:<wbr>i&quot;</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Date format
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -672,7 +652,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.email.layoutRootPath" data-search-id="confval-felogin-felogin-email-layoutrootpath" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-email-layoutrootpath" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>email.<wbr>layout<wbr>Root<wbr>Path</span></code>
@@ -689,9 +671,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">string</code>
                 </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Layout root path
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -700,7 +679,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.email.templateRootPath" data-search-id="confval-felogin-felogin-email-templaterootpath" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-email-templaterootpath" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>email.<wbr>template<wbr>Root<wbr>Path</span></code>
@@ -724,9 +705,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">&quot;EXT:<wbr>felogin/<wbr>Resources/<wbr>Private/<wbr>Email/<wbr>Templates/&quot;</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Template root path
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -735,7 +713,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.email.partialRootPath" data-search-id="confval-felogin-felogin-email-partialrootpath" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-email-partialrootpath" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>email.<wbr>partial<wbr>Root<wbr>Path</span></code>
@@ -752,9 +732,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">string</code>
                 </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Partial root path
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -763,7 +740,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.email.templateName" data-search-id="confval-felogin-felogin-email-templatename" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-email-templatename" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>email.<wbr>template<wbr>Name</span></code>
@@ -787,9 +766,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">&quot;Password<wbr>Recovery&quot;</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Template name for emails.
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -798,7 +774,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.redirectMode" data-search-id="confval-felogin-felogin-redirectmode" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-redirectmode" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>redirect<wbr>Mode</span></code>
@@ -815,9 +793,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">string</code>
                 </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Redirect Mode
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -826,7 +801,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.redirectFirstMethod" data-search-id="confval-felogin-felogin-redirectfirstmethod" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-redirectfirstmethod" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>redirect<wbr>First<wbr>Method</span></code>
@@ -850,9 +827,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">false</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Use First Supported Mode from Selection
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -861,7 +835,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.redirectPageLogin" data-search-id="confval-felogin-felogin-redirectpagelogin" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-redirectpagelogin" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>redirect<wbr>Page<wbr>Login</span></code>
@@ -885,9 +861,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">0</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">After Successful Login Redirect to Page
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -896,7 +869,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.redirectPageLoginError" data-search-id="confval-felogin-felogin-redirectpageloginerror" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-redirectpageloginerror" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>redirect<wbr>Page<wbr>Login<wbr>Error</span></code>
@@ -920,9 +895,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">0</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">After Failed Login Redirect to Page
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -931,7 +903,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.redirectPageLogout" data-search-id="confval-felogin-felogin-redirectpagelogout" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-redirectpagelogout" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>redirect<wbr>Page<wbr>Logout</span></code>
@@ -955,9 +929,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">0</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">After Logout Redirect to Page
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -966,7 +937,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.redirectDisable" data-search-id="confval-felogin-felogin-redirectdisable" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-redirectdisable" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>redirect<wbr>Disable</span></code>
@@ -990,9 +963,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">false</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Disable Redirect
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -1001,7 +971,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.forgotLinkHashValidTime" data-search-id="confval-felogin-felogin-forgotlinkhashvalidtime" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-forgotlinkhashvalidtime" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>forgot<wbr>Link<wbr>Hash<wbr>Valid<wbr>Time</span></code>
@@ -1025,9 +997,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">12</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Time in hours how long the link for forgot password is valid
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -1036,7 +1005,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.domains" data-search-id="confval-felogin-felogin-domains" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-domains" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>domains</span></code>
@@ -1053,9 +1024,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">string</code>
                 </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Allowed Referrer-Redirect-Domains
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -1064,7 +1032,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.exposeNonexistentUserInForgotPasswordDialog" data-search-id="confval-felogin-felogin-exposenonexistentuserinforgotpassworddialog" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-exposenonexistentuserinforgotpassworddialog" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>expose<wbr>Nonexistent<wbr>User<wbr>In<wbr>Forgot<wbr>Password<wbr>Dialog</span></code>
@@ -1088,9 +1058,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">false</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Expose existing users
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -1099,7 +1066,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.view.templateRootPath" data-search-id="confval-felogin-felogin-view-templaterootpath" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-view-templaterootpath" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>view.<wbr>template<wbr>Root<wbr>Path</span></code>
@@ -1116,9 +1085,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">string</code>
                 </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Path to template root (frontend)
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -1127,7 +1093,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.view.partialRootPath" data-search-id="confval-felogin-felogin-view-partialrootpath" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-view-partialrootpath" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>view.<wbr>partial<wbr>Root<wbr>Path</span></code>
@@ -1144,9 +1112,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">string</code>
                 </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Path to template partials (frontend)
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -1155,7 +1120,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.view.layoutRootPath" data-search-id="confval-felogin-felogin-view-layoutrootpath" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-view-layoutrootpath" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>view.<wbr>layout<wbr>Root<wbr>Path</span></code>
@@ -1172,9 +1139,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">string</code>
                 </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Path to template layouts (frontend)
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -1183,6 +1147,7 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
+</section>
 
     </section>
         <!-- content end -->
diff --git a/tests/Integration/tests/site-set/expected/index.html b/tests/Integration/tests/site-set/expected/index.html
index 0b067deb0..270e36b74 100644
--- a/tests/Integration/tests/site-set/expected/index.html
+++ b/tests/Integration/tests/site-set/expected/index.html
@@ -368,7 +368,8 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
 
             </table>
 </div>
-            <dl class="confval">
+            <section data-search-title="felogin.pid" data-search-id="confval-felogin-felogin-pid" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-pid" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>pid</span></code>
@@ -392,9 +393,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">&quot;0&quot;</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">User Storage Page
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -403,7 +401,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.recursive" data-search-id="confval-felogin-felogin-recursive" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-recursive" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>recursive</span></code>
@@ -427,19 +427,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">&quot;0&quot;</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Recursive
-                </dd>
-            <dt class="field-even">Enum</dt>
-                <dd class="field-even">{
-    &quot;0&quot;: &quot;0&quot;,
-    &quot;1&quot;: &quot;1&quot;,
-    &quot;2&quot;: &quot;2&quot;,
-    &quot;3&quot;: &quot;3&quot;,
-    &quot;4&quot;: &quot;4&quot;,
-    &quot;255&quot;: &quot;255&quot;
-}
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -448,7 +435,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.showForgotPassword" data-search-id="confval-felogin-felogin-showforgotpassword" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-showforgotpassword" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>show<wbr>Forgot<wbr>Password</span></code>
@@ -472,9 +461,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">false</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Display Password Recovery Link
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -483,7 +469,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.showPermaLogin" data-search-id="confval-felogin-felogin-showpermalogin" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-showpermalogin" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>show<wbr>Perma<wbr>Login</span></code>
@@ -507,9 +495,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">false</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Display Remember Login Option
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -518,7 +503,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.showLogoutFormAfterLogin" data-search-id="confval-felogin-felogin-showlogoutformafterlogin" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-showlogoutformafterlogin" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>show<wbr>Logout<wbr>Form<wbr>After<wbr>Login</span></code>
@@ -542,9 +529,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">false</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Disable redirect after successful login, but display logout-form
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -553,7 +537,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.emailFrom" data-search-id="confval-felogin-felogin-emailfrom" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-emailfrom" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>email<wbr>From</span></code>
@@ -570,9 +556,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">string</code>
                 </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Email Sender Address
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -581,7 +564,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.emailFromName" data-search-id="confval-felogin-felogin-emailfromname" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-emailfromname" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>email<wbr>From<wbr>Name</span></code>
@@ -598,9 +583,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">string</code>
                 </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Email Sender Name
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -609,7 +591,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.replyToEmail" data-search-id="confval-felogin-felogin-replytoemail" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-replytoemail" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>reply<wbr>To<wbr>Email</span></code>
@@ -626,9 +610,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">string</code>
                 </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Reply-to email Address
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -637,7 +618,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.dateFormat" data-search-id="confval-felogin-felogin-dateformat" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-dateformat" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>date<wbr>Format</span></code>
@@ -661,9 +644,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">&quot;Y-<wbr>m-<wbr>d H:<wbr>i&quot;</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Date format
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -672,7 +652,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.email.layoutRootPath" data-search-id="confval-felogin-felogin-email-layoutrootpath" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-email-layoutrootpath" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>email.<wbr>layout<wbr>Root<wbr>Path</span></code>
@@ -689,9 +671,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">string</code>
                 </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Layout root path
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -700,7 +679,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.email.templateRootPath" data-search-id="confval-felogin-felogin-email-templaterootpath" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-email-templaterootpath" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>email.<wbr>template<wbr>Root<wbr>Path</span></code>
@@ -724,9 +705,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">&quot;EXT:<wbr>felogin/<wbr>Resources/<wbr>Private/<wbr>Email/<wbr>Templates/&quot;</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Template root path
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -735,7 +713,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.email.partialRootPath" data-search-id="confval-felogin-felogin-email-partialrootpath" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-email-partialrootpath" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>email.<wbr>partial<wbr>Root<wbr>Path</span></code>
@@ -752,9 +732,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">string</code>
                 </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Partial root path
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -763,7 +740,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.email.templateName" data-search-id="confval-felogin-felogin-email-templatename" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-email-templatename" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>email.<wbr>template<wbr>Name</span></code>
@@ -787,9 +766,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">&quot;Password<wbr>Recovery&quot;</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Template name for emails.
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -798,7 +774,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.redirectMode" data-search-id="confval-felogin-felogin-redirectmode" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-redirectmode" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>redirect<wbr>Mode</span></code>
@@ -815,9 +793,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">string</code>
                 </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Redirect Mode
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -826,7 +801,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.redirectFirstMethod" data-search-id="confval-felogin-felogin-redirectfirstmethod" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-redirectfirstmethod" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>redirect<wbr>First<wbr>Method</span></code>
@@ -850,9 +827,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">false</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Use First Supported Mode from Selection
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -861,7 +835,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.redirectPageLogin" data-search-id="confval-felogin-felogin-redirectpagelogin" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-redirectpagelogin" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>redirect<wbr>Page<wbr>Login</span></code>
@@ -885,9 +861,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">0</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">After Successful Login Redirect to Page
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -896,7 +869,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.redirectPageLoginError" data-search-id="confval-felogin-felogin-redirectpageloginerror" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-redirectpageloginerror" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>redirect<wbr>Page<wbr>Login<wbr>Error</span></code>
@@ -920,9 +895,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">0</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">After Failed Login Redirect to Page
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -931,7 +903,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.redirectPageLogout" data-search-id="confval-felogin-felogin-redirectpagelogout" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-redirectpagelogout" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>redirect<wbr>Page<wbr>Logout</span></code>
@@ -955,9 +929,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">0</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">After Logout Redirect to Page
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -966,7 +937,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.redirectDisable" data-search-id="confval-felogin-felogin-redirectdisable" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-redirectdisable" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>redirect<wbr>Disable</span></code>
@@ -990,9 +963,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">false</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Disable Redirect
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -1001,7 +971,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.forgotLinkHashValidTime" data-search-id="confval-felogin-felogin-forgotlinkhashvalidtime" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-forgotlinkhashvalidtime" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>forgot<wbr>Link<wbr>Hash<wbr>Valid<wbr>Time</span></code>
@@ -1025,9 +997,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">12</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Time in hours how long the link for forgot password is valid
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -1036,7 +1005,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.domains" data-search-id="confval-felogin-felogin-domains" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-domains" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>domains</span></code>
@@ -1053,9 +1024,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">string</code>
                 </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Allowed Referrer-Redirect-Domains
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -1064,7 +1032,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.exposeNonexistentUserInForgotPasswordDialog" data-search-id="confval-felogin-felogin-exposenonexistentuserinforgotpassworddialog" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-exposenonexistentuserinforgotpassworddialog" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>expose<wbr>Nonexistent<wbr>User<wbr>In<wbr>Forgot<wbr>Password<wbr>Dialog</span></code>
@@ -1088,9 +1058,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">false</code>
             </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Expose existing users
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -1099,7 +1066,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.view.templateRootPath" data-search-id="confval-felogin-felogin-view-templaterootpath" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-view-templaterootpath" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>view.<wbr>template<wbr>Root<wbr>Path</span></code>
@@ -1116,9 +1085,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">string</code>
                 </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Path to template root (frontend)
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -1127,7 +1093,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.view.partialRootPath" data-search-id="confval-felogin-felogin-view-partialrootpath" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-view-partialrootpath" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>view.<wbr>partial<wbr>Root<wbr>Path</span></code>
@@ -1144,9 +1112,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">string</code>
                 </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Path to template partials (frontend)
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -1155,7 +1120,9 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
-                <dl class="confval">
+</section>
+                <section data-search-title="felogin.view.layoutRootPath" data-search-id="confval-felogin-felogin-view-layoutrootpath" data-search-facet="Option">
+<dl class="confval">
     <dt id="confval-felogin-felogin-view-layoutrootpath" class="d-flex justify-content-between">
         <div class="confval-header">
         <code class="sig-name descname"><span class="pre">felogin.<wbr>view.<wbr>layout<wbr>Root<wbr>Path</span></code>
@@ -1172,9 +1139,6 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
           aria-details=""
           data-bs-html="true">string</code>
                 </dd>
-            <dt class="field-even">Label</dt>
-                <dd class="field-even">Path to template layouts (frontend)
-                </dd>
             </dl>
                 <div class="confval-description">
 
@@ -1183,6 +1147,7 @@ <h1>Site Set Configuration<a class="headerlink" href="#site-set-configuration" d
         </div>
     </dd>
 </dl>
+</section>
 
     </section>
         <!-- content end -->