diff --git a/src/Lucene.Net.Analysis.OpenNLP/overview.md b/src/Lucene.Net.Analysis.OpenNLP/overview.md
index 44c2c352f2..05aa4ca15c 100644
--- a/src/Lucene.Net.Analysis.OpenNLP/overview.md
+++ b/src/Lucene.Net.Analysis.OpenNLP/overview.md
@@ -27,7 +27,7 @@ This module exposes functionality from Apache OpenNLP to Apache Lucene.NET. The
 
 For an introduction to Lucene's analysis API, see the [Lucene.Net.Analysis](../core/Lucene.Net.Analysis.html) namespace documentation.
 
-The OpenNLP Tokenizer behavior is similar to the <xref:Lucene.Net.Analysis.Core.WhiteSpaceTokenizer> but is smart about inter-word punctuation. The term stream looks very much like the way you parse words and punctuation while reading. The major difference between this tokenizer and most other tokenizers shipped with Lucene is that punctuation is tokenized. This is required for the following taggers to operate properly.
+The OpenNLP Tokenizer behavior is similar to the <xref:Lucene.Net.Analysis.Core.WhitespaceTokenizer> but is smart about inter-word punctuation. The term stream looks very much like the way you parse words and punctuation while reading. The major difference between this tokenizer and most other tokenizers shipped with Lucene is that punctuation is tokenized. This is required for the following taggers to operate properly.
 
 The OpenNLP taggers annotate terms using the <xref:Lucene.Net.Analysis.TokenAttributes.ITypeAttribute>.
 
diff --git a/src/Lucene.Net.Replicator/package.md b/src/Lucene.Net.Replicator/package.md
index 6db5ab5019..2b7399a147 100644
--- a/src/Lucene.Net.Replicator/package.md
+++ b/src/Lucene.Net.Replicator/package.md
@@ -25,7 +25,7 @@ application should publish an [IndexAndTaxonomyRevision](xref:Lucene.Net.Replica
 When the replication client detects that there is a newer revision available, it copies the files of the revision and
 then invokes the handler to complete the operation (e.g. copy the files to the index directory, sync them, reopen an
 index reader etc.). By default, only files that do not exist in the handler's
-[current revision files](xref:Lucene.Net.Replicator.IReplicationHandler.html#Lucene_Net_Replicator_IReplicationHandler_CurrentRevisionFiles) are copied,
+[current revision files](xref:Lucene.Net.Replicator.IReplicationHandler#Lucene_Net_Replicator_IReplicationHandler_CurrentRevisionFiles) are copied,
 however this can be overridden by extending the client.
 
 <!-- Old Code Sample - not sure whether this is useful
@@ -83,16 +83,16 @@ public class AspNetCoreReplicationRequest : IReplicationRequest
     private readonly HttpRequest request;
 
     // Inject the actual request object in the constructor.
-    public AspNetCoreReplicationRequest(HttpRequest request) 
+    public AspNetCoreReplicationRequest(HttpRequest request)
         => this.request = request;
 
     // Provide the full path relative to the host.
     // In the common case in AspNetCore this should just return the full path, so PathBase + Path are concatenated and returned.
-    // 
+    //
     // The path expected by the ReplicatorService is {context}/{shard}/{action} where:
     //  - action may be Obtain, Release or Update
     //  - context is the same context that is provided to the ReplicatorService constructor and defaults to '/replicate'
-    public string Path 
+    public string Path
         => request.PathBase + request.Path;
 
     // Return values for parameters used by the ReplicatorService
@@ -103,7 +103,7 @@ public class AspNetCoreReplicationRequest : IReplicationRequest
     // - filename: The file name
     //
     // In this implementation a exception is thrown in the case that parameters are provided multiple times.
-    public string QueryParam(string name) 
+    public string QueryParam(string name)
         => request.Query[name].SingleOrDefault();
 }
 ```
@@ -118,7 +118,7 @@ This is also very straight forward.
 public class AspNetCoreReplicationResponse : IReplicationResponse
 {
     private readonly HttpResponse response;
-    
+
     // Inject the actual response object in the constructor.
     public AspNetCoreReplicationResponse(HttpResponse response)
         => this.response = response;
@@ -174,7 +174,7 @@ IndexWriter writer = new IndexWriter(FSDirectory.Open("..."), config);
 For the absolute minimal solution we can wire the <xref:Lucene.Net.Replicator.Http.ReplicationService> up on the server side as:
 
 ```cs
-LocalReplicator replicator = new LocalReplicator(); 
+LocalReplicator replicator = new LocalReplicator();
 ReplicatorService service = new ReplicationService(new Dictionary<string, IReplicator>{
     ["shard_name"] = replicator
 }, "/api/replicate");
@@ -182,7 +182,7 @@ ReplicatorService service = new ReplicationService(new Dictionary<string, IRepli
 app.Map("/api/replicate", builder => {
     builder.Run(async context => {
         await Task.Yield();
-        service.Perform(context.Request, context.Response); 
+        service.Perform(context.Request, context.Response);
     });
 });
 ```
@@ -200,10 +200,10 @@ On the client side create a new <xref:Lucene.Net.Replicator.Http.HttpReplicator>
 ```cs
 IReplicator replicator = new HttpReplicator("http://{host}:{port}/api/replicate/shard_name");
 ReplicationClient client = new ReplicationClient(
-    replicator, 
+    replicator,
     new IndexReplicationHandler(
-        FSDirectory.Open(...directory...), 
-        () => ...onUpdate...), 
+        FSDirectory.Open(...directory...),
+        () => ...onUpdate...),
         new PerSessionDirectoryFactory(...temp-working-directory...));
 
 //Now either start the Update Thread or do manual pulls periodically.
diff --git a/websites/apidocs/docfx.analysis-opennlp.json b/websites/apidocs/docfx.analysis-opennlp.json
index 6b89708bc5..7b9b1f285e 100644
--- a/websites/apidocs/docfx.analysis-opennlp.json
+++ b/websites/apidocs/docfx.analysis-opennlp.json
@@ -57,7 +57,8 @@
       }
     ],
     "xref": [
-      "_site/api/core/xrefmap.yml"
+      "_site/api/core/xrefmap.yml",
+      "_site/api/analysis-common/xrefmap.yml"
     ],
     "dest": "_site/api/analysis-opennlp",
     "globalMetadataFiles": [
diff --git a/websites/apidocs/docfx.analysis-smartcn.json b/websites/apidocs/docfx.analysis-smartcn.json
index 5e50f2fe5a..8845b22c18 100644
--- a/websites/apidocs/docfx.analysis-smartcn.json
+++ b/websites/apidocs/docfx.analysis-smartcn.json
@@ -57,7 +57,8 @@
       }
     ],
     "xref": [
-      "_site/api/core/xrefmap.yml"
+      "_site/api/core/xrefmap.yml",
+      "_site/api/analysis-common/xrefmap.yml"
     ],
     "dest": "_site/api/analysis-smartcn",
     "globalMetadataFiles": [
diff --git a/websites/apidocs/docfx.core.json b/websites/apidocs/docfx.core.json
index 2a95da6fc0..e1ba623ed5 100644
--- a/websites/apidocs/docfx.core.json
+++ b/websites/apidocs/docfx.core.json
@@ -71,6 +71,7 @@
     ],
     "xref": [
       "_site/api/codecs/xrefmap.yml",
+      "_site/api/analysis-common/xrefmap.yml",
       "https://learn.microsoft.com/en-us/dotnet/.xrefmap.json"
     ],
     "dest": "_site/api/core",
