diff --git a/tests/lipsum/content/04468803b92e1.nwd b/tests/lipsum/content/04468803b92e1.nwd
index f1735bb7..35a2dad3 100644
--- a/tests/lipsum/content/04468803b92e1.nwd
+++ b/tests/lipsum/content/04468803b92e1.nwd
@@ -1,11 +1,11 @@
 %%~name: Ancient Europe
 %%~path: 60bdf227455cc/04468803b92e1
 %%~kind: WORLD/NOTE
-%%~hash: b4318c2de40a1fc4055d18f8d02696b9cf171ea2
-%%~date: Unknown/Unknown
+%%~hash: 7b746485a1d06c64a5e0bf671e3141806ed51a54
+%%~date: Unknown/2024-01-30 21:36:44
 # Ancient Europe
 
-@tag: Europe
+@tag: Europe | Ancient Europe
 
 Vivamus sodales risus ac accumsan posuere. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Nunc vel enim felis. Vestibulum dignissim massa nunc, a auctor magna eleifend et. Proin dignissim sodales erat vitae convallis. Aliquam id tellus dui. Curabitur sollicitudin scelerisque ex sit amet posuere. Nam rutrum felis id rhoncus feugiat. Duis sagittis quam quis purus efficitur, quis rutrum odio iaculis. Maecenas semper ante turpis, at vulputate mi consectetur non. Sed rutrum nibh turpis, quis rhoncus purus ornare quis. Vestibulum at rutrum mauris. Integer dolor nisi, tincidunt eget vehicula ac, ultricies at ligula.
 
diff --git a/tests/lipsum/content/4c4f28287af27.nwd b/tests/lipsum/content/4c4f28287af27.nwd
index e7071bb1..4bf57987 100644
--- a/tests/lipsum/content/4c4f28287af27.nwd
+++ b/tests/lipsum/content/4c4f28287af27.nwd
@@ -1,11 +1,11 @@
 %%~name: Mr. Nobody
 %%~path: 67a8707f2f249/4c4f28287af27
 %%~kind: CHARACTER/NOTE
-%%~hash: 07a86c2001669de7d7a7545286c22b963e3ccf63
-%%~date: Unknown/Unknown
+%%~hash: 2a9b9751e8207b719bfa6233ebe04e24928ff8a8
+%%~date: Unknown/2024-01-30 21:36:26
 # Nobody Owens
 
-@tag: Bod
+@tag: Bod | Nobody Owens
 @plot: Main
 
 Pellentesque nec erat ut nulla posuere commodo. Curabitur nisi augue, imperdiet et porta imperdiet, efficitur id leo. Cras finibus arcu at nibh commodo congue. Proin suscipit placerat condimentum. Aenean ante enim, cursus id lorem a, blandit venenatis nibh. Maecenas suscipit porta elit, sit amet porta felis porttitor eu. Sed a dui nibh. Phasellus sed faucibus dui. Pellentesque felis nulla, ultrices non efficitur quis, rutrum id mi. Mauris tempus auctor nisl, in bibendum enim pellentesque sit amet. Proin nunc lacus, imperdiet nec posuere ac, interdum non lectus.
diff --git a/tests/lipsum/content/88d59a277361b.nwd b/tests/lipsum/content/88d59a277361b.nwd
index d057e90a..fd6317ac 100644
--- a/tests/lipsum/content/88d59a277361b.nwd
+++ b/tests/lipsum/content/88d59a277361b.nwd
@@ -1,10 +1,10 @@
 %%~name: Prologue
 %%~path: b3643d0f92e32/88d59a277361b
 %%~kind: NOVEL/DOCUMENT
-%%~hash: 19a2aa95b07ce10eaea753c46569929439648c63
-%%~date: Unknown/Unknown
+%%~hash: 5f965566ba82bbb83b8aa24f3ab7efde0c5e61cf
+%%~date: Unknown/2024-01-30 21:36:00
 ##! Prologue
 
-% Synopsis:Explanation from the lipsum.com website.
+% Synopsis: Explanation from the lipsum.com website.
 
 _Lorem Ipsum_ is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.
diff --git a/tests/lipsum/content/fb609cd8319dc.nwd b/tests/lipsum/content/fb609cd8319dc.nwd
index 1ae2272f..10e465ae 100644
--- a/tests/lipsum/content/fb609cd8319dc.nwd
+++ b/tests/lipsum/content/fb609cd8319dc.nwd
@@ -2,7 +2,7 @@
 %%~path: 45e6b01ca35c1/fb609cd8319dc
 %%~kind: NOVEL/DOCUMENT
 %%~hash: 5dabeaa7a58238a6ad99ce73176b1bdfad1a71b7
-%%~date: Unknown/Unknown
+%%~date: Unknown/2024-01-30 21:35:57
 ## Chapter One
 
 @pov: Bod
diff --git a/tests/lipsum/nwProject.nwx b/tests/lipsum/nwProject.nwx
index 1c643caf..66aa29e5 100644
--- a/tests/lipsum/nwProject.nwx
+++ b/tests/lipsum/nwProject.nwx
@@ -1,8 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="2.1-beta1" hexVersion="0x020100b1" fileVersion="1.5" fileRevision="1" timeStamp="2023-08-25 18:03:37">
-  <project id="5ac0df12-8b8b-476b-9905-21d33685687c" saveCount="43" autoCount="24" editTime="1935">
+<novelWriterXML appVersion="2.3a3" hexVersion="0x020300a3" fileVersion="1.5" fileRevision="2" timeStamp="2024-01-30 21:37:01">
+  <project id="5ac0df12-8b8b-476b-9905-21d33685687c" saveCount="44" autoCount="25" editTime="2039">
     <name>Lorem Ipsum</name>
-    <title>Lorem Ipsum</title>
     <author>lipsum.com</author>
   </project>
   <settings>
@@ -46,7 +45,7 @@
       <name status="sedd043" import="i613591" active="yes">Front Matter</name>
     </item>
     <item handle="88d59a277361b" parent="b3643d0f92e32" root="b3643d0f92e32" order="2" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta expanded="no" heading="H2" charCount="584" wordCount="92" paraCount="1" cursorPos="4" />
+      <meta expanded="no" heading="H2" charCount="584" wordCount="92" paraCount="1" cursorPos="16" />
       <name status="s92a87b" import="i613591" active="yes">Prologue</name>
     </item>
     <item handle="db7e733775d4d" parent="b3643d0f92e32" root="b3643d0f92e32" order="3" type="FILE" class="NOVEL" layout="DOCUMENT">
@@ -58,11 +57,11 @@
       <name status="s92a87b" import="i613591">Chapter One</name>
     </item>
     <item handle="fb609cd8319dc" parent="45e6b01ca35c1" root="b3643d0f92e32" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta expanded="no" heading="H2" charCount="419" wordCount="67" paraCount="1" cursorPos="56" />
+      <meta expanded="no" heading="H2" charCount="419" wordCount="67" paraCount="1" cursorPos="59" />
       <name status="s92a87b" import="i613591" active="yes">Chapter One</name>
     </item>
     <item handle="88243afbe5ed8" parent="45e6b01ca35c1" root="b3643d0f92e32" order="1" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta expanded="no" heading="H3" charCount="2758" wordCount="404" paraCount="4" cursorPos="1528" />
+      <meta expanded="no" heading="H3" charCount="2758" wordCount="404" paraCount="4" cursorPos="57" />
       <name status="sedd043" import="i613591" active="yes">Scene One</name>
     </item>
     <item handle="f96ec11c6a3da" parent="45e6b01ca35c1" root="b3643d0f92e32" order="2" type="FILE" class="NOVEL" layout="DOCUMENT">
@@ -98,7 +97,7 @@
       <name status="sbaa94f" import="i613591">Characters</name>
     </item>
     <item handle="4c4f28287af27" parent="67a8707f2f249" root="67a8707f2f249" order="0" type="FILE" class="CHARACTER" layout="NOTE">
-      <meta expanded="no" heading="H1" charCount="1864" wordCount="284" paraCount="3" cursorPos="1883" />
+      <meta expanded="no" heading="H1" charCount="1864" wordCount="284" paraCount="3" cursorPos="40" />
       <name status="sbaa94f" import="i613591" active="yes">Mr. Nobody</name>
     </item>
     <item handle="6c6afb1247750" parent="None" root="6c6afb1247750" order="2" type="ROOT" class="PLOT">
@@ -114,7 +113,7 @@
       <name status="sbaa94f" import="i613591">World</name>
     </item>
     <item handle="04468803b92e1" parent="60bdf227455cc" root="60bdf227455cc" order="0" type="FILE" class="WORLD" layout="NOTE">