diff --git a/websites/apidocs/docfx.demo.json b/websites/apidocs/docfx.demo.json
index a341e63fab..777457713d 100644
--- a/websites/apidocs/docfx.demo.json
+++ b/websites/apidocs/docfx.demo.json
@@ -57,7 +57,9 @@
       }
     ],
     "xref": [
-      "_site/api/core/xrefmap.yml"
+      "_site/api/core/xrefmap.yml",
+      "_site/api/queryparser/xrefmap.yml",
+      "_site/api/analysis-common/xrefmap.yml",
     ],
     "dest": "_site/api/demo",
     "globalMetadataFiles": [
diff --git a/websites/apidocs/docfx.highlighter.json b/websites/apidocs/docfx.highlighter.json
index 9b8f46b1ad..86956b4382 100644
--- a/websites/apidocs/docfx.highlighter.json
+++ b/websites/apidocs/docfx.highlighter.json
@@ -63,7 +63,8 @@
       }
     ],
     "xref": [
-      "_site/api/core/xrefmap.yml"
+      "_site/api/core/xrefmap.yml",
+      "_site/api/icu/xrefmap.yml"
     ],
     "dest": "_site/api/highlighter",
     "globalMetadataFiles": [
diff --git a/websites/apidocs/docfx.icu.json b/websites/apidocs/docfx.icu.json
index 9840ff41f9..22426c15f0 100644
--- a/websites/apidocs/docfx.icu.json
+++ b/websites/apidocs/docfx.icu.json
@@ -63,7 +63,8 @@
       }
     ],
     "xref": [
-      "_site/api/core/xrefmap.yml"
+      "_site/api/core/xrefmap.yml",
+      "_site/api/analysis-common/xrefmap.yml"
     ],
     "dest": "_site/api/icu",
     "globalMetadataFiles": [
diff --git a/websites/apidocs/docs.ps1 b/websites/apidocs/docs.ps1
index ebaf2f4fb2..4434124ecb 100644
--- a/websites/apidocs/docs.ps1
+++ b/websites/apidocs/docs.ps1
@@ -109,9 +109,11 @@ $DocFxJsonContent._luceneNetRel = $BaseUrl + "/"
 $DocFxJsonContent | ConvertTo-Json -depth 100 | Set-Content $DocFxGlobalJson
 
 # NOTE: The order of these depends on if one of the projects requries the xref map of another, normally all require the core xref map
+# Some might also be duplicated; this is intentional - do not remove duplicates!
+# This is because of circular dependencies between projects' xref maps.
 $DocFxJsonMeta = @(
-    "docfx.core.json",
     "docfx.codecs.json",
+    "docfx.core.json",
     "docfx.analysis-common.json",
     "docfx.analysis-kuromoji.json",
     "docfx.analysis-morfologik.json",
@@ -124,8 +126,8 @@ $DocFxJsonMeta = @(
     "docfx.expressions.json",
     "docfx.facet.json",
     "docfx.grouping.json",
-    "docfx.highlighter.json",
     "docfx.icu.json",
+    "docfx.highlighter.json",
     "docfx.join.json",
     "docfx.memory.json",
     "docfx.misc.json",
@@ -136,7 +138,10 @@ $DocFxJsonMeta = @(
     "docfx.spatial.json",
     "docfx.suggest.json",
     "docfx.test-framework.json",
-    "docfx.demo.json"
+    "docfx.demo.json",
+    # intentional duplicates
+    "docfx.codecs.json",
+    "docfx.core.json"
 )
 $DocFxJsonSite = Join-Path -Path $ApiDocsFolder "docfx.site.json"