-      <meta expanded="no" heading="H1" charCount="1770" wordCount="259" paraCount="3" cursorPos="1792" />
+      <meta expanded="no" heading="H1" charCount="1770" wordCount="259" paraCount="3" cursorPos="47" />
       <name status="sbaa94f" import="i613591" active="yes">Ancient Europe</name>
     </item>
   </content>
diff --git a/tests/reference/coreIndex_LoadSave_tagsIndex.json b/tests/reference/coreIndex_LoadSave_tagsIndex.json
index a6f07969..4c10214a 100644
--- a/tests/reference/coreIndex_LoadSave_tagsIndex.json
+++ b/tests/reference/coreIndex_LoadSave_tagsIndex.json
@@ -1,8 +1,8 @@
 {
   "novelWriter.tagsIndex": {
-    "bod": {"name": "Bod", "display": "Bod", "handle": "4c4f28287af27", "heading": "T0001", "class": "CHARACTER"},
+    "bod": {"name": "Bod", "display": "Nobody Owens", "handle": "4c4f28287af27", "heading": "T0001", "class": "CHARACTER"},
     "main": {"name": "Main", "display": "Main", "handle": "2426c6f0ca922", "heading": "T0001", "class": "PLOT"},
-    "europe": {"name": "Europe", "display": "Europe", "handle": "04468803b92e1", "heading": "T0001", "class": "WORLD"}
+    "europe": {"name": "Europe", "display": "Ancient Europe", "handle": "04468803b92e1", "heading": "T0001", "class": "WORLD"}
   },
   "novelWriter.itemIndex": {
     "7a992350f3eb6": {
diff --git a/tests/reference/mBuildDocBuild_Extended_Markdown_Lorem_Ipsum.md b/tests/reference/mBuildDocBuild_Extended_Markdown_Lorem_Ipsum.md
index 9149335a..9690f4db 100644
--- a/tests/reference/mBuildDocBuild_Extended_Markdown_Lorem_Ipsum.md
+++ b/tests/reference/mBuildDocBuild_Extended_Markdown_Lorem_Ipsum.md
@@ -150,7 +150,7 @@ Integer egestas maximus leo eu facilisis. Nunc rhoncus dignissim lectus eu lacin
 
 # Nobody Owens
 
-**Tag:** Bod  
+**Tag:** Bod | Nobody Owens  
 **Plot:** Main
 
 Pellentesque nec erat ut nulla posuere commodo. Curabitur nisi augue, imperdiet et porta imperdiet, efficitur id leo. Cras finibus arcu at nibh commodo congue. Proin suscipit placerat condimentum. Aenean ante enim, cursus id lorem a, blandit venenatis nibh. Maecenas suscipit porta elit, sit amet porta felis porttitor eu. Sed a dui nibh. Phasellus sed faucibus dui. Pellentesque felis nulla, ultrices non efficitur quis, rutrum id mi. Mauris tempus auctor nisl, in bibendum enim pellentesque sit amet. Proin nunc lacus, imperdiet nec posuere ac, interdum non lectus.
@@ -173,7 +173,7 @@ Mauris ut erat eu lorem malesuada egestas vel vel urna. Maecenas ac semper quam.
 
 # Ancient Europe
 
-**Tag:** Europe
+**Tag:** Europe | Ancient Europe
 
 Vivamus sodales risus ac accumsan posuere. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Nunc vel enim felis. Vestibulum dignissim massa nunc, a auctor magna eleifend et. Proin dignissim sodales erat vitae convallis. Aliquam id tellus dui. Curabitur sollicitudin scelerisque ex sit amet posuere. Nam rutrum felis id rhoncus feugiat. Duis sagittis quam quis purus efficitur, quis rutrum odio iaculis. Maecenas semper ante turpis, at vulputate mi consectetur non. Sed rutrum nibh turpis, quis rhoncus purus ornare quis. Vestibulum at rutrum mauris. Integer dolor nisi, tincidunt eget vehicula ac, ultricies at ligula.
 
diff --git a/tests/reference/mBuildDocBuild_HTML5_Lorem_Ipsum.htm b/tests/reference/mBuildDocBuild_HTML5_Lorem_Ipsum.htm
index b1f7bead..f3463792 100644
--- a/tests/reference/mBuildDocBuild_HTML5_Lorem_Ipsum.htm
+++ b/tests/reference/mBuildDocBuild_HTML5_Lorem_Ipsum.htm
@@ -104,7 +104,7 @@ a {color: rgb(66, 113, 174);}
 <p>Integer egestas maximus leo eu facilisis. Nunc rhoncus dignissim lectus eu lacinia. Praesent lacinia urna porttitor aliquam condimentum. Nulla eu eros dictum, dictum nunc vitae, sagittis nibh. Integer ante neque, consequat nec sollicitudin id, consectetur vitae dolor. Nullam volutpat sem orci, quis viverra magna auctor a. Suspendisse potenti. Maecenas commodo sed neque pellentesque vehicula. Sed luctus nisl risus, elementum semper purus interdum vel. Ut pulvinar, massa sit amet venenatis placerat, nunc lacus hendrerit odio, non aliquet nunc risus eu lectus. Maecenas feugiat semper ligula, id lobortis sem porta eu. Integer posuere elit magna, at mollis eros bibendum et. Ut imperdiet purus vel nulla aliquam maximus. Morbi sodales purus tellus, a rhoncus sem rutrum sit amet. Quisque risus sem, laoreet nec convallis nec, rutrum vitae justo.</p>
 <h1 class='title' style='text-align: center; page-break-before: always;'>Notes: Characters</h1>
 <h1>Nobody Owens</h1>
-<p style='margin-bottom: 0;'><span class='tags'>Tag:</span> <a name='tag_Bod'>Bod</a></p>
+<p style='margin-bottom: 0;'><span class='tags'>Tag:</span> <a name='tag_Bod'>Bod</a> | <span class='optional'>Nobody Owens</a></p>
 <p style='margin-top: 0;'><span class='tags'>Plot:</span> <a href='#tag_Main'>Main</a></p>
 <p>Pellentesque nec erat ut nulla posuere commodo. Curabitur nisi augue, imperdiet et porta imperdiet, efficitur id leo. Cras finibus arcu at nibh commodo congue. Proin suscipit placerat condimentum. Aenean ante enim, cursus id lorem a, blandit venenatis nibh. Maecenas suscipit porta elit, sit amet porta felis porttitor eu. Sed a dui nibh. Phasellus sed faucibus dui. Pellentesque felis nulla, ultrices non efficitur quis, rutrum id mi. Mauris tempus auctor nisl, in bibendum enim pellentesque sit amet. Proin nunc lacus, imperdiet nec posuere ac, interdum non lectus.</p>
 <p>Suspendisse faucibus est auctor orci mollis luctus. Praesent quis sodales neque. Interdum et malesuada fames ac ante ipsum primis in faucibus. Donec sodales rutrum mattis. In in sem ornare, consequat nulla ac, convallis arcu. Duis ac metus id felis commodo commodo sit amet eget diam. Curabitur rhoncus lacinia leo at sodales. Etiam finibus porta diam a viverra. Praesent nisi urna, volutpat sit amet odio at, vehicula vehicula leo. In non enim eget nisl luctus commodo. Pellentesque pellentesque at lectus at luctus. Quisque nec felis bibendum, lacinia libero ut, lacinia eros. Integer finibus ultricies nibh sit amet placerat.</p>
@@ -116,7 +116,7 @@ a {color: rgb(66, 113, 174);}
 <p>Mauris ut erat eu lorem malesuada egestas vel vel urna. Maecenas ac semper quam. Maecenas aliquet metus non interdum mattis. Proin consectetur molestie ligula. Aliquam sollicitudin pulvinar urna a pellentesque. Suspendisse ultrices, est mattis scelerisque porta, nisi nisi laoreet nisl, non condimentum quam ante a velit. Proin scelerisque justo augue, nec laoreet ligula egestas at. Etiam enim quam, ultrices non accumsan hendrerit, elementum vel ligula. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nam efficitur odio libero, in vestibulum arcu aliquam at. Cras non vehicula augue. Integer lobortis, est vitae aliquam facilisis, metus ligula aliquet eros, at porttitor sem tortor eget massa. Aliquam varius scelerisque neque sed gravida. Aenean eleifend lorem id ante elementum sollicitudin. Proin commodo massa a quam volutpat, mollis fermentum turpis efficitur.</p>
 <h1 class='title' style='text-align: center; page-break-before: always;'>Notes: World</h1>
 <h1>Ancient Europe</h1>
-<p><span class='tags'>Tag:</span> <a name='tag_Europe'>Europe</a></p>
+<p><span class='tags'>Tag:</span> <a name='tag_Europe'>Europe</a> | <span class='optional'>Ancient Europe</a></p>
 <p>Vivamus sodales risus ac accumsan posuere. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Nunc vel enim felis. Vestibulum dignissim massa nunc, a auctor magna eleifend et. Proin dignissim sodales erat vitae convallis. Aliquam id tellus dui. Curabitur sollicitudin scelerisque ex sit amet posuere. Nam rutrum felis id rhoncus feugiat. Duis sagittis quam quis purus efficitur, quis rutrum odio iaculis. Maecenas semper ante turpis, at vulputate mi consectetur non. Sed rutrum nibh turpis, quis rhoncus purus ornare quis. Vestibulum at rutrum mauris. Integer dolor nisi, tincidunt eget vehicula ac, ultricies at ligula.</p>
 <p>Aenean semper turpis quis varius rhoncus. Vivamus ac mi eget felis euismod vulputate. Nam eu tempus velit. Etiam ut est porta, finibus erat sit amet, consectetur felis. Nullam consequat felis ut lacus pharetra, in lobortis urna mollis. Nulla varius eros nec lorem rhoncus, sed venenatis risus ultrices. Phasellus pellentesque laoreet neque, ut ultricies lacus vulputate quis. In malesuada dui sit amet est interdum, eget consectetur mi gravida. Cras vel bibendum purus. Quisque commodo tempor arcu, non lacinia sem blandit eleifend. Quisque at neque gravida, porttitor metus a, suscipit diam. Quisque convallis sodales lacus et condimentum. Donec a suscipit diam. Pellentesque eget cursus neque.</p>
 <p>Nunc ullamcorper magna quis elit condimentum rhoncus. Aenean dictum pulvinar dolor suscipit interdum. Aliquam elit massa, elementum nec cursus eu, maximus nec ipsum. Donec ullamcorper iaculis dolor eu commodo. Nunc eget tortor quis turpis consectetur varius. Vestibulum nec justo vel tellus venenatis condimentum. Duis auctor iaculis massa. Nunc risus magna, rutrum vitae eros non, tristique mollis enim.</p>
diff --git a/tests/reference/mBuildDocBuild_HTML5_Lorem_Ipsum.json b/tests/reference/mBuildDocBuild_HTML5_Lorem_Ipsum.json
index 7c315e5a..50ae4237 100644
--- a/tests/reference/mBuildDocBuild_HTML5_Lorem_Ipsum.json
+++ b/tests/reference/mBuildDocBuild_HTML5_Lorem_Ipsum.json
@@ -2,8 +2,8 @@
   "meta": {
     "projectName": "Lorem Ipsum",
     "novelAuthor": "lipsum.com",
-    "buildTime": 1706306020,
-    "buildTimeStr": "2024-01-26 22:53:40"
+    "buildTime": 1706648755,
+    "buildTimeStr": "2024-01-30 22:05:55"
   },
   "text": {
     "css": [
@@ -132,7 +132,7 @@
       ],
       [
         "<h1>Nobody Owens</h1>",
-        "<p style='margin-bottom: 0;'><span class='tags'>Tag:</span> <a name='tag_Bod'>Bod</a></p>",
+        "<p style='margin-bottom: 0;'><span class='tags'>Tag:</span> <a name='tag_Bod'>Bod</a> | <span class='optional'>Nobody Owens</a></p>",
         "<p style='margin-top: 0;'><span class='tags'>Plot:</span> <a href='#tag_Main'>Main</a></p>",
         "<p>Pellentesque nec erat ut nulla posuere commodo. Curabitur nisi augue, imperdiet et porta imperdiet, efficitur id leo. Cras finibus arcu at nibh commodo congue. Proin suscipit placerat condimentum. Aenean ante enim, cursus id lorem a, blandit venenatis nibh. Maecenas suscipit porta elit, sit amet porta felis porttitor eu. Sed a dui nibh. Phasellus sed faucibus dui. Pellentesque felis nulla, ultrices non efficitur quis, rutrum id mi. Mauris tempus auctor nisl, in bibendum enim pellentesque sit amet. Proin nunc lacus, imperdiet nec posuere ac, interdum non lectus.</p>",
         "<p>Suspendisse faucibus est auctor orci mollis luctus. Praesent quis sodales neque. Interdum et malesuada fames ac ante ipsum primis in faucibus. Donec sodales rutrum mattis. In in sem ornare, consequat nulla ac, convallis arcu. Duis ac metus id felis commodo commodo sit amet eget diam. Curabitur rhoncus lacinia leo at sodales. Etiam finibus porta diam a viverra. Praesent nisi urna, volutpat sit amet odio at, vehicula vehicula leo. In non enim eget nisl luctus commodo. Pellentesque pellentesque at lectus at luctus. Quisque nec felis bibendum, lacinia libero ut, lacinia eros. Integer finibus ultricies nibh sit amet placerat.</p>",
@@ -152,7 +152,7 @@
       ],
       [
         "<h1>Ancient Europe</h1>",
-        "<p><span class='tags'>Tag:</span> <a name='tag_Europe'>Europe</a></p>",
+        "<p><span class='tags'>Tag:</span> <a name='tag_Europe'>Europe</a> | <span class='optional'>Ancient Europe</a></p>",
         "<p>Vivamus sodales risus ac accumsan posuere. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Nunc vel enim felis. Vestibulum dignissim massa nunc, a auctor magna eleifend et. Proin dignissim sodales erat vitae convallis. Aliquam id tellus dui. Curabitur sollicitudin scelerisque ex sit amet posuere. Nam rutrum felis id rhoncus feugiat. Duis sagittis quam quis purus efficitur, quis rutrum odio iaculis. Maecenas semper ante turpis, at vulputate mi consectetur non. Sed rutrum nibh turpis, quis rhoncus purus ornare quis. Vestibulum at rutrum mauris. Integer dolor nisi, tincidunt eget vehicula ac, ultricies at ligula.</p>",
         "<p>Aenean semper turpis quis varius rhoncus. Vivamus ac mi eget felis euismod vulputate. Nam eu tempus velit. Etiam ut est porta, finibus erat sit amet, consectetur felis. Nullam consequat felis ut lacus pharetra, in lobortis urna mollis. Nulla varius eros nec lorem rhoncus, sed venenatis risus ultrices. Phasellus pellentesque laoreet neque, ut ultricies lacus vulputate quis. In malesuada dui sit amet est interdum, eget consectetur mi gravida. Cras vel bibendum purus. Quisque commodo tempor arcu, non lacinia sem blandit eleifend. Quisque at neque gravida, porttitor metus a, suscipit diam. Quisque convallis sodales lacus et condimentum. Donec a suscipit diam. Pellentesque eget cursus neque.</p>",
         "<p>Nunc ullamcorper magna quis elit condimentum rhoncus. Aenean dictum pulvinar dolor suscipit interdum. Aliquam elit massa, elementum nec cursus eu, maximus nec ipsum. Donec ullamcorper iaculis dolor eu commodo. Nunc eget tortor quis turpis consectetur varius. Vestibulum nec justo vel tellus venenatis condimentum. Duis auctor iaculis massa. Nunc risus magna, rutrum vitae eros non, tristique mollis enim.</p>"
diff --git a/tests/reference/mBuildDocBuild_NWD_Lorem_Ipsum.json b/tests/reference/mBuildDocBuild_NWD_Lorem_Ipsum.json
index 06633aa2..0a5189be 100644
--- a/tests/reference/mBuildDocBuild_NWD_Lorem_Ipsum.json
+++ b/tests/reference/mBuildDocBuild_NWD_Lorem_Ipsum.json
@@ -2,8 +2,8 @@
   "meta": {
     "projectName": "Lorem Ipsum",
     "novelAuthor": "lipsum.com",
-    "buildTime": 1706306020,
-    "buildTimeStr": "2024-01-26 22:53:40"
+    "buildTime": 1706648873,
+    "buildTimeStr": "2024-01-30 22:07:53"
   },
   "text": {
     "nwd": [
@@ -27,7 +27,7 @@
       [
         "##! Prologue",
         "",
-        "% Synopsis:Explanation from the lipsum.com website.",
+        "% Synopsis: Explanation from the lipsum.com website.",
         "",
         "_Lorem Ipsum_ is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum."
       ],
@@ -174,7 +174,7 @@
       [
         "# Nobody Owens",
         "",
-        "@tag: Bod",
+        "@tag: Bod | Nobody Owens",
         "@plot: Main",
         "",
         "Pellentesque nec erat ut nulla posuere commodo. Curabitur nisi augue, imperdiet et porta imperdiet, efficitur id leo. Cras finibus arcu at nibh commodo congue. Proin suscipit placerat condimentum. Aenean ante enim, cursus id lorem a, blandit venenatis nibh. Maecenas suscipit porta elit, sit amet porta felis porttitor eu. Sed a dui nibh. Phasellus sed faucibus dui. Pellentesque felis nulla, ultrices non efficitur quis, rutrum id mi. Mauris tempus auctor nisl, in bibendum enim pellentesque sit amet. Proin nunc lacus, imperdiet nec posuere ac, interdum non lectus.",
@@ -201,7 +201,7 @@
       [
         "# Ancient Europe",
         "",
-        "@tag: Europe",
+        "@tag: Europe | Ancient Europe",
         "",
         "Vivamus sodales risus ac accumsan posuere. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Nunc vel enim felis. Vestibulum dignissim massa nunc, a auctor magna eleifend et. Proin dignissim sodales erat vitae convallis. Aliquam id tellus dui. Curabitur sollicitudin scelerisque ex sit amet posuere. Nam rutrum felis id rhoncus feugiat. Duis sagittis quam quis purus efficitur, quis rutrum odio iaculis. Maecenas semper ante turpis, at vulputate mi consectetur non. Sed rutrum nibh turpis, quis rhoncus purus ornare quis. Vestibulum at rutrum mauris. Integer dolor nisi, tincidunt eget vehicula ac, ultricies at ligula.",
         "",
diff --git a/tests/reference/mBuildDocBuild_NWD_Lorem_Ipsum.txt b/tests/reference/mBuildDocBuild_NWD_Lorem_Ipsum.txt
index f0e030c7..139d0aec 100644
--- a/tests/reference/mBuildDocBuild_NWD_Lorem_Ipsum.txt
+++ b/tests/reference/mBuildDocBuild_NWD_Lorem_Ipsum.txt
@@ -15,7 +15,7 @@ The standard chunk of Lorem Ipsum used since the 1500s is reproduced below for t
 
 ##! Prologue
 
-% Synopsis:Explanation from the lipsum.com website.
+% Synopsis: Explanation from the lipsum.com website.
 
 _Lorem Ipsum_ is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.
 
@@ -77,11 +77,11 @@ Ut et consequat enim, quis ornare nibh. In lectus neque, mollis et suscipit et,
 
 % Exctracted from the lipsum.com website.
 
-	It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout.
+    It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout.
 
-	The point of using Lorem Ipsum is that it has a more-or-less normal distribution of letters, as opposed to using 'Content here, content here', making it look like readable English.
+    The point of using Lorem Ipsum is that it has a more-or-less normal distribution of letters, as opposed to using 'Content here, content here', making it look like readable English.
 
-	Many desktop publishing packages and web page editors now use Lorem Ipsum as their default model text, and a search for 'lorem ipsum' will uncover many web sites still in their infancy. Various versions have evolved over the years, sometimes by accident, sometimes on purpose (injected humour and the like).
+    Many desktop publishing packages and web page editors now use Lorem Ipsum as their default model text, and a search for 'lorem ipsum' will uncover many web sites still in their infancy. Various versions have evolved over the years, sometimes by accident, sometimes on purpose (injected humour and the like).
 
 ## Chapter Two
 
@@ -151,7 +151,7 @@ Integer egestas maximus leo eu facilisis. Nunc rhoncus dignissim lectus eu lacin
 
 # Nobody Owens
 
-@tag: Bod
+@tag: Bod | Nobody Owens
 @plot: Main
 
 Pellentesque nec erat ut nulla posuere commodo. Curabitur nisi augue, imperdiet et porta imperdiet, efficitur id leo. Cras finibus arcu at nibh commodo congue. Proin suscipit placerat condimentum. Aenean ante enim, cursus id lorem a, blandit venenatis nibh. Maecenas suscipit porta elit, sit amet porta felis porttitor eu. Sed a dui nibh. Phasellus sed faucibus dui. Pellentesque felis nulla, ultrices non efficitur quis, rutrum id mi. Mauris tempus auctor nisl, in bibendum enim pellentesque sit amet. Proin nunc lacus, imperdiet nec posuere ac, interdum non lectus.
@@ -174,7 +174,7 @@ Mauris ut erat eu lorem malesuada egestas vel vel urna. Maecenas ac semper quam.
 
 # Ancient Europe
 
-@tag: Europe
+@tag: Europe | Ancient Europe
 
 Vivamus sodales risus ac accumsan posuere. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Nunc vel enim felis. Vestibulum dignissim massa nunc, a auctor magna eleifend et. Proin dignissim sodales erat vitae convallis. Aliquam id tellus dui. Curabitur sollicitudin scelerisque ex sit amet posuere. Nam rutrum felis id rhoncus feugiat. Duis sagittis quam quis purus efficitur, quis rutrum odio iaculis. Maecenas semper ante turpis, at vulputate mi consectetur non. Sed rutrum nibh turpis, quis rhoncus purus ornare quis. Vestibulum at rutrum mauris. Integer dolor nisi, tincidunt eget vehicula ac, ultricies at ligula.
 
diff --git a/tests/reference/mBuildDocBuild_OpenDocument_Lorem_Ipsum.fodt b/tests/reference/mBuildDocBuild_OpenDocument_Lorem_Ipsum.fodt
index 1c5ccd36..f71c450f 100644
--- a/tests/reference/mBuildDocBuild_OpenDocument_Lorem_Ipsum.fodt
+++ b/tests/reference/mBuildDocBuild_OpenDocument_Lorem_Ipsum.fodt
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='utf-8'?>
 <office:document xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
   <office:meta>
-    <meta:creation-date>2023-07-19T23:55:28</meta:creation-date>
-    <meta:generator>novelWriter/2.1-beta1</meta:generator>
+    <meta:creation-date>2024-01-30T21:56:12</meta:creation-date>
+    <meta:generator>novelWriter/2.3a3</meta:generator>
     <meta:initial-creator>lipsum.com</meta:initial-creator>
-    <meta:editing-cycles>42</meta:editing-cycles>
-    <meta:editing-duration>P0DT0H31M53S</meta:editing-duration>
+    <meta:editing-cycles>44</meta:editing-cycles>
+    <meta:editing-duration>P0DT0H33M59S</meta:editing-duration>
     <dc:title>Lorem Ipsum</dc:title>
-    <dc:date>2023-07-19T23:55:28</dc:date>
+    <dc:date>2024-01-30T21:56:12</dc:date>
     <dc:creator>lipsum.com</dc:creator>
   </office:meta>
   <office:font-face-decls>
@@ -192,7 +192,7 @@
       <text:p text:style-name="Text_20_body">Integer egestas maximus leo eu facilisis. Nunc rhoncus dignissim lectus eu lacinia. Praesent lacinia urna porttitor aliquam condimentum. Nulla eu eros dictum, dictum nunc vitae, sagittis nibh. Integer ante neque, consequat nec sollicitudin id, consectetur vitae dolor. Nullam volutpat sem orci, quis viverra magna auctor a. Suspendisse potenti. Maecenas commodo sed neque pellentesque vehicula. Sed luctus nisl risus, elementum semper purus interdum vel. Ut pulvinar, massa sit amet venenatis placerat, nunc lacus hendrerit odio, non aliquet nunc risus eu lectus. Maecenas feugiat semper ligula, id lobortis sem porta eu. Integer posuere elit magna, at mollis eros bibendum et. Ut imperdiet purus vel nulla aliquam maximus. Morbi sodales purus tellus, a rhoncus sem rutrum sit amet. Quisque risus sem, laoreet nec convallis nec, rutrum vitae justo.</text:p>
       <text:p text:style-name="P7">Notes: Characters</text:p>
       <text:h text:style-name="Heading_20_1" text:outline-level="1">Nobody Owens</text:h>
-      <text:p text:style-name="P5"><text:span text:style-name="T1">Tag:</text:span> Bod</text:p>
+      <text:p text:style-name="P5"><text:span text:style-name="T1">Tag:</text:span> Bod | Nobody Owens</text:p>
       <text:p text:style-name="Text_20_Meta"><text:span text:style-name="T1">Plot:</text:span> Main</text:p>
       <text:p text:style-name="Text_20_body">Pellentesque nec erat ut nulla posuere commodo. Curabitur nisi augue, imperdiet et porta imperdiet, efficitur id leo. Cras finibus arcu at nibh commodo congue. Proin suscipit placerat condimentum. Aenean ante enim, cursus id lorem a, blandit venenatis nibh. Maecenas suscipit porta elit, sit amet porta felis porttitor eu. Sed a dui nibh. Phasellus sed faucibus dui. Pellentesque felis nulla, ultrices non efficitur quis, rutrum id mi. Mauris tempus auctor nisl, in bibendum enim pellentesque sit amet. Proin nunc lacus, imperdiet nec posuere ac, interdum non lectus.</text:p>
       <text:p text:style-name="Text_20_body">Suspendisse faucibus est auctor orci mollis luctus. Praesent quis sodales neque. Interdum et malesuada fames ac ante ipsum primis in faucibus. Donec sodales rutrum mattis. In in sem ornare, consequat nulla ac, convallis arcu. Duis ac metus id felis commodo commodo sit amet eget diam. Curabitur rhoncus lacinia leo at sodales. Etiam finibus porta diam a viverra. Praesent nisi urna, volutpat sit amet odio at, vehicula vehicula leo. In non enim eget nisl luctus commodo. Pellentesque pellentesque at lectus at luctus. Quisque nec felis bibendum, lacinia libero ut, lacinia eros. Integer finibus ultricies nibh sit amet placerat.</text:p>
@@ -204,7 +204,7 @@
       <text:p text:style-name="Text_20_body">Mauris ut erat eu lorem malesuada egestas vel vel urna. Maecenas ac semper quam. Maecenas aliquet metus non interdum mattis. Proin consectetur molestie ligula. Aliquam sollicitudin pulvinar urna a pellentesque. Suspendisse ultrices, est mattis scelerisque porta, nisi nisi laoreet nisl, non condimentum quam ante a velit. Proin scelerisque justo augue, nec laoreet ligula egestas at. Etiam enim quam, ultrices non accumsan hendrerit, elementum vel ligula. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nam efficitur odio libero, in vestibulum arcu aliquam at. Cras non vehicula augue. Integer lobortis, est vitae aliquam facilisis, metus ligula aliquet eros, at porttitor sem tortor eget massa. Aliquam varius scelerisque neque sed gravida. Aenean eleifend lorem id ante elementum sollicitudin. Proin commodo massa a quam volutpat, mollis fermentum turpis efficitur.</text:p>
       <text:p text:style-name="P7">Notes: World</text:p>
       <text:h text:style-name="Heading_20_1" text:outline-level="1">Ancient Europe</text:h>
-      <text:p text:style-name="Text_20_Meta"><text:span text:style-name="T1">Tag:</text:span> Europe</text:p>
+      <text:p text:style-name="Text_20_Meta"><text:span text:style-name="T1">Tag:</text:span> Europe | Ancient Europe</text:p>
       <text:p text:style-name="Text_20_body">Vivamus sodales risus ac accumsan posuere. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Nunc vel enim felis. Vestibulum dignissim massa nunc, a auctor magna eleifend et. Proin dignissim sodales erat vitae convallis. Aliquam id tellus dui. Curabitur sollicitudin scelerisque ex sit amet posuere. Nam rutrum felis id rhoncus feugiat. Duis sagittis quam quis purus efficitur, quis rutrum odio iaculis. Maecenas semper ante turpis, at vulputate mi consectetur non. Sed rutrum nibh turpis, quis rhoncus purus ornare quis. Vestibulum at rutrum mauris. Integer dolor nisi, tincidunt eget vehicula ac, ultricies at ligula.</text:p>
       <text:p text:style-name="Text_20_body">Aenean semper turpis quis varius rhoncus. Vivamus ac mi eget felis euismod vulputate. Nam eu tempus velit. Etiam ut est porta, finibus erat sit amet, consectetur felis. Nullam consequat felis ut lacus pharetra, in lobortis urna mollis. Nulla varius eros nec lorem rhoncus, sed venenatis risus ultrices. Phasellus pellentesque laoreet neque, ut ultricies lacus vulputate quis. In malesuada dui sit amet est interdum, eget consectetur mi gravida. Cras vel bibendum purus. Quisque commodo tempor arcu, non lacinia sem blandit eleifend. Quisque at neque gravida, porttitor metus a, suscipit diam. Quisque convallis sodales lacus et condimentum. Donec a suscipit diam. Pellentesque eget cursus neque.</text:p>
       <text:p text:style-name="Text_20_body">Nunc ullamcorper magna quis elit condimentum rhoncus. Aenean dictum pulvinar dolor suscipit interdum. Aliquam elit massa, elementum nec cursus eu, maximus nec ipsum. Donec ullamcorper iaculis dolor eu commodo. Nunc eget tortor quis turpis consectetur varius. Vestibulum nec justo vel tellus venenatis condimentum. Duis auctor iaculis massa. Nunc risus magna, rutrum vitae eros non, tristique mollis enim.</text:p>
diff --git a/tests/reference/mBuildDocBuild_Standard_Markdown_Lorem_Ipsum.md b/tests/reference/mBuildDocBuild_Standard_Markdown_Lorem_Ipsum.md
index 9149335a..9690f4db 100644
--- a/tests/reference/mBuildDocBuild_Standard_Markdown_Lorem_Ipsum.md
+++ b/tests/reference/mBuildDocBuild_Standard_Markdown_Lorem_Ipsum.md
@@ -150,7 +150,7 @@ Integer egestas maximus leo eu facilisis. Nunc rhoncus dignissim lectus eu lacin
 
 # Nobody Owens
 
-**Tag:** Bod  
+**Tag:** Bod | Nobody Owens  
 **Plot:** Main
 
 Pellentesque nec erat ut nulla posuere commodo. Curabitur nisi augue, imperdiet et porta imperdiet, efficitur id leo. Cras finibus arcu at nibh commodo congue. Proin suscipit placerat condimentum. Aenean ante enim, cursus id lorem a, blandit venenatis nibh. Maecenas suscipit porta elit, sit amet porta felis porttitor eu. Sed a dui nibh. Phasellus sed faucibus dui. Pellentesque felis nulla, ultrices non efficitur quis, rutrum id mi. Mauris tempus auctor nisl, in bibendum enim pellentesque sit amet. Proin nunc lacus, imperdiet nec posuere ac, interdum non lectus.
@@ -173,7 +173,7 @@ Mauris ut erat eu lorem malesuada egestas vel vel urna. Maecenas ac semper quam.
 
 # Ancient Europe
 
-**Tag:** Europe
+**Tag:** Europe | Ancient Europe
 
 Vivamus sodales risus ac accumsan posuere. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Nunc vel enim felis. Vestibulum dignissim massa nunc, a auctor magna eleifend et. Proin dignissim sodales erat vitae convallis. Aliquam id tellus dui. Curabitur sollicitudin scelerisque ex sit amet posuere. Nam rutrum felis id rhoncus feugiat. Duis sagittis quam quis purus efficitur, quis rutrum odio iaculis. Maecenas semper ante turpis, at vulputate mi consectetur non. Sed rutrum nibh turpis, quis rhoncus purus ornare quis. Vestibulum at rutrum mauris. Integer dolor nisi, tincidunt eget vehicula ac, ultricies at ligula.
 
diff --git a/tests/test_base/test_base_common.py b/tests/test_base/test_base_common.py
index f074be0f..0aa96456 100644
--- a/tests/test_base/test_base_common.py
+++ b/tests/test_base/test_base_common.py
@@ -669,6 +669,7 @@ def testBaseCommon_NWConfigParser(fncPath):
         "list1 = a, b, c\n"
         "list2 = 17, 18, 19\n"
         "float1 = 4.2\n"
+        f"path1 = {fncPath}\n"
     ))
 
     cfgParser = NWConfigParser()
@@ -711,6 +712,9 @@ def testBaseCommon_NWConfigParser(fncPath):
     assert cfgParser.rdFlt("nope", "intopt1", 13.0) == 13.0
     assert cfgParser.rdFlt("main", "blabla",  13.0) == 13.0
 
+    # Read Path
+    assert cfgParser.rdPath("main", "path1", Path.home()) == fncPath
+
     # Read String List
     assert cfgParser.rdStrList("main", "list1", []) == []
     assert cfgParser.rdStrList("main", "list1", ["x"]) == ["a"]
diff --git a/tests/test_core/test_core_index.py b/tests/test_core/test_core_index.py
index 34ca97ed..c4081ccb 100644
--- a/tests/test_core/test_core_index.py
+++ b/tests/test_core/test_core_index.py
@@ -272,23 +272,23 @@ def testCoreIndex_CheckThese(mockGUI, fncPath, mockRnd):
     assert index.checkThese([], cHandle) == []
 
     # One Item
-    assert index.checkThese(["@tag"], cItem) == [True]
-    assert index.checkThese(["@who"], cItem) == [False]
+    assert index.checkThese(["@tag"], cHandle) == [True]
+    assert index.checkThese(["@who"], cHandle) == [False]
 
     # Two Items
-    assert index.checkThese(["@tag", "Jane"], cItem) == [True, True]
-    assert index.checkThese(["@tag", "John"], cItem) == [True, True]
-    assert index.checkThese(["@tag", "Jane"], nItem) == [True, False]
-    assert index.checkThese(["@tag", "John"], nItem) == [True, True]
-    assert index.checkThese(["@pov", "John"], nItem) == [True, False]
-    assert index.checkThese(["@pov", "Jane"], nItem) == [True, True]
-    assert index.checkThese(["@ pov", "Jane"], nItem) == [False, False]
-    assert index.checkThese(["@what", "Jane"], nItem) == [False, False]
+    assert index.checkThese(["@tag", "Jane"], cHandle) == [True, True]
+    assert index.checkThese(["@tag", "John"], cHandle) == [True, True]
+    assert index.checkThese(["@tag", "Jane"], nHandle) == [True, False]
+    assert index.checkThese(["@tag", "John"], nHandle) == [True, True]
+    assert index.checkThese(["@pov", "John"], nHandle) == [True, False]
+    assert index.checkThese(["@pov", "Jane"], nHandle) == [True, True]
+    assert index.checkThese(["@ pov", "Jane"], nHandle) == [False, False]
+    assert index.checkThese(["@what", "Jane"], nHandle) == [False, False]
 
     # Three Items
-    assert index.checkThese(["@tag", "Jane", "John"], cItem) == [True, True, False]
-    assert index.checkThese(["@who", "Jane", "John"], cItem) == [False, False, False]
-    assert index.checkThese(["@pov", "Jane", "John"], nItem) == [True, True, False]
+    assert index.checkThese(["@tag", "Jane", "John"], cHandle) == [True, True, False]
+    assert index.checkThese(["@who", "Jane", "John"], cHandle) == [False, False, False]
+    assert index.checkThese(["@pov", "Jane", "John"], nHandle) == [True, True, False]
 
     project.closeProject()
 
@@ -544,8 +544,10 @@ def testCoreIndex_ExtractData(mockGUI, fncPath, mockRnd):
 
     nHandle = project.newFile("Hello", C.hNovelRoot)
     cHandle = project.newFile("Jane",  C.hCharRoot)
+    dHandle = project.newFile("John",  C.hCharRoot)
     assert isinstance(nHandle, str)
     assert isinstance(cHandle, str)
+    assert isinstance(dHandle, str)
 
     assert index.getItemHeader("", "") is None
     assert index.getItemHeader(C.hNovelRoot, "") is None
@@ -554,10 +556,14 @@ def testCoreIndex_ExtractData(mockGUI, fncPath, mockRnd):
         "# Jane Smith\n"
         "@tag: Jane\n"
     ))
+    assert index.scanText(dHandle, (
+        "# John Smith\n"
+        "@tag: John\n"
+    ))
     assert index.scanText(nHandle, (
         "# Hello World!\n"
         "@pov: Jane\n"
-        "@char: Jane\n\n"
+        "@char: Jane, John\n\n"
         "% this is a comment\n\n"
         "This is a story about Jane Smith.\n\n"
         "Well, not really.\n"
@@ -625,7 +631,14 @@ def testCoreIndex_ExtractData(mockGUI, fncPath, mockRnd):
     # The novel file should now refer to Jane as @pov and @char
     refs = index.getReferences(nHandle)
     assert refs["@pov"] == ["Jane"]
-    assert refs["@char"] == ["Jane"]
+    assert refs["@char"] == ["Jane", "John"]
+
+    # getReferenceForHeader
+    # =====================
+    assert index.getReferenceForHeader(nHandle, 1, "@pov") == ["Jane"]
+    assert index.getReferenceForHeader(nHandle, 1, "@char") == ["Jane", "John"]
+    assert index.getReferenceForHeader(nHandle, 1, "@focus") == []
+    assert index.getReferenceForHeader("00000", 1, "@focus") == []
 
     # getBackReferenceList
     # ====================
@@ -644,7 +657,8 @@ def testCoreIndex_ExtractData(mockGUI, fncPath, mockRnd):
     # ============
 
     assert index.getTagSource("Jane") == (cHandle, "T0001")
-    assert index.getTagSource("John") == (None, "T0000")
+    assert index.getTagSource("John") == (dHandle, "T0001")
+    assert index.getTagSource("Hans") == (None, "T0000")
 
     # getDocumentTags
     # ===============
@@ -653,7 +667,7 @@ def testCoreIndex_ExtractData(mockGUI, fncPath, mockRnd):
 
     # getClassTags
     # ============
-    assert index.getClassTags(nwItemClass.CHARACTER) == ["Jane"]
+    assert index.getClassTags(nwItemClass.CHARACTER) == ["Jane", "John"]
 
     # getTagsData
     # ===========
@@ -661,6 +675,10 @@ def testCoreIndex_ExtractData(mockGUI, fncPath, mockRnd):
         "jane", "Jane", "CHARACTER",
         index.getItemData(cHandle),
         index.getItemHeader(cHandle, "T0001")
+    ), (
+        "john", "John", "CHARACTER",
+        index.getItemData(dHandle),
+        index.getItemHeader(dHandle, "T0001")
     )]
 
     # getSingleTag
diff --git a/tests/test_gui/test_gui_doceditor.py b/tests/test_gui/test_gui_doceditor.py
index a1eb26ca..15b20efb 100644
--- a/tests/test_gui/test_gui_doceditor.py
+++ b/tests/test_gui/test_gui_doceditor.py
@@ -1615,7 +1615,7 @@ def testGuiEditor_Search(qtbot, monkeypatch, nwGUI, prjLipsum):
     origText = nwGUI.docEditor.getText()
 
     # Select the Word "est"
-    nwGUI.docEditor.setCursorPosition(630)
+    nwGUI.docEditor.setCursorPosition(645)
     nwGUI.docEditor._makeSelection(QTextCursor.WordUnderCursor)
     cursor = nwGUI.docEditor.textCursor()
     assert cursor.selectedText() == "est"
@@ -1628,11 +1628,11 @@ def testGuiEditor_Search(qtbot, monkeypatch, nwGUI, prjLipsum):
     # Find next by enter key
     monkeypatch.setattr(nwGUI.docEditor.docSearch.searchBox, "hasFocus", lambda: True)
     qtbot.keyClick(nwGUI.docEditor.docSearch.searchBox, Qt.Key_Return, delay=KEY_DELAY)
-    assert abs(nwGUI.docEditor.getCursorPosition() - 1284) < 3
+    assert abs(nwGUI.docEditor.getCursorPosition() - 1299) < 3
 
     # Find next by button
     qtbot.mouseClick(nwGUI.docEditor.docSearch.searchButton, Qt.LeftButton, delay=KEY_DELAY)
-    assert abs(nwGUI.docEditor.getCursorPosition() - 1498) < 3
+    assert abs(nwGUI.docEditor.getCursorPosition() - 1513) < 3
 
     # Activate loop search
     nwGUI.docEditor.docSearch.toggleLoop.activate(QAction.Trigger)
@@ -1641,7 +1641,7 @@ def testGuiEditor_Search(qtbot, monkeypatch, nwGUI, prjLipsum):
 
     # Find next by menu Search > Find Next
     nwGUI.mainMenu.aFindNext.activate(QAction.Trigger)
-    assert abs(nwGUI.docEditor.getCursorPosition() - 632) < 3
+    assert abs(nwGUI.docEditor.getCursorPosition() - 647) < 3
 
     # Close search
     nwGUI.docEditor.docSearch.cancelSearch.activate(QAction.Trigger)
@@ -1680,13 +1680,13 @@ def testGuiEditor_Search(qtbot, monkeypatch, nwGUI, prjLipsum):
     # Set valid RegEx
     nwGUI.docEditor.docSearch.setSearchText(r"\bSus")
     qtbot.mouseClick(nwGUI.docEditor.docSearch.searchButton, Qt.LeftButton, delay=KEY_DELAY)
-    assert abs(nwGUI.docEditor.getCursorPosition() - 208) < 3
+    assert abs(nwGUI.docEditor.getCursorPosition() - 223) < 3
 
     # Find next and then prev
     nwGUI.mainMenu.aFindNext.activate(QAction.Trigger)
-    assert abs(nwGUI.docEditor.getCursorPosition() - 309) < 3
+    assert abs(nwGUI.docEditor.getCursorPosition() - 324) < 3
     nwGUI.mainMenu.aFindPrev.activate(QAction.Trigger)
-    assert abs(nwGUI.docEditor.getCursorPosition() - 208) < 3
+    assert abs(nwGUI.docEditor.getCursorPosition() - 223) < 3
 
     # Make RegEx case sensitive
     nwGUI.docEditor.docSearch.toggleCase.activate(QAction.Trigger)
@@ -1695,11 +1695,11 @@ def testGuiEditor_Search(qtbot, monkeypatch, nwGUI, prjLipsum):
 
     # Find next/prev (one result)
     nwGUI.mainMenu.aFindNext.activate(QAction.Trigger)
-    assert abs(nwGUI.docEditor.getCursorPosition() - 611) < 3
+    assert abs(nwGUI.docEditor.getCursorPosition() - 626) < 3
     nwGUI.mainMenu.aFindPrev.activate(QAction.Trigger)
-    assert abs(nwGUI.docEditor.getCursorPosition() - 611) < 3
+    assert abs(nwGUI.docEditor.getCursorPosition() - 626) < 3
     nwGUI.mainMenu.aFindNext.activate(QAction.Trigger)
-    assert abs(nwGUI.docEditor.getCursorPosition() - 611) < 3
+    assert abs(nwGUI.docEditor.getCursorPosition() - 626) < 3
 
     # Trigger replace
     nwGUI.mainMenu.aReplace.activate(QAction.Trigger)
@@ -1716,22 +1716,22 @@ def testGuiEditor_Search(qtbot, monkeypatch, nwGUI, prjLipsum):
     assert nwGUI.docEditor.docSearch.doMatchCap is True
 
     # Replace "Sus" with "Foo" via menu
-    nwGUI.docEditor.setCursorPosition(590)
+    nwGUI.docEditor.setCursorPosition(605)
     nwGUI.mainMenu.aFindNext.activate(QAction.Trigger)
     nwGUI.mainMenu.aReplaceNext.activate(QAction.Trigger)
-    assert nwGUI.docEditor.getText()[608:619] == "Foopendisse"
+    assert nwGUI.docEditor.getText()[623:634] == "Foopendisse"
 
     # Find next/prev to loop file
     nwGUI.mainMenu.aFindNext.activate(QAction.Trigger)
-    assert abs(nwGUI.docEditor.getCursorPosition() - 208) < 3
+    assert abs(nwGUI.docEditor.getCursorPosition() - 223) < 3
     nwGUI.mainMenu.aFindPrev.activate(QAction.Trigger)
-    assert abs(nwGUI.docEditor.getCursorPosition() - 1790) < 3
+    assert abs(nwGUI.docEditor.getCursorPosition() - 1805) < 3
     nwGUI.mainMenu.aFindNext.activate(QAction.Trigger)
-    assert abs(nwGUI.docEditor.getCursorPosition() - 208) < 3
+    assert abs(nwGUI.docEditor.getCursorPosition() - 223) < 3
 
     # Replace "sus" with "foo" via replace button
     qtbot.mouseClick(nwGUI.docEditor.docSearch.replaceButton, Qt.LeftButton, delay=KEY_DELAY)
-    assert nwGUI.docEditor.getText()[205:213] == "foocipit"
+    assert nwGUI.docEditor.getText()[220:228] == "foocipit"
 
     # Revert last two replaces
     assert nwGUI.docEditor.docAction(nwDocAction.UNDO)
@@ -1745,7 +1745,7 @@ def testGuiEditor_Search(qtbot, monkeypatch, nwGUI, prjLipsum):
 
     # Close search and select "est" again
     nwGUI.docEditor.docSearch.cancelSearch.activate(QAction.Trigger)
-    nwGUI.docEditor.setCursorPosition(630)
+    nwGUI.docEditor.setCursorPosition(645)
     nwGUI.docEditor._makeSelection(QTextCursor.WordUnderCursor)
     cursor = nwGUI.docEditor.textCursor()
     assert cursor.selectedText() == "est"
@@ -1762,9 +1762,9 @@ def testGuiEditor_Search(qtbot, monkeypatch, nwGUI, prjLipsum):
 
     # Only one match
     nwGUI.mainMenu.aFindNext.activate(QAction.Trigger)
-    assert abs(nwGUI.docEditor.getCursorPosition() - 632) < 3
+    assert abs(nwGUI.docEditor.getCursorPosition() - 647) < 3
     nwGUI.mainMenu.aFindNext.activate(QAction.Trigger)
-    assert abs(nwGUI.docEditor.getCursorPosition() - 632) < 3
+    assert abs(nwGUI.docEditor.getCursorPosition() - 647) < 3
 
     # Enable next doc search
     nwGUI.docEditor.docSearch.toggleProject.activate(QAction.Trigger)
diff --git a/tests/test_gui/test_gui_mainmenu.py b/tests/test_gui/test_gui_mainmenu.py
index 7d083446..5d11b0d2 100644
--- a/tests/test_gui/test_gui_mainmenu.py
+++ b/tests/test_gui/test_gui_mainmenu.py
@@ -46,146 +46,146 @@ def testGuiMenu_EditFormat(qtbot, monkeypatch, nwGUI, prjLipsum):
 
     # Split By Chapter
     assert nwGUI.openDocument("4c4f28287af27") is True
-    nwGUI.docEditor.setCursorPosition(42)
-    cleanText = nwGUI.docEditor.getText()[39:86]
+    nwGUI.docEditor.setCursorPosition(57)
+    cleanText = nwGUI.docEditor.getText()[54:101]
 
     # Bold
     nwGUI.mainMenu.aFmtBold.activate(QAction.Trigger)
     fmtStr = "**Pellentesque** nec erat ut nulla posuere commodo."
-    assert nwGUI.docEditor.getText()[39:90] == fmtStr
+    assert nwGUI.docEditor.getText()[54:105] == fmtStr
     nwGUI.mainMenu.aFmtBold.activate(QAction.Trigger)
-    assert nwGUI.docEditor.getText()[39:86] == cleanText
+    assert nwGUI.docEditor.getText()[54:101] == cleanText
 
     # Italic
     nwGUI.mainMenu.aFmtItalic.activate(QAction.Trigger)
     fmtStr = "_Pellentesque_ nec erat ut nulla posuere commodo."
-    assert nwGUI.docEditor.getText()[39:88] == fmtStr
+    assert nwGUI.docEditor.getText()[54:103] == fmtStr
     nwGUI.mainMenu.aFmtItalic.activate(QAction.Trigger)
-    assert nwGUI.docEditor.getText()[39:86] == cleanText
+    assert nwGUI.docEditor.getText()[54:101] == cleanText
 
     # Strikethrough
     nwGUI.mainMenu.aFmtStrike.activate(QAction.Trigger)
     fmtStr = "~~Pellentesque~~ nec erat ut nulla posuere commodo."
-    assert nwGUI.docEditor.getText()[39:90] == fmtStr
+    assert nwGUI.docEditor.getText()[54:105] == fmtStr
     nwGUI.mainMenu.aFmtStrike.activate(QAction.Trigger)
-    assert nwGUI.docEditor.getText()[39:86] == cleanText
+    assert nwGUI.docEditor.getText()[54:101] == cleanText
 
     # Should get us back to plain
     nwGUI.mainMenu.aFmtBold.activate(QAction.Trigger)
     nwGUI.mainMenu.aFmtItalic.activate(QAction.Trigger)
     nwGUI.mainMenu.aFmtItalic.activate(QAction.Trigger)
     nwGUI.mainMenu.aFmtBold.activate(QAction.Trigger)
-    assert nwGUI.docEditor.getText()[39:86] == cleanText
+    assert nwGUI.docEditor.getText()[54:101] == cleanText
 
     # Double Quotes
     nwGUI.mainMenu.aFmtDQuote.activate(QAction.Trigger)
     fmtStr = "“Pellentesque” nec erat ut nulla posuere commodo."
-    assert nwGUI.docEditor.getText()[39:88] == fmtStr
+    assert nwGUI.docEditor.getText()[54:103] == fmtStr
     nwGUI.mainMenu.aEditUndo.activate(QAction.Trigger)
-    assert nwGUI.docEditor.getText()[39:86] == cleanText
+    assert nwGUI.docEditor.getText()[54:101] == cleanText
 
     # Single Quotes
     nwGUI.mainMenu.aFmtSQuote.activate(QAction.Trigger)
     fmtStr = "‘Pellentesque’ nec erat ut nulla posuere commodo."
-    assert nwGUI.docEditor.getText()[39:88] == fmtStr
+    assert nwGUI.docEditor.getText()[54:103] == fmtStr
     nwGUI.mainMenu.aEditUndo.activate(QAction.Trigger)
-    assert nwGUI.docEditor.getText()[39:86] == cleanText
+    assert nwGUI.docEditor.getText()[54:101] == cleanText
 
     # Block Formats
     # =============
     # cSpell:ignore Pellentesque erat nulla posuere commodo
-    nwGUI.docEditor.setCursorPosition(42)
+    nwGUI.docEditor.setCursorPosition(57)
 
     # Header 1
     nwGUI.mainMenu.aFmtHead1.activate(QAction.Trigger)
     fmtStr = "# Pellentesque nec erat ut nulla posuere commodo."
-    assert nwGUI.docEditor.getText()[39:88] == fmtStr
+    assert nwGUI.docEditor.getText()[54:103] == fmtStr
 
     # Header 2
     nwGUI.mainMenu.aFmtHead2.activate(QAction.Trigger)
     fmtStr = "## Pellentesque nec erat ut nulla posuere commodo."
-    assert nwGUI.docEditor.getText()[39:89] == fmtStr
+    assert nwGUI.docEditor.getText()[54:104] == fmtStr
 
     # Header 3
     nwGUI.mainMenu.aFmtHead3.activate(QAction.Trigger)
     fmtStr = "### Pellentesque nec erat ut nulla posuere commodo."
-    assert nwGUI.docEditor.getText()[39:90] == fmtStr
+    assert nwGUI.docEditor.getText()[54:105] == fmtStr
 
     # Header 4
     nwGUI.mainMenu.aFmtHead4.activate(QAction.Trigger)
     fmtStr = "#### Pellentesque nec erat ut nulla posuere commodo."
-    assert nwGUI.docEditor.getText()[39:91] == fmtStr
+    assert nwGUI.docEditor.getText()[54:106] == fmtStr
 
     # Title Format
     nwGUI.mainMenu.aFmtTitle.activate(QAction.Trigger)
     fmtStr = "#! Pellentesque nec erat ut nulla posuere commodo."
-    assert nwGUI.docEditor.getText()[39:89] == fmtStr
+    assert nwGUI.docEditor.getText()[54:104] == fmtStr
 
     # Unnumbered Chapter
     nwGUI.mainMenu.aFmtUnNum.activate(QAction.Trigger)
     fmtStr = "##! Pellentesque nec erat ut nulla posuere commodo."
-    assert nwGUI.docEditor.getText()[39:90] == fmtStr
+    assert nwGUI.docEditor.getText()[54:105] == fmtStr
 
     # Clear Format
     nwGUI.mainMenu.aFmtNoFormat.activate(QAction.Trigger)
-    assert nwGUI.docEditor.getText()[39:86] == cleanText
+    assert nwGUI.docEditor.getText()[54:101] == cleanText
 
     # Comment On
     nwGUI.mainMenu.aFmtComment.activate(QAction.Trigger)
     fmtStr = "% Pellentesque nec erat ut nulla posuere commodo."
-    assert nwGUI.docEditor.getText()[39:88] == fmtStr
+    assert nwGUI.docEditor.getText()[54:103] == fmtStr
 
     # Comment Off
     nwGUI.mainMenu.aFmtComment.activate(QAction.Trigger)
-    assert nwGUI.docEditor.getText()[39:86] == cleanText
+    assert nwGUI.docEditor.getText()[54:101] == cleanText
 
     # Check comment with no space before text
-    nwGUI.docEditor.setCursorPosition(39)
+    nwGUI.docEditor.setCursorPosition(54)
     assert nwGUI.docEditor.insertText("%")
     fmtStr = "%Pellentesque nec erat ut nulla posuere commodo."
-    assert nwGUI.docEditor.getText()[39:87] == fmtStr
+    assert nwGUI.docEditor.getText()[54:102] == fmtStr
 
     nwGUI.mainMenu.aFmtNoFormat.activate(QAction.Trigger)
-    assert nwGUI.docEditor.getText()[39:86] == cleanText
+    assert nwGUI.docEditor.getText()[54:101] == cleanText
 
     # Undo/Redo
     nwGUI.mainMenu.aEditUndo.activate(QAction.Trigger)
     fmtStr = "%Pellentesque nec erat ut nulla posuere commodo."
-    assert nwGUI.docEditor.getText()[39:87] == fmtStr
+    assert nwGUI.docEditor.getText()[54:102] == fmtStr
     nwGUI.mainMenu.aEditRedo.activate(QAction.Trigger)
-    assert nwGUI.docEditor.getText()[39:86] == cleanText
+    assert nwGUI.docEditor.getText()[54:101] == cleanText
 
     # Cut, Copy and Paste
-    nwGUI.docEditor.setCursorPosition(39)
+    nwGUI.docEditor.setCursorPosition(54)
     nwGUI.docEditor._makeSelection(QTextCursor.WordUnderCursor)
 
     nwGUI.mainMenu.aEditCut.activate(QAction.Trigger)
-    assert nwGUI.docEditor.getText()[39:89] == (
+    assert nwGUI.docEditor.getText()[54:104] == (
         " nec erat ut nulla posuere commodo. Curabitur nisi"
     )
 
     nwGUI.mainMenu.aEditPaste.activate(QAction.Trigger)
-    assert nwGUI.docEditor.getText()[39:89] == (
+    assert nwGUI.docEditor.getText()[54:104] == (
         "Pellentesque nec erat ut nulla posuere commodo. Cu"
     )
 
-    nwGUI.docEditor.setCursorPosition(39)
+    nwGUI.docEditor.setCursorPosition(54)
     nwGUI.docEditor._makeSelection(QTextCursor.WordUnderCursor)
 
     nwGUI.mainMenu.aEditCopy.activate(QAction.Trigger)
-    assert nwGUI.docEditor.getText()[39:89] == (
+    assert nwGUI.docEditor.getText()[54:104] == (
         "Pellentesque nec erat ut nulla posuere commodo. Cu"
     )
 
-    nwGUI.docEditor.setCursorPosition(39)
+    nwGUI.docEditor.setCursorPosition(54)
     nwGUI.mainMenu.aEditPaste.activate(QAction.Trigger)
-    assert nwGUI.docEditor.getText()[39:89] == (
+    assert nwGUI.docEditor.getText()[54:104] == (
         "PellentesquePellentesque nec erat ut nulla posuere"
     )
     nwGUI.mainMenu.aEditUndo.activate(QAction.Trigger)
 
     # Select Paragraph/All
-    nwGUI.docEditor.setCursorPosition(42)
+    nwGUI.docEditor.setCursorPosition(57)
     nwGUI.mainMenu.aSelectPar.activate(QAction.Trigger)
     cursor = nwGUI.docEditor.textCursor()
     assert cursor.selectedText() == (
@@ -198,10 +198,10 @@ def testGuiMenu_EditFormat(qtbot, monkeypatch, nwGUI, prjLipsum):
         "nunc lacus, imperdiet nec posuere ac, interdum non lectus."
     )
 
-    nwGUI.docEditor.setCursorPosition(42)
+    nwGUI.docEditor.setCursorPosition(57)
     nwGUI.mainMenu.aSelectAll.activate(QAction.Trigger)
     cursor = nwGUI.docEditor.textCursor()
-    assert len(cursor.selectedText()) == 1895
+    assert len(cursor.selectedText()) == 1910
 
     # Clear the Text
     nwGUI.docEditor.clear()
@@ -349,7 +349,7 @@ def testGuiMenu_ContextMenus(qtbot, nwGUI, prjLipsum):
 
     # Editor Context Menu
     cursor = nwGUI.docEditor.textCursor()
-    cursor.setPosition(112)
+    cursor.setPosition(127)
     nwGUI.docEditor.setTextCursor(cursor)
     rect = nwGUI.docEditor.cursorRect()
 
@@ -376,7 +376,7 @@ def testGuiMenu_ContextMenus(qtbot, nwGUI, prjLipsum):
     assert nwGUI.viewDocument("4c4f28287af27")
 
     cursor = nwGUI.docViewer.textCursor()
-    cursor.setPosition(112)
+    cursor.setPosition(127)
     nwGUI.docViewer.setTextCursor(cursor)
     rect = nwGUI.docViewer.cursorRect